Commit ce6d6036 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Merge remote-tracking branch 'origin/master' into 3861



Conflicts:
	org.fortiss.af3.component/META-INF/MANIFEST.MF
	org.fortiss.af3.expression/META-INF/MANIFEST.MF
Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parents 89b0cb1f 859e8a13
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
......@@ -11,191 +11,44 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.fortiss.af3.component.AF3ComponentActivator
Require-Bundle: org.fortiss.af3.allocation;visibility:=reexport,
org.fortiss.af3.expression;visibility:=reexport,
org.fortiss.af3.project;visibility:=reexport
Export-Package: org.fortiss.af3.component;uses:="org.osgi.framework,
org.eclipse.core.runtime",
org.fortiss.af3.expression;visibility:=reexport
Export-Package: org.fortiss.af3.component,
org.fortiss.af3.component.compose,
org.fortiss.af3.component.constraint; uses:="org.eclipse.emf.ecore,
org.fortiss.af3.expression.model.terms.imperative,
org.fortiss.af3.component.model,
org.fortiss.tooling.kernel.extension.base,
org.fortiss.af3.component.model.behavior.code,
org.fortiss.tooling.kernel.extension.data,
org.fortiss.af3.project.model.typesystem,
org.fortiss.tooling.kernel.model,
org.fortiss.af3.component.model.behavior.common,
org.fortiss.af3.expression.model.terms",
org.fortiss.af3.component.generator.c; uses:="org.fortiss.af3.expression.model.terms.imperative,
org.fortiss.af3.expression.generator.c,
org.fortiss.tooling.kernel.extension.data,
org.fortiss.tooling.kernel.extension.base,
org.fortiss.af3.project.model.typesystem,
org.fortiss.af3.generator.common.model.c,
org.fortiss.tooling.kernel.extension",
org.fortiss.af3.component.generator.component; uses:="org.fortiss.af3.expression.model.terms.imperative,
org.fortiss.af3.component.model,
org.fortiss.tooling.kernel.extension.data,
org.fortiss.tooling.kernel.extension.base,
org.fortiss.af3.project.model.typesystem,
org.fortiss.af3.component.model.generator,
org.fortiss.af3.expression.generator,
org.fortiss.af3.expression.model.terms,
org.fortiss.af3.component.model.generator.port",
org.fortiss.af3.component.generator.java; uses:="org.fortiss.af3.expression.model.terms.imperative,
org.fortiss.tooling.kernel.extension.data,
org.fortiss.tooling.kernel.extension.base,
org.fortiss.af3.project.model.typesystem,
org.fortiss.af3.expression.generator,
org.fortiss.af3.expression.model.terms,
org.fortiss.tooling.kernel.extension,
org.fortiss.af3.generator.common.model.java",
org.fortiss.af3.component.library; uses:="org.fortiss.af3.component.model,
org.fortiss.tooling.kernel.extension.data,
org.fortiss.tooling.kernel.model,
org.fortiss.tooling.kernel.extension",
org.fortiss.af3.component.library.prototypes;uses:="org.fortiss.af3.component.model,
org.fortiss.tooling.kernel.extension.base,
org.fortiss.tooling.kernel.extension.data",
org.fortiss.af3.component.constraint,
org.fortiss.af3.component.generator.c,
org.fortiss.af3.component.generator.component,
org.fortiss.af3.component.generator.fmu,
org.fortiss.af3.component.generator.java,
org.fortiss.af3.component.library,
org.fortiss.af3.component.library.prototypes,
org.fortiss.af3.component.listener,
org.fortiss.af3.component.migration,
org.fortiss.af3.component.model; uses:="org.eclipse.emf.ecore,
org.fortiss.tooling.base.model.element,
org.fortiss.af3.component.model.behavior.code,
org.fortiss.tooling.base.model.base,
org.eclipse.emf.common.util,
org.fortiss.af3.project.model.typesystem,
org.fortiss.tooling.kernel.model,
org.fortiss.af3.expression.model.terms,
org.fortiss.af3.expression.model.definitions.library,
org.fortiss.af3.expression.model",
org.fortiss.af3.component.model.behavior;uses:="org.eclipse.emf.ecore,
org.fortiss.tooling.base.model.element",
org.fortiss.af3.component.model.behavior.code; uses:="org.eclipse.emf.ecore,
org.fortiss.af3.expression.model.terms.imperative,
org.fortiss.af3.component.model,
org.fortiss.af3.component.model.behavior",
org.fortiss.af3.component.model.behavior.code.impl;uses:="org.fortiss.af3.component.model,
org.fortiss.af3.component.model.behavior.code",
org.fortiss.af3.component.model.behavior.code.util; uses:="org.eclipse.emf.ecore,
org.fortiss.tooling.base.model.element,
org.fortiss.af3.component.model.behavior,
org.fortiss.tooling.kernel.model,
org.fortiss.af3.component.model.behavior.code,
org.eclipse.emf.common.notify,
org.eclipse.emf.common.notify.impl,
org.eclipse.emf.ecore.util",
org.fortiss.af3.component.model.behavior.common; uses:="org.eclipse.emf.ecore,
org.eclipse.emf.common.util,
org.fortiss.af3.project.model.typesystem,
org.fortiss.tooling.kernel.model,
org.fortiss.af3.expression.model.terms",
org.fortiss.af3.component.model.behavior.common.impl;uses:="org.fortiss.af3.project.model.typesystem,
org.fortiss.af3.component.model,
org.fortiss.af3.component.model.behavior,
org.fortiss.af3.component.model.behavior.code,
org.fortiss.af3.component.model.behavior.code.impl,
org.fortiss.af3.component.model.behavior.code.util,
org.fortiss.af3.component.model.behavior.common,
org.fortiss.af3.expression.model.terms",
org.fortiss.af3.component.model.behavior.common.util; uses:="org.eclipse.emf.ecore,
org.fortiss.tooling.base.model.element,
org.fortiss.af3.project.model.typesystem,
org.fortiss.tooling.kernel.model,
org.fortiss.af3.component.model.behavior.common,
org.eclipse.emf.common.notify,
org.eclipse.emf.common.notify.impl,
org.eclipse.emf.ecore.util",
org.fortiss.af3.component.model.behavior.impl;uses:="org.eclipse.emf.ecore,
org.eclipse.emf.ecore.impl,
org.fortiss.af3.component.model.behavior",
org.fortiss.af3.component.model.behavior.util; uses:="org.eclipse.emf.ecore,
org.fortiss.tooling.base.model.element,
org.fortiss.af3.component.model.behavior,
org.fortiss.tooling.kernel.model,
org.eclipse.emf.common.notify,
org.eclipse.emf.common.notify.impl,
org.eclipse.emf.ecore.util",
org.fortiss.af3.component.model.generator; uses:="org.eclipse.emf.ecore,
org.eclipse.emf.common.util,
org.fortiss.tooling.kernel.model,
org.fortiss.af3.expression.model.definitions",
org.fortiss.af3.component.model.generator.impl; uses:="org.eclipse.emf.ecore,
org.eclipse.emf.ecore.impl,
org.eclipse.emf.common.util,
org.fortiss.af3.component.model.generator,
org.eclipse.emf.common.notify,
org.fortiss.af3.expression.model.definitions.impl",
org.fortiss.af3.component.model.generator.port; uses:="org.eclipse.emf.ecore,
org.fortiss.af3.expression.model.terms.imperative,
org.fortiss.af3.project.model.typesystem,
org.fortiss.af3.component.model.generator,
org.fortiss.af3.expression.model.terms",
org.fortiss.af3.component.model.generator.port.impl;uses:="org.fortiss.af3.component.model.generator.port",
org.fortiss.af3.component.model.generator.port.util; uses:="org.eclipse.emf.ecore,
org.fortiss.af3.expression.model.terms.imperative,
org.fortiss.af3.project.model.typesystem,
org.eclipse.emf.common.notify,
org.eclipse.emf.common.notify.impl,
org.fortiss.af3.expression.model.terms,
org.fortiss.af3.component.model.generator.port,
org.eclipse.emf.ecore.util",
org.fortiss.af3.component.model.generator.util; uses:="org.eclipse.emf.ecore,
org.fortiss.tooling.base.model.element,
org.fortiss.af3.project.model.typesystem,
org.fortiss.tooling.kernel.model,
org.fortiss.af3.component.model.generator,
org.fortiss.af3.expression.model.definitions,
org.eclipse.emf.common.notify,
org.eclipse.emf.common.notify.impl,
org.eclipse.emf.ecore.util",
org.fortiss.af3.component.model.impl; uses:="org.fortiss.af3.component.model,
org.eclipse.emf.common.util,
org.fortiss.af3.project.model.typesystem,
org.fortiss.af3.component.model.behavior.code,
org.fortiss.af3.expression.model.terms",
org.fortiss.af3.component.model.util; uses:="org.eclipse.emf.ecore,
org.fortiss.tooling.base.model.element,
org.fortiss.af3.component.model,
org.fortiss.tooling.base.model.layout,
org.fortiss.tooling.base.model.base,
org.fortiss.af3.project.model.typesystem,
org.fortiss.tooling.kernel.model,
org.eclipse.emf.common.notify,
org.eclipse.emf.common.notify.impl,
org.fortiss.af3.expression.model.definitions.library,
org.eclipse.emf.ecore.util",
org.fortiss.af3.component.model.behavior.common.impl,
org.fortiss.af3.component.model.behavior.common.util,
org.fortiss.af3.component.model.behavior.impl,
org.fortiss.af3.component.model.behavior.util,
org.fortiss.af3.component.model.generator,
org.fortiss.af3.component.model.generator.impl,
org.fortiss.af3.component.model.generator.port,
org.fortiss.af3.component.model.generator.port.impl,
org.fortiss.af3.component.model.generator.port.util,
org.fortiss.af3.component.model.generator.util,
org.fortiss.af3.component.model.impl,
org.fortiss.af3.component.model.util,
org.fortiss.af3.component.prototypes,
org.fortiss.af3.component.simulator; uses:="org.eclipse.emf.ecore,
org.fortiss.af3.component.model,
org.fortiss.af3.project.typesystem,
org.fortiss.af3.project.model.typesystem,
org.fortiss.af3.component.model.behavior.code,
org.fortiss.af3.project.typesystem.evaluation",
org.fortiss.af3.component.simulator.transform; uses:="org.fortiss.tooling.base.model.element,
org.fortiss.af3.component.model,
org.fortiss.tooling.kernel.extension.data,
org.fortiss.tooling.kernel.extension.exception,
org.fortiss.tooling.kernel.extension,
org.fortiss.af3.component.simulator",
org.fortiss.af3.component.utils; uses:="org.eclipse.emf.ecore,
org.fortiss.af3.expression.model.terms.imperative,
org.fortiss.af3.project.model.execution,
org.fortiss.tooling.base.model.element,
org.fortiss.af3.component.model,
org.fortiss.af3.component.model.behavior.code,
org.fortiss.af3.component.model.generator,
org.fortiss.af3.component.model.generator.port,
org.fortiss.af3.component.simulator,
org.fortiss.af3.project.model,
org.eclipse.emf.common.util,
org.fortiss.af3.project.model.typesystem,
org.fortiss.af3.component.model.behavior.common,
org.fortiss.af3.expression.model.terms,
org.fortiss.af3.expression.model",
org.fortiss.af3.component.simulator,
org.fortiss.af3.component.simulator.transform,
org.fortiss.af3.component.utils,
test.org.fortiss.af3.component,
test.org.fortiss.af3.component.library; uses:="org.eclipse.emf.ecore,
org.fortiss.af3.component.model,
org.fortiss.tooling.kernel.model,
org.fortiss.af3.project.model",
test.org.fortiss.af3.component.model; uses:="org.fortiss.af3.project.model.execution,
org.fortiss.af3.component.model,
test.org.fortiss.af3.expression.base,
org.fortiss.af3.component.model.behavior.code,
org.fortiss.af3.component.simulator",
test.org.fortiss.af3.component.simulator;uses:="test.org.fortiss.af3.testbase,
org.fortiss.af3.component.simulator"
test.org.fortiss.af3.component.codespec,
test.org.fortiss.af3.component.generator,
test.org.fortiss.af3.component.library,
test.org.fortiss.af3.component.model,
test.org.fortiss.af3.component.semantics,
test.org.fortiss.af3.component.simulator
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
<?xml version="1.0" encoding="UTF-8"?>
<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-allocation="http://www.fortiss.org/af3/allocation" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-annotation="http://www.fortiss.org/af3/platform/annotation" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-platform-hierarchic-annotation="http://www.fortiss.org/af3/platform/hierarchic/annotation" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-task="http://www.fortiss.org/af3/task" xmlns:org-fortiss-af3-task-allocation="http://www.fortiss.org/af3/task/allocation" xmlns:org-fortiss-af3-task-annotation="http://www.fortiss.org/af3/task/annotation" xmlns:org-fortiss-af3-task-timing="http://www.fortiss.org/af3/task/timing" xmlns:org-fortiss-af3-timing="http://www.fortiss.org/af3/timing" xmlns:org-fortiss-af3-timing-annotation="http://www.fortiss.org/af3/timing/annotation" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="26" id="26" name="[TEST] DSE JUnit Test Cases" af3Version="2.16.0.qualifier">
<org-fortiss-af3-project:FileProject xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org-fortiss-af3-allocation="http://www.fortiss.org/af3/allocation" xmlns:org-fortiss-af3-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-annotation="http://www.fortiss.org/af3/platform/annotation" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" xmlns:org-fortiss-af3-platform-hierarchic-annotation="http://www.fortiss.org/af3/platform/hierarchic/annotation" xmlns:org-fortiss-af3-project="http://www.fortiss.org/af3/project" xmlns:org-fortiss-af3-project-configuration="http://www.fortiss.org/af3/project/configuration" xmlns:org-fortiss-af3-project-development="http://www.fortiss.org/af3/project/development" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-task="http://www.fortiss.org/af3/task" xmlns:org-fortiss-af3-task-allocation="http://www.fortiss.org/af3/task/allocation" xmlns:org-fortiss-af3-task-annotation="http://www.fortiss.org/af3/task/annotation" xmlns:org-fortiss-af3-task-timing="http://www.fortiss.org/af3/task/timing" xmlns:org-fortiss-af3-timing="http://www.fortiss.org/af3/timing" xmlns:org-fortiss-af3-timing-annotation="http://www.fortiss.org/af3/timing/annotation" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="26" id="26" name="system_test_flat" af3Version="2.16.0.qualifier">
<rootElements xsi:type="org-fortiss-af3-project:ProjectConfiguration" xmi:id="1" id="1">
<configurationElements xsi:type="org-fortiss-af3-project-configuration:TypeSystemConfiguration" xmi:id="2" id="2">
<typesystem xsi:type="org-fortiss-af3-expression:MicroTypeSystem"/>
......@@ -15,7 +15,7 @@
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="9" id="9" name="Component A" comment="">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="10" id="10"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="11" id="11"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="12" id="12"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="12" id="12" isSafetyValueSet="true"/>
<connectors xsi:type="org-fortiss-af3-component:OutputPort" xmi:id="21" id="21" name="Output" comment="" outgoing="25">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="22" id="22">
<type xsi:type="org-fortiss-af3-expression-types:TInt"/>
......@@ -33,7 +33,7 @@
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="13" id="13" name="Component B" comment="">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="14" id="14"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="15" id="15"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="16" id="16" silValue="SIL 3"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="16" id="16" silValue="SIL 3" isSafetyValueSet="true"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="23" id="23" name="Input" comment="" incoming="25">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="24" id="24">
<type xsi:type="org-fortiss-af3-expression-types:TInt"/>
......@@ -66,7 +66,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:PowerConsumption" xmi:id="32" id="32"/>
<specifications xsi:type="org-fortiss-af3-platform-hierarchic-annotation:FailureRate" xmi:id="33" id="33"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:HardwareCost" xmi:id="34" id="34"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="35" id="35" silValue="SIL 2"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="35" id="35" silValue="SIL 2" isSafetyValueSet="true"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="36" id="36" bytes="50"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="558" id="558"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:BooleanSize" xmi:id="559" id="559"/>
......@@ -95,7 +95,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:PowerConsumption" xmi:id="515" id="515"/>
<specifications xsi:type="org-fortiss-af3-platform-hierarchic-annotation:FailureRate" xmi:id="516" id="516"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:HardwareCost" xmi:id="517" id="517"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="518" id="518" silValue="SIL 2"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="518" id="518" silValue="SIL 2" isSafetyValueSet="true"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="519" id="519" bytes="100"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="562" id="562"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:BooleanSize" xmi:id="563" id="563"/>
......@@ -162,6 +162,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FloatSize" xmi:id="567" id="567"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="568" id="568"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:BooleanSize" xmi:id="569" id="569"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="570" id="570" safetyStandard="IEC 61508"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="527" id="527" name="" comment="" source="525" target="526">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</connections>
......
......@@ -15,7 +15,7 @@
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="9" id="9" name="Component A" comment="">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="10" id="10"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="11" id="11"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="12" id="12"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="12" id="12" isSafetyValueSet="true"/>
<connectors xsi:type="org-fortiss-af3-component:OutputPort" xmi:id="21" id="21" name="Output" comment="" outgoing="25">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="22" id="22">
<type xsi:type="org-fortiss-af3-expression-types:TInt"/>
......@@ -33,7 +33,7 @@
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="13" id="13" name="Component B" comment="">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="14" id="14"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="15" id="15"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="16" id="16" silValue="SIL 3"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="16" id="16" silValue="SIL 3" isSafetyValueSet="true"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="23" id="23" name="Input" comment="" incoming="25">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="24" id="24">
<type xsi:type="org-fortiss-af3-expression-types:TInt"/>
......@@ -204,6 +204,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="975" id="975"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="976" id="976"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2621" id="2621"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2628" id="2628"/>
<connectors xsi:type="org-fortiss-af3-platform-hierarchic-processor:BusMasterPort" xmi:id="1445" id="1445" name="BusMasterPort" outgoing="1459">
<specifications xsi:type="org-fortiss-af3-platform-hierarchic-annotation:FailureRate" xmi:id="1446" id="1446"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:ArchitectureDomainLabel" xmi:id="1447" id="1447"/>
......@@ -286,6 +287,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="984" id="984" bytes="100"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="985" id="985"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2622" id="2622"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2629" id="2629"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="1459" id="1459" name="" comment="" source="1445" target="1455">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="420" y="228"/>
......@@ -383,6 +385,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="993" id="993" bytes="100"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="994" id="994"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2623" id="2623"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2630" id="2630" silValue="SIL 3" isSafetyValueSet="true"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="1393" id="1393" name="" comment="" source="1385" target="1389">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</connections>
......@@ -446,6 +449,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="1493" id="1493" bytes="50"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="1494" id="1494"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2624" id="2624"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2631" id="2631"/>
<connectors xsi:type="org-fortiss-af3-platform-hierarchic-processor:BusMasterPort" xmi:id="1495" id="1495" name="BusMasterPort" outgoing="1534">
<specifications xsi:type="org-fortiss-af3-platform-hierarchic-annotation:FailureRate" xmi:id="1496" id="1496"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:ArchitectureDomainLabel" xmi:id="1497" id="1497"/>
......@@ -528,6 +532,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="1532" id="1532" bytes="50"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="1533" id="1533"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2625" id="2625"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2632" id="2632"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="1534" id="1534" name="" comment="" source="1495" target="1517">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="420" y="228"/>
......@@ -625,6 +630,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FlashSize" xmi:id="1574" id="1574"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="1575" id="1575"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2626" id="2626"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2633" id="2633" silValue="SIL 3" isSafetyValueSet="true"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="1576" id="1576" name="" comment="" source="1537" target="1547">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="288" y="180"/>
......@@ -671,6 +677,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:BooleanSize" xmi:id="895" id="895"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:FloatSize" xmi:id="896" id="896"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="2627" id="2627"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="2634" id="2634" safetyStandard="IEC 61508"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="1588" id="1588" name="" comment="" source="1584" target="956">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="192" y="252"/>
......
Subproject commit d117b3db1742a745f515d2b6c52cc9a02e57c299
Subproject commit 310d1c04f28f6252d5a02dd8fde1b76ae4a4da51
GanttComposite.java c68c5336aff3f563cf35d113b9c876586a88080a GREEN
GanttScheduleVisualization.java 2d00fb3d5142f2e94e5db9855f9889c8ffd7a3cc GREEN
GanttScheduleVisualization.java 8223d2e173f98d28d6b7b0c0f3aec6d1415283a4 GREEN
......@@ -16,18 +16,17 @@
package org.fortiss.af3.exploration.ui.perspective.visualization.visualizations.gantt;
import static java.util.Arrays.asList;
import static org.fortiss.af3.exploration.util.ExplorationModelElementFactory.createSuperSetMap;
import static org.fortiss.af3.task.util.TaskModelElementFactory.createTasksToExecutionUnitAllocationTable;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.copy;
import static org.fortiss.af3.exploration.util.ExplorationUtils.getRootElementsFromSnaps;
import static org.fortiss.af3.exploration.util.ExplorationUtils.getSelectedSolutionSets;
import static org.fortiss.af3.exploration.util.ExplorationUtils.getSelectedSolutions;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Collection;
import java.util.List;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.fortiss.af3.exploration.dseml.model.expression.SuperSet;
import org.fortiss.af3.exploration.model.SuperSetMap;
import org.fortiss.af3.exploration.model.project.DSE;
import org.fortiss.af3.exploration.model.project.ExplorationStep;
......@@ -35,16 +34,17 @@ import org.fortiss.af3.exploration.model.project.ProcessStep;
import org.fortiss.af3.exploration.model.project.SolutionSelectionStep;
import org.fortiss.af3.exploration.model.solutions.ExplorationSolution;
import org.fortiss.af3.exploration.model.solutions.SingleExplorationSolution;
import org.fortiss.af3.exploration.service.IDSESolutionExporterService;
import org.fortiss.af3.exploration.solutionconverter.DSESolutionArtifacts;
import org.fortiss.af3.exploration.solutionconverter.ScheduleConverter;
import org.fortiss.af3.exploration.ui.perspective.service.EventBroker;
import org.fortiss.af3.exploration.ui.perspective.service.IDSEPerspectiveManager;
import org.fortiss.af3.exploration.ui.perspective.service.IEventListener;
import org.fortiss.af3.exploration.ui.perspective.visualization.visualizations.IVisualizationView;
import org.fortiss.af3.schedule.model.ResourceAllocation;
import org.fortiss.af3.schedule.model.ResourceSchedule;
import org.fortiss.af3.schedule.model.SystemSchedule;
import org.fortiss.af3.task.model.allocation.TaskToExecutionUnitAllocationEntry;
import org.fortiss.af3.task.model.allocation.TaskToExecutionUnitAllocationTable;
import org.fortiss.tooling.base.model.element.IModelElement;
import org.fortiss.tooling.kernel.model.IProjectRootElement;
/**
* Visualizes a {@link SystemSchedule} if one has been calculated by the last DSE run.
......@@ -56,14 +56,17 @@ public final class GanttScheduleVisualization implements IVisualizationView, IEv
/** Viewer. */
private GanttComposite ganttViewer;
/** Active {@link DSE} node. */
private DSE dse;
/** {@inheritDoc} */
@Override
public void createView(final Composite composite) {
ganttViewer = new GanttComposite(composite, SWT.NONE);
addSolutionSelectionComboLogic();
DSE dse = IDSEPerspectiveManager.INSTANCE.getCurrentlySelectedDSE();
if(IDSEPerspectiveManager.INSTANCE.getCurrentlySelectedDSE() != null) {
dse = IDSEPerspectiveManager.INSTANCE.getCurrentlySelectedDSE();
if(dse != null) {
updateSolutionSelectionCombo(dse);
}
......@@ -77,33 +80,30 @@ public final class GanttScheduleVisualization implements IVisualizationView, IEv
Object selElem = selection.getFirstElement();
if(selElem instanceof SingleExplorationSolution) {
SingleExplorationSolution solution = (SingleExplorationSolution)selElem;
SuperSet<ResourceAllocation> resAllocs =
solution.getSolutionModel(ResourceAllocation.class);
// Get the allocations from a joint exploration, or an earlier exploration.
SuperSet<TaskToExecutionUnitAllocationEntry> alloc =
solution.getSolutionModel(TaskToExecutionUnitAllocationEntry.class);
if(alloc == null) {
DSE dse = IDSEPerspectiveManager.INSTANCE.getCurrentlySelectedDSE();
SuperSetMap prevSuperSets = dse.getCurrentStep().getSuperSetMap();
alloc = prevSuperSets.get(TaskToExecutionUnitAllocationEntry.class);
}
TaskToExecutionUnitAllocationTable ta2hw =
createTasksToExecutionUnitAllocationTable("temp_allocs");
// We must use copy here since we don't want to modify containment relations.
ta2hw.getContainedElements().addAll(copy(alloc.getEntries()));
// Possibly retrieves a superset of resource schedules from the solution containing
// information about frequency exploration
SuperSetMap otherSuperSets = createSuperSetMap();
SuperSet<ResourceSchedule> resSchedules =
solution.getSolutionModel(ResourceSchedule.class);
if(resSchedules != null) {
otherSuperSets.put(ResourceSchedule.class, resSchedules);
}
SystemSchedule solutionSchedule = (new ScheduleConverter()).transform(resAllocs,
otherSuperSets, null, asList(ta2hw), new HashMap<>(), "temp_sched");
// Prepare inputs and perform the transformation.
ProcessStep currentStep = dse.getCurrentStep();
Collection<IProjectRootElement> inputModels = getRootElementsFromSnaps(currentStep,
(new ScheduleConverter()).getRequiredInputCopies());
List<SingleExplorationSolution> solutions = new ArrayList<>(asList(solution));
solutions.addAll(getSelectedSolutions(currentStep));
DSESolutionArtifacts solArtifacts =
new DSESolutionArtifacts(inputModels, solutions);
// Define the set of generated artifact types: We must construct the set of
// SuperSets from previous solutions here to know which converters must be launched.
SuperSetMap solutionSets = getSelectedSolutionSets(currentStep);
Collection<Class<? extends IModelElement>> solutionTypes =
new ArrayList<>(solutionSets.keySet());
solutionTypes.add(ResourceAllocation.class);
// Perform the transformation.
solArtifacts = IDSESolutionExporterService.getInstance().transform(solutionTypes,
solArtifacts, "temp");
// Present the transformed schedule.
SystemSchedule solutionSchedule =
solArtifacts.getElementOrThrow(SystemSchedule.class);
ganttViewer.viewer.setSchedule(null, solutionSchedule.getScheduleList(),
solutionSchedule.getMajorFrame());
}
......@@ -157,6 +157,7 @@ public final class GanttScheduleVisualization implements IVisualizationView, IEv
if(!ganttViewer.isDisposed()) {
dispose();
}
dse = null;
}
}
}
ButtonColumnLabelProvider.java 74c9b3631c411fd054b939752388115cb59833e3 GREEN
ExportButtonColumnLabelProvider.java 305b4259f25b288a266090b8c322d13d4c60dc7e GREEN
ExportButtonColumnLabelProvider.java 340fea483d190986c39bc039d889f246b7300ced GREEN
SelectionButtonColumnLabelProvider.java e7c4030d78622243fb851679a1cb8b444cbf0815 GREEN
TableComposite.java 1f186c37d3d6bb4d2ee15039bad1942ad51f501d GREEN
TableVisualization.java 9c89b64b8aa3c30b9c79b832621cd681e0e81fd6 GREEN
......@@ -15,26 +15,22 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.exploration.ui.perspective.visualization.visualizations.table;
import static org.fortiss.af3.exploration.util.ExplorationUtils.getSelectedSolutionSets;
import java.util.Map;
import java.util.Collection;
import java.util.Map.Entry;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Button;
import org.fortiss.af3.exploration.model.SuperSetMap;
import org.fortiss.af3.exploration.model.project.DSE;
import org.fortiss.af3.exploration.model.project.ProcessStep;
import org.fortiss.af3.exploration.model.project.SolutionSelectionStep;
import org.fortiss.af3.exploration.model.solutions.SingleExplorationSolution;
import org.fortiss.af3.exploration.service.IDSESolutionExporterService;
import org.fortiss.af3.exploration.solutionconverter.IDSESolutionConverter;
import org.fortiss.af3.exploration.solutionconverter.DSESolutionArtifacts;
import org.fortiss.af3.exploration.ui.perspective.service.IDSEPerspectiveManager;
import org.fortiss.tooling.base.model.element.IModelElement;
import org.fortiss.tooling.base.model.visualization.DataSet;
import org.fortiss.tooling.kernel.model.INamedCommentedElement;
/**
* Provides the export {@link Button}s for this column.
......@@ -65,18 +61,16 @@ class ExportButtonColumnLabelProvider extends ButtonColumnLabelProvider {
solutionStep = selectSolution(singleSolution);
viewer.refresh();
}
Map<IDSESolutionConverter<INamedCommentedElement, IModelElement>, INamedCommentedElement> transformationResult =
DSESolutionArtifacts transformationResult =
transformSolutions((SolutionSelectionStep)solutionStep);
dseSES.exportToAF3Project(transformationResult, dse, singleSolution.getName());
}
/** Transforms the solutions of this {@link ProcessStep} into AF3 model elements. */