Commit 463bd1a7 authored by Simon Barner's avatar Simon Barner
Browse files

Merge branch '3541' into 'master'

3541

See merge request !34
parents f02b3748 0f753549
ApplicationActionBarAdvisor.java 881198ff05ab14110efef1673f0914725348442b GREEN
ApplicationWorkbenchAdvisor.java 130a7b352ee182ad5d3703fac3478942cc0e8608 GREEN
ApplicationWorkbenchAdvisor.java 19af4bc3262680a283eccccf92c4e2ae4463fa71 GREEN
ApplicationWorkbenchWindowAdvisor.java da5cb38300b384579532c678fbc9faa961c2ca6b GREEN
......@@ -29,7 +29,7 @@ import org.fortiss.af3.allocation.IAllocationService;
import org.fortiss.af3.exploration.service.IDSEBackendService;
import org.fortiss.af3.exploration.smt.backend.Z3Backend;
import org.fortiss.af3.exploration.ui.AF3ExplorationUIActivator;
import org.fortiss.af3.exploration.ui.perspective.service.IExternalDSEExtensionService;
import org.fortiss.af3.exploration.ui.perspective.service.IDSEUIPatternExtensionService;
import org.fortiss.af3.project.AF3Project;
import org.fortiss.af3.timing.ITimingSpecificationService;
import org.fortiss.tooling.base.ToolingBase;
......@@ -73,7 +73,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
IAllocationService.getInstance().startService();
ITimingSpecificationService.getInstance().startService();
IDSEBackendService.getInstance().startService();
IExternalDSEExtensionService.getInstance().startService();
IDSEUIPatternExtensionService.getInstance().startService();
// The CLI handlers must be executed last such that all services are available.
ICommandLineInterfaceService.getInstance().executeHandlers();
......@@ -91,7 +91,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
IDSEBackendService dbs = IDSEBackendService.getInstance();
dbs.initializeService();
dbs.registerDSEBackend(new Z3Backend());
IExternalDSEExtensionService.getInstance().initializeService();
IDSEUIPatternExtensionService.getInstance().initializeService();
}
/** {@inheritDoc} */
......
<?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-component-behavior-code="http://www.fortiss.org/af3/component/behavior/code" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-definitions="http://www.fortiss.org/af3/expression/definitions" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-terms-imperative="http://www.fortiss.org/af3/expression/terms/imperative" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-mira="http://www.fortiss.org/af3/mira" xmlns:org-fortiss-af3-mira-functional="http://www.fortiss.org/af3/mira/functional" xmlns:org-fortiss-af3-mira-verification="http://www.fortiss.org/af3/mira/verification" xmlns:org-fortiss-af3-mode="http://www.fortiss.org/af3/mode" 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-project-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" 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="3580" id="3580" name="ACC">
<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-component-behavior-code="http://www.fortiss.org/af3/component/behavior/code" xmlns:org-fortiss-af3-expression="http://www.fortiss.org/af3/expression" xmlns:org-fortiss-af3-expression-definitions="http://www.fortiss.org/af3/expression/definitions" xmlns:org-fortiss-af3-expression-terms="http://www.fortiss.org/af3/expression/terms" xmlns:org-fortiss-af3-expression-terms-imperative="http://www.fortiss.org/af3/expression/terms/imperative" xmlns:org-fortiss-af3-expression-types="http://www.fortiss.org/af3/expression/types" xmlns:org-fortiss-af3-mira="http://www.fortiss.org/af3/mira" xmlns:org-fortiss-af3-mode="http://www.fortiss.org/af3/mode" 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-execution="http://www.fortiss.org/af3/project/execution" xmlns:org-fortiss-af3-safety-annotation="http://www.fortiss.org/af3/safety/annotation" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" 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="3580" id="3580" name="ACC">
<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"/>
</configurationElements>
<configurationElements xsi:type="org-fortiss-af3-project-configuration:DevelopmentProcessConfiguration" xmi:id="3" id="3">
<development xsi:type="org-fortiss-af3-project-development:DummyDevelopmentProcess"/>
</configurationElements>
</rootElements>
<rootElements xsi:type="org-fortiss-af3-mira:Analysis" xmi:id="4" id="4">
<containedElements xsi:type="org-fortiss-af3-mira:RequirementsContainer" xmi:id="3506" id="3506" name="Requirements (new)" comment="">
<containedElements xsi:type="org-fortiss-af3-mira:Requirement" xmi:id="5" id="5" name="ACC Core Functionality" description="The ACC provides an intelligent Cruise Control functionality. Specifically it allows to:&#xA;1) Set a preferred speed of the vehicle by the driver and autonomously keep this speed by accelerating and deaccelerating the vehicle correspondingly&#xA;2) Adapt the speed of the vehicle autonomously depending on the distance to a leading vehicle to avoid unsafe distances between them&#xA;3) Set a preferred driving profile (from sportive to economic) influencing the chosen acceleration and deacceleration forces applied" author="B.Schätz" priority="Normal - Satisfier" reqId="1">
<specifications xsi:type="org-fortiss-af3-mira-verification:CheckList" xmi:id="6" id="6" name="Discovery Phase" comment="Check list for discovery Phase">
<items xmi:id="11" id="11" name="Requirement is relevant" comment="TODO" category="E3.1"/>
<items xmi:id="12" id="12" name="Requirement description is correct" comment="TODO" category="E4.1"/>
<items xmi:id="13" id="13" name="Consistent wording -- check with glossary" comment="TODO" category="E6.1"/>
</specifications>
<specifications xsi:type="org-fortiss-af3-mira-verification:CheckList" xmi:id="7" id="7" name="Detailed Modeling Phase" comment="Check list for conceptual modeling phase">
<items xmi:id="8" id="8" name="Consistent wording -- check with glossary" comment="TODO" category="E6.1"/>
</specifications>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3565" id="3565"/>
<connectors xsi:type="org-fortiss-af3-mira:RequirementConnector"/>
</containedElements>
<containedElements xsi:type="org-fortiss-af3-mira:Requirement" xmi:id="14" id="14" name="Interfaces" description="The ACC System has input and output interfaces.&#xA;&#xA;Its input interfaces are:&#xA;1) The Activation/Deactivation Lever&#xA;2) The Brake Pedal&#xA;3) The Accerlation Pedal&#xA;4) The Driving Mode Selector&#xA;5) The Measured Vehicle Speed&#xA;6) The Measured Distance to a Leading Vehicle&#xA;&#xA;Its output interfaces are:&#xA;1) The Commanded Acceleration" author="B.Schätz" priority="Normal - Satisfier" reqId="2">
<specifications xsi:type="org-fortiss-af3-mira-verification:CheckList" xmi:id="15" id="15" name="Discovery Phase" comment="Check list for discovery Phase">
<items xmi:id="16" id="16" name="Requirement is relevant" comment="TODO" category="E3.1"/>
<items xmi:id="17" id="17" name="Requirement description is correct" comment="TODO" category="E4.1"/>
<items xmi:id="18" id="18" name="Consistent wording -- check with glossary" comment="TODO" category="E6.1"/>
</specifications>
<specifications xsi:type="org-fortiss-af3-mira-verification:CheckList" xmi:id="19" id="19" name="Detailed Modeling Phase" comment="Check list for conceptual modeling phase">
<items xmi:id="20" id="20" name="Consistent wording -- check with glossary" comment="TODO" category="E6.1"/>
</specifications>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3566" id="3566"/>
<connectors xsi:type="org-fortiss-af3-mira:RequirementConnector"/>
</containedElements>
<containedElements xsi:type="org-fortiss-af3-mira:Requirement" xmi:id="1285" id="1285" name="Driver brake priority" description="Braking by the driver shall deactivate the ACC function at least if the driver initiated brake force demand is higher than the ACC initiated brake force." priority="Normal - Satisfier" reqId="3">
<containedElements xsi:type="org-fortiss-af3-mira-functional:FormalSpecification" xmi:id="1292" id="1292" name="Formal Specification">
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="3120" id="3120" name="Root">
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="1295" id="1295" name="BrakePriorModel">
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="3172" id="3172"/>
<specifications xsi:type="org-fortiss-af3-state:StateAutomaton" xmi:id="3174" id="3174">
<containedElements xsi:type="org-fortiss-af3-state:State" xmi:id="1367" id="1367" name="Root State" comment="">
<containedElements xsi:type="org-fortiss-af3-state:State" xmi:id="1368" id="1368" name="Acceleration" comment="">
<specifications xsi:type="org-fortiss-af3-state:StateSpecification" xmi:id="3175" id="3175">
<idleTransitionsSpecifications xmi:id="3176" id="3176"/>
</specifications>
<connectors xsi:type="org-fortiss-af3-state:TransitionSegmentExitConnector" xmi:id="1371" id="1371" name="Output" comment="" outgoing="1370">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="cdim" width="0" height="0"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Angle" key="cangle" angle="-0.7292773806962718"/>
</connectors>
<connectors xsi:type="org-fortiss-af3-state:TransitionSegmentEntryConnector" xmi:id="1375" id="1375" name="Input" comment="" incoming="1373">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="cdim" width="0" height="0"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Angle" key="cangle" angle="0.6713908710041061"/>
</connectors>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos" x="175" y="223"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="227" height="142"/>
</containedElements>
<containedElements xsi:type="org-fortiss-af3-state:State" xmi:id="1369" id="1369" name="No Acceleration" comment="">
<specifications xsi:type="org-fortiss-af3-state:StateSpecification" xmi:id="3177" id="3177" initial="true">
<idleTransitionsSpecifications xmi:id="3178" id="3178">
<actions>
<variable identifier="Acceleration"/>
<value xsi:type="org-fortiss-af3-expression-terms:BoolConst"/>
</actions>
</idleTransitionsSpecifications>
</specifications>
<connectors xsi:type="org-fortiss-af3-state:TransitionSegmentEntryConnector" xmi:id="1372" id="1372" name="Input" comment="" incoming="1370">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="cdim" width="0" height="0"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Angle" key="cangle" angle="-2.0988707752212563"/>
</connectors>
<connectors xsi:type="org-fortiss-af3-state:TransitionSegmentExitConnector" xmi:id="1374" id="1374" name="Output" comment="" outgoing="1373">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="cdim" width="0" height="0"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Angle" key="cangle" angle="1.633215136790854"/>
</connectors>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos" x="500" y="225"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="208" height="130"/>
</containedElements>
<specifications xsi:type="org-fortiss-af3-state:StateSpecification" xmi:id="3179" id="3179">
<idleTransitionsSpecifications xmi:id="3180" id="3180"/>
</specifications>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="1370" id="1370" name="DriverBrake == true" comment="" source="1371" target="1372">
<specifications xsi:type="org-fortiss-af3-state:TransitionSegmentSpecification" xmi:id="3181" id="3181">
<guard>
<expression xsi:type="org-fortiss-af3-expression-terms:FunctionCall">
<function xsi:type="org-fortiss-af3-expression-terms:PredefinedFunction" operator="Equal"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:Var" identifier="DriverBrake"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:BoolConst" value="true"/>
</expression>
</guard>
<actions>
<variable identifier="Acceleration"/>
<value xsi:type="org-fortiss-af3-expression-terms:BoolConst"/>
</actions>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="1373" id="1373" name="DriverBrake == NoVal || DriverBrake == false" comment="" source="1374" target="1375">
<specifications xsi:type="org-fortiss-af3-state:TransitionSegmentSpecification" xmi:id="3182" id="3182">
<guard>
<expression xsi:type="org-fortiss-af3-expression-terms:FunctionCall">
<function xsi:type="org-fortiss-af3-expression-terms:PredefinedFunction" operator="Or"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:FunctionCall">
<function xsi:type="org-fortiss-af3-expression-terms:PredefinedFunction" operator="Equal"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:Var" identifier="DriverBrake"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:DefinedConst" value="NoVal"/>
</arguments>
<arguments xsi:type="org-fortiss-af3-expression-terms:FunctionCall">
<function xsi:type="org-fortiss-af3-expression-terms:PredefinedFunction" operator="Equal"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:Var" identifier="DriverBrake"/>
<arguments xsi:type="org-fortiss-af3-expression-terms:BoolConst"/>
</arguments>
</expression>
</guard>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</connections>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
</containedElements>
</specifications>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="3507" id="3507"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3575" id="3575"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="1296" id="1296" name="DriverBrake" comment="">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="3190" id="3190">
<type xsi:type="org-fortiss-af3-expression-types:TBool"/>
<initialValue xsi:type="org-fortiss-af3-expression-terms:BoolConst"/>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="cdim" width="0" height="0"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:OffsetOrientation" key="coffsetorient" offset="24" orientation="WEST"/>
</connectors>
<connectors xsi:type="org-fortiss-af3-component:OutputPort" xmi:id="1297" id="1297" name="Acceleration" comment="">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="3191" id="3191">
<type xsi:type="org-fortiss-af3-expression-types:TBool"/>
<initialValue xsi:type="org-fortiss-af3-expression-terms:BoolConst"/>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="cpos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="cdim" width="0" height="0"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:OffsetOrientation" key="coffsetorient" offset="24" orientation="EAST"/>
</connectors>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos" x="384" y="132"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="205" height="109"/>
</containedElements>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="3508" id="3508"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3571" id="3571"/>
</containedElements>
</containedElements>
<specifications xsi:type="org-fortiss-af3-mira-verification:CheckList" xmi:id="1286" id="1286" name="Discovery Phase" comment="Check list for discovery Phase">
<items xmi:id="1287" id="1287" name="Requirement is relevant" comment="TODO" category="E3.1"/>
<items xmi:id="1288" id="1288" name="Requirement description is correct" comment="TODO" category="E4.1"/>
<items xmi:id="1289" id="1289" name="Consistent wording -- check with glossary" comment="TODO" category="E6.1"/>
</specifications>
<specifications xsi:type="org-fortiss-af3-mira-verification:CheckList" xmi:id="1290" id="1290" name="Detailed Modeling Phase" comment="Check list for conceptual modeling phase">
<items xmi:id="1291" id="1291" name="Consistent wording -- check with glossary" comment="TODO" category="E6.1"/>
</specifications>
<containedElements xsi:type="org-fortiss-af3-mira:Requirement" xmi:id="1285" id="1285" name="Driver brake priority" description="Braking by the driver shall deactivate the ACC function at least if the driver initiated brake force demand is higher than the ACC initiated brake force." author="B.Schätz" priority="Normal - Satisfier" reqId="3">
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3567" id="3567"/>
<connectors xsi:type="org-fortiss-af3-mira:RequirementConnector"/>
</containedElements>
......@@ -300,6 +146,7 @@
<specifications xsi:type="org-fortiss-af3-platform-annotation:FloatSize" xmi:id="3612" id="3612"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:IntegerSize" xmi:id="3613" id="3613"/>
<specifications xsi:type="org-fortiss-af3-platform-annotation:EnumerationSize" xmi:id="3671" id="3671"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3913" id="3913"/>
<connections xsi:type="org-fortiss-af3-platform:TransmissionConnection" xmi:id="182" id="182" name="" comment="" source="178" target="179">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</connections>
......@@ -307,7 +154,7 @@
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</connections>
</rootElements>
<rootElements xsi:type="org-fortiss-af3-expression:DataDictionary" xmi:id="106" id="106">
<rootElements xsi:type="org-fortiss-af3-expression:DataDictionary" xmi:id="106" id="106" name="Data Dictionary">
<typeDefinitions xsi:type="org-fortiss-af3-expression-definitions:Enumeration" xmi:id="107" id="107" name="DistanceMode" comment="Setting for Distance Mode of Distance Control">
<members xmi:id="108" id="108" name="Off" comment="Distance Based Control Deactivated"/>
<members xmi:id="109" id="109" name="Eco" comment="Economic Distance Based Control "/>
......@@ -581,6 +428,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="443" y="222"/>
<points x="443" y="222"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="524" id="524" name="Implausible Value" comment="Detect a devition from the expected values and as result store the currently sensed value without issuing a sensed value" source="517" target="522">
......@@ -618,7 +466,10 @@
<value xsi:type="org-fortiss-af3-expression-terms:DefinedConst" value="NoVal"/>
</actions>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="440" y="288"/>
<points x="440" y="288"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="527" id="527" name="ValidSignalDetection" comment="Propagate a valid signal received (i.e., a SensedSpeed sufficiently close to prviously SensedSpeed)" source="518" target="519">
<specifications xsi:type="org-fortiss-af3-state:TransitionSegmentSpecification" xmi:id="3203" id="3203">
......@@ -657,6 +508,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="39" y="292"/>
<points x="39" y="292"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="906" id="906" name="Missing Value" comment="Detect a a missing sensed value" source="907" target="908">
......@@ -673,7 +525,10 @@
<value xsi:type="org-fortiss-af3-expression-terms:DefinedConst" value="NoVal"/>
</actions>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="305" y="380"/>
<points x="305" y="380"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="909" id="909" name="Available Value" comment="A SensedValue is available again after a lost signal" source="910" target="911">
<specifications xsi:type="org-fortiss-af3-state:TransitionSegmentSpecification" xmi:id="3205" id="3205">
......@@ -691,6 +546,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="506" y="351"/>
<points x="506" y="351"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="923" id="923" name="Missing Value" comment="A lacking sensor value was detected" source="924" target="925">
......@@ -709,6 +565,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="423" y="596"/>
<points x="423" y="596"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="929" id="929" name="Missing Value" comment="Detect a a missing sensed value" source="930" target="931">
......@@ -727,6 +584,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="595" y="411"/>
<points x="595" y="411"/>
</layoutData>
</connections>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
......@@ -912,6 +770,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="443" y="222"/>
<points x="443" y="222"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="544" id="544" name="FailureDetection" comment="Detect a devition from the expected values and as result store the currently sensed value without issuing a sensed value" source="537" target="542">
......@@ -949,7 +808,10 @@
<value xsi:type="org-fortiss-af3-expression-terms:DefinedConst" value="NoVal"/>
</actions>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="440" y="294"/>
<points x="440" y="294"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="547" id="547" name="ValidSignalDetection" comment="Propagate a valid signal received (i.e., a SensedDistsufficiently close to prviously SensedDist)" source="538" target="539">
<specifications xsi:type="org-fortiss-af3-state:TransitionSegmentSpecification" xmi:id="3223" id="3223">
......@@ -988,6 +850,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="39" y="292"/>
<points x="39" y="292"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="915" id="915" name="Missing Value" comment="A lacking signal is detected" source="916" target="917">
......@@ -1004,7 +867,10 @@
<value xsi:type="org-fortiss-af3-expression-terms:DefinedConst" value="NoVal"/>
</actions>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="313" y="362"/>
<points x="313" y="362"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="920" id="920" name="Available Value" comment="A sensor signal is available again" source="921" target="922">
<specifications xsi:type="org-fortiss-af3-state:TransitionSegmentSpecification" xmi:id="3225" id="3225">
......@@ -1026,6 +892,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="493" y="326"/>
<points x="493" y="326"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="926" id="926" name="Missing Value" comment="A lacking sensor signal is detected" source="927" target="928">
......@@ -1044,6 +911,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="432" y="580"/>
<points x="432" y="580"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="932" id="932" name="Missing Value" comment="A lacking signal is detected" source="933" target="934">
......@@ -1062,6 +930,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="591" y="407"/>
<points x="591" y="407"/>
</layoutData>
</connections>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
......@@ -1615,6 +1484,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="483" y="102"/>
<points x="483" y="102"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="595" id="595" name="ProcessCancelCommand" comment="Clear speed if cnacle command is received" source="589" target="590">
......@@ -1643,6 +1513,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="660" y="446"/>
<points x="660" y="446"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="597" id="597" name="ProcessHoldCommand" comment="Issue set speed if hold command is received" source="591" target="592">
......@@ -1671,6 +1542,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="303" y="437"/>
<points x="303" y="437"/>
</layoutData>
</connections>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
......@@ -3741,7 +3613,10 @@
</expression>
</guard>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="482" y="208"/>
<points x="482" y="208"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-mode:SwitchSegment" xmi:id="806" id="806" name="Off" comment="Deactivate Distance Control" source="701" target="636">
<specifications xsi:type="org-fortiss-af3-mode:SwitchSegmentSpecification" xmi:id="3447" id="3447">
......@@ -3763,7 +3638,10 @@
</expression>
</guard>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="351" y="213"/>
<points x="351" y="213"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-mode:SwitchSegment" xmi:id="808" id="808" name="Sport" comment="Set Distance Control to Sportive" source="637" target="702">
<specifications xsi:type="org-fortiss-af3-mode:SwitchSegmentSpecification" xmi:id="3448" id="3448">
......@@ -3785,7 +3663,10 @@
</expression>
</guard>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="294" y="186"/>
<points x="294" y="186"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-mode:SwitchSegment" xmi:id="810" id="810" name="Eco" comment="Set Distance Control to Economic" source="638" target="803">
<specifications xsi:type="org-fortiss-af3-mode:SwitchSegmentSpecification" xmi:id="3449" id="3449">
......@@ -3807,7 +3688,10 @@
</expression>
</guard>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="545" y="186"/>
<points x="545" y="186"/>
</layoutData>
</connections>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="108" height="72"/>
......@@ -4024,6 +3908,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="413" y="309"/>
<points x="413" y="309"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="829" id="829" name="AccOff" comment="Deactivation of ACC Functionality" source="825" target="821">
......@@ -4068,6 +3953,7 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="412" y="161"/>
<points x="412" y="161"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="831" id="831" name="Break" comment="Break command deactivating ACC" source="826" target="822">
......@@ -4095,7 +3981,10 @@
</value>
</actions>
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="415" y="227"/>
<points x="415" y="227"/>
</layoutData>
</connections>
<connections xsi:type="org-fortiss-af3-state:TransitionSegment" xmi:id="941" id="941" name="Break" comment="Break command is propagated and has precedence over acceleration" source="942" target="943">
<specifications xsi:type="org-fortiss-af3-state:TransitionSegmentSpecification" xmi:id="3465" id="3465">
......@@ -4124,7 +4013,6 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="149" y="118"/>
<points x="184" y="60"/>
<points x="225" y="116"/>
</layoutData>
</connections>
......@@ -4170,7 +4058,6 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="134" y="335"/>
<points x="187" y="392"/>
<points x="228" y="331"/>
</layoutData>
</connections>
......@@ -4224,7 +4111,6 @@
</specifications>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points">
<points x="787" y="187"/>
<points x="848" y="229"/>
<points x="785" y="272"/>
</layoutData>
</connections>
......@@ -5097,7 +4983,7 @@
</eventsContainer>
<eventChainsContainer xmi:id="3909" id="3909"/>
<constraintsContainer xmi:id="3910" id="3910">
<constraints xsi:type="org-fortiss-af3-timing:PeriodicConstraint" xmi:id="3911" id="3911" event="3912" period="20"/>
<constraints xsi:type="org-fortiss-af3-timing:PeriodicConstraint" xmi:id="3911" id="3911" event="3912" period="20" jitter="0"/>
</constraintsContainer>
</rootElements>
</org-fortiss-af3-project:FileProject>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment