Commit f18fb34e authored by Hernan Ponce de Leon's avatar Hernan Ponce de Leon
Browse files

Clean af3 files after using the migrator

refs 3368
parent 5378f01e
<?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-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-component-annotation="http://www.fortiss.org/af3/component/annotation" xmlns:org-fortiss-af3-component-behavior-code="http://www.fortiss.org/af3/component/behavior/code" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" 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-generic="http://www.fortiss.org/af3/platform/generic" 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-refinement="http://www.fortiss.org/af3/refinement" 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-testing="http://www.fortiss.org/af3/testing/model" xmlns:org-fortiss-af3-testing-statistic="http://www.fortiss.org/af3/testing/model/statistic" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmlns:random-profile-model="http://www.fortiss.org/af3/randomspecification/model" xmi:id="0" 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-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-component-annotation="http://www.fortiss.org/af3/component/annotation" xmlns:org-fortiss-af3-component-behavior-code="http://www.fortiss.org/af3/component/behavior/code" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" 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-generic="http://www.fortiss.org/af3/platform/generic" 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-refinement="http://www.fortiss.org/af3/refinement" 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-testing="http://www.fortiss.org/af3/testing/model" xmlns:org-fortiss-af3-testing-statistic="http://www.fortiss.org/af3/testing/model/statistic" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmlns:random-profile-model="http://www.fortiss.org/af3/randomspecification/model" 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"/>
......@@ -36,8 +36,8 @@
</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" contractsWithContractors="3576">
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="1295" id="1295" name="BrakePriorModel" contractsWithClients="3576">
<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-testing:TestSuiteSpecification" xmi:id="1300" id="1300">
<specifications xsi:type="random-profile-model:RandomSpecificationPart" xmi:id="3173" id="3173" numberOfTestCases="5" minLength="10" maxLength="10">
......@@ -644,7 +644,6 @@
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="3508" id="3508"/>
<specifications xsi:type="org-fortiss-af3-component-annotation:MemoryRequirement" xmi:id="3568" id="3568"/>
<specifications xsi:type="org-fortiss-af3-safety-annotation:SafetyIntegrityLevel" xmi:id="3571" id="3571"/>
<specifications xsi:type="org-fortiss-af3-testing:TestSuiteContract" xmi:id="3576" client="3120" contractors="1295" id="3576" testSuite="1805"/>
</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">
......@@ -892,7 +891,7 @@
</rootElements>
<rootElements xsi:type="org-fortiss-af3-component:ComponentArchitecture" xmi:id="511" id="511" name="Component Architecture" referencedBy="//@rootElements.6/@componentArchitectureReference">
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="512" id="512" name="ACC System" comment="Oversall System with ACC and Simulation Frontend">
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="29" id="29" name="AdaptiveCruiseControl" comment="The ACC System" contractsWithContractors="3577">
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="29" id="29" name="AdaptiveCruiseControl" comment="The ACC System">
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="513" id="513" name="SpeedPlausibilization" comment="Component to ensure that measured speed is valid. &#xA;&#xA;The component ensures that the difference between the current and the previous measurement is within a certain limit.&#xA;If the difference exceeds the limit, no value is provided.">
<specifications xsi:type="org-fortiss-af3-state:StateAutomaton" xmi:id="3192" id="3192">
<containedElements xsi:type="org-fortiss-af3-state:State" xmi:id="514" id="514" name="Root State" comment="">
......@@ -4269,7 +4268,7 @@
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Point" key="pos" x="396" y="372"/>
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="229" height="85"/>
</containedElements>
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="817" id="817" name="AccelerationControl" comment="Component computing the acceleration to be commanded, based on the acceleration requested by the ACC or directly by the driver." contractsWithClients="3577">
<containedElements xsi:type="org-fortiss-af3-component:Component" xmi:id="817" id="817" name="AccelerationControl" comment="Component computing the acceleration to be commanded, based on the acceleration requested by the ACC or directly by the driver.">
<specifications xsi:type="org-fortiss-af3-state:StateAutomaton" xmi:id="3455" id="3455">
<containedElements xsi:type="org-fortiss-af3-state:State" xmi:id="818" id="818" name="Root State" comment="TODO">
<containedElements xsi:type="org-fortiss-af3-state:State" xmi:id="819" id="819" name="Off" comment="In this state, acceleration is only controled by the gas/break pedal position. The generally, breaking takes precedence over acceleration. ">
......@@ -6347,7 +6346,6 @@
</containedElements>
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="3496" id="3496"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="3562" id="3562"/>
<specifications xsi:type="org-fortiss-af3-testing:TestSuiteContract" xmi:id="3577" client="29" contractors="817" id="3577" testSuite="3121"/>
<connections xsi:type="org-fortiss-af3-component:Channel" xmi:id="839" id="839" name="SensedSpeed" comment="TODO" source="852" target="531">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</connections>
......@@ -6506,10 +6504,20 @@
<rootElements xsi:type="org-fortiss-af3-deployment:Deployment" xmi:id="1315" id="1315" name="Deployment">
<componentArchitectureReference reference="511"/>
<platformArchitectureReference reference="21"/>
<componentAllocations component="553" executionUnit="23"/>
<componentAllocations component="623" executionUnit="23"/>
<componentAllocations component="513" executionUnit="22"/>
<componentAllocations component="533" executionUnit="22"/>
<componentAllocations component="817" executionUnit="23"/>
<componentAllocations xmi:id="3581" id="3581" component="553" executionUnit="23">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</componentAllocations>
<componentAllocations xmi:id="3582" id="3582" component="623" executionUnit="23">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</componentAllocations>
<componentAllocations xmi:id="3583" id="3583" component="513" executionUnit="22">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</componentAllocations>
<componentAllocations xmi:id="3584" id="3584" component="533" executionUnit="22">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</componentAllocations>
<componentAllocations xmi:id="3585" id="3585" component="817" executionUnit="23">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</componentAllocations>
</rootElements>
</org-fortiss-af3-project:FileProject>
<?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-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" 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-operatorpanel="http://www.fortiss.org/af3/operatorpanel" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" 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-sil="http://www.fortiss.org/af3/sil" xmlns:org-fortiss-af3-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-af3-tlspec="http://www.fortiss.org/af3/tlspec" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="0" name="Emergency-Stop-Module-Weakly-Causal">
<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-component="http://www.fortiss.org/af3/component" xmlns:org-fortiss-af3-deployment="http://www.fortiss.org/af3/deployment" 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-operatorpanel="http://www.fortiss.org/af3/operatorpanel" xmlns:org-fortiss-af3-platform="http://www.fortiss.org/af3/platform" xmlns:org-fortiss-af3-platform-generic="http://www.fortiss.org/af3/platform/generic" 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-state="http://www.fortiss.org/af3/state" xmlns:org-fortiss-tooling-base-model-layout="http://www.fortiss.org/tooling/base/model/layout" xmi:id="2269" id="2269" name="Emergency-Stop-Module-Weakly-Causal">
<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"/>
......@@ -4162,7 +4162,6 @@
<type xsi:type="org-fortiss-af3-expression-types:TDefinedType" name="LED" def="22"/>
</dataStateVariables>
</specifications>
<specifications xsi:type="org-fortiss-af3-sil:SILLevel" xmi:id="2187" id="2187"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="2251" id="2251"/>
<connectors xsi:type="org-fortiss-af3-component:InputPort" xmi:id="515" id="515" name="SS1_output" comment="" incoming="516">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="2188" id="2188">
......@@ -4486,7 +4485,6 @@
<type xsi:type="org-fortiss-af3-expression-types:TDefinedType" name="LED" def="22"/>
</dataStateVariables>
</specifications>
<specifications xsi:type="org-fortiss-af3-sil:SILLevel" xmi:id="2203" id="2203"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="2252" id="2252"/>
<connectors xsi:type="org-fortiss-af3-component:OutputPort" xmi:id="519" id="519" name="led2" comment="" outgoing="520">
<specifications xsi:type="org-fortiss-af3-component:PortSpecification" xmi:id="2204" id="2204">
......@@ -4558,8 +4556,6 @@
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Dimension" key="dim" width="145" height="97"/>
</containedElements>
<specifications xsi:type="org-fortiss-af3-component:CausalityComponentSpecification" xmi:id="2214" id="2214" stronglyCausal="true"/>
<specifications xsi:type="org-fortiss-af3-tlspec:TemporalLogicsSpecification" xmi:id="2215" id="2215"/>
<specifications xsi:type="org-fortiss-af3-sil:SILLevel" xmi:id="2216" id="2216"/>
<specifications xsi:type="org-fortiss-af3-component:VerifBehaviourComponentSpecification" xmi:id="2254" id="2254"/>
<connections xsi:type="org-fortiss-af3-component:Channel" xmi:id="512" id="512" name="STO_output" comment="" source="504" target="511">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
......@@ -4994,7 +4990,9 @@
<rootElements xsi:type="org-fortiss-af3-deployment:Deployment" xmi:id="1849" id="1849" name="Deployment">
<componentArchitectureReference reference="4"/>
<platformArchitectureReference reference="1844"/>
<componentAllocations component="8" executionUnit="1845"/>
<componentAllocations xmi:id="2270" id="2270" component="8" executionUnit="1845">
<layoutData xsi:type="org-fortiss-tooling-base-model-layout:Points" key="points"/>
</componentAllocations>
<portAllocations xsi:type="org-fortiss-af3-deployment:InputPortAllocation" inputPort="640" receiver="1848"/>
<portAllocations xsi:type="org-fortiss-af3-deployment:OutputPortAllocation" outputPort="619" transmitter="1846"/>
</rootElements>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Supports Markdown
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