From 609c979f2662e846caf4215c40ab66fb744c8e13 Mon Sep 17 00:00:00 2001 From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr> Date: Tue, 12 Jan 2021 16:47:30 +0100 Subject: [PATCH] Adding testing model for stats --- modeling/AVATAR/AirbusDoor_V2.xml | 142 +++++++++++++------------- modeling/AVATAR/testStats.xml | 161 ++++++++++++++++++++++++++++++ ttool/META-INF/MANIFEST.MF | 4 - ttool/ttool.txt | 2 +- 4 files changed, 233 insertions(+), 76 deletions(-) create mode 100644 modeling/AVATAR/testStats.xml delete mode 100644 ttool/META-INF/MANIFEST.MF diff --git a/modeling/AVATAR/AirbusDoor_V2.xml b/modeling/AVATAR/AirbusDoor_V2.xml index b181335619..4e66828112 100644 --- a/modeling/AVATAR/AirbusDoor_V2.xml +++ b/modeling/AVATAR/AirbusDoor_V2.xml @@ -1883,7 +1883,7 @@ <MainCode value="}"/> <Optimized value="true" /> <considerTimingOperators value="true" /> -<Validated value="OnboardPersons;KeyboardFailure;Passenger;Crew;FirstOfficer;Captain;Person;System;DoorAndLockButton;Keyboard;" /> +<Validated value="" /> <Ignored value="" /> <CONNECTOR type="5002" id="1199" > @@ -1891,7 +1891,7 @@ <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="" /> <TGConnectingPoint num="0" id="1198" /> -<P1 x="757" y="349" id="1480" /> +<P1 x="757" y="349" id="1455" /> <P2 x="715" y="303" id="1354" /> <AutomaticDrawing data="true" /> <extraparam> @@ -1906,7 +1906,7 @@ <infoparam name="connector" value="" /> <TGConnectingPoint num="0" id="1200" /> <P1 x="715" y="205" id="1361" /> -<P2 x="757" y="134" id="1455" /> +<P2 x="757" y="134" id="1480" /> <AutomaticDrawing data="true" /> <extraparam> <isd value="in lock()" /> @@ -2042,11 +2042,11 @@ in DoorAndLockButton </COMPONENT> <SUBCOMPONENT type="5000" id="1249" > <father id="1374" num="0" /> -<cdparam x="558" y="184" /> -<sizeparam width="136" height="190" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="71" y="280" /> +<sizeparam width="225" height="98" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="527" minY="0" maxY="200" /> -<infoparam name="Block0" value="KeyboardFailure" /> +<cdrectangleparam minX="0" maxX="438" minY="0" maxY="292" /> +<infoparam name="Block0" value="Captain" /> <TGConnectingPoint num="0" id="1225" /> <TGConnectingPoint num="1" id="1226" /> <TGConnectingPoint num="2" id="1227" /> @@ -2074,16 +2074,18 @@ in DoorAndLockButton <extraparam> <blockType data="block" color="-4072719" /> <CryptoBlock value="false" /> -<Attribute access="0" id="codeValue" value="1" type="8" typeOther="" /> +<Attribute access="0" id="isInCockpit" value="true" type="4" typeOther="" /> +<Attribute access="0" id="knowsEmergencyCode" value="true" type="4" typeOther="" /> +<Attribute access="0" id="code" value="" type="5" typeOther="Code" /> </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="5000" id="1274" > <father id="1374" num="1" /> -<cdparam x="319" y="175" /> -<sizeparam width="217" height="98" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="71" y="386" /> +<sizeparam width="225" height="98" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="446" minY="0" maxY="292" /> -<infoparam name="Block0" value="Passenger" /> +<cdrectangleparam minX="0" maxX="438" minY="0" maxY="292" /> +<infoparam name="Block0" value="FirstOfficer" /> <TGConnectingPoint num="0" id="1250" /> <TGConnectingPoint num="1" id="1251" /> <TGConnectingPoint num="2" id="1252" /> @@ -2111,8 +2113,8 @@ in DoorAndLockButton <extraparam> <blockType data="block" color="-4072719" /> <CryptoBlock value="false" /> -<Attribute access="0" id="isInCockpit" value="false" type="4" typeOther="" /> -<Attribute access="0" id="knowsEmergencyCode" value="false" type="4" typeOther="" /> +<Attribute access="0" id="isInCockpit" value="true" type="4" typeOther="" /> +<Attribute access="0" id="knowsEmergencyCode" value="true" type="4" typeOther="" /> <Attribute access="0" id="code" value="" type="5" typeOther="Code" /> </extraparam> </SUBCOMPONENT> @@ -2157,11 +2159,11 @@ in DoorAndLockButton </SUBCOMPONENT> <SUBCOMPONENT type="5000" id="1324" > <father id="1374" num="3" /> -<cdparam x="71" y="386" /> -<sizeparam width="225" height="98" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="319" y="175" /> +<sizeparam width="217" height="98" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="438" minY="0" maxY="292" /> -<infoparam name="Block0" value="FirstOfficer" /> +<cdrectangleparam minX="0" maxX="446" minY="0" maxY="292" /> +<infoparam name="Block0" value="Passenger" /> <TGConnectingPoint num="0" id="1300" /> <TGConnectingPoint num="1" id="1301" /> <TGConnectingPoint num="2" id="1302" /> @@ -2189,18 +2191,18 @@ in DoorAndLockButton <extraparam> <blockType data="block" color="-4072719" /> <CryptoBlock value="false" /> -<Attribute access="0" id="isInCockpit" value="true" type="4" typeOther="" /> -<Attribute access="0" id="knowsEmergencyCode" value="true" type="4" typeOther="" /> +<Attribute access="0" id="isInCockpit" value="false" type="4" typeOther="" /> +<Attribute access="0" id="knowsEmergencyCode" value="false" type="4" typeOther="" /> <Attribute access="0" id="code" value="" type="5" typeOther="Code" /> </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="5000" id="1349" > <father id="1374" num="4" /> -<cdparam x="71" y="280" /> -<sizeparam width="225" height="98" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="558" y="184" /> +<sizeparam width="136" height="190" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="438" minY="0" maxY="292" /> -<infoparam name="Block0" value="Captain" /> +<cdrectangleparam minX="0" maxX="527" minY="0" maxY="200" /> +<infoparam name="Block0" value="KeyboardFailure" /> <TGConnectingPoint num="0" id="1325" /> <TGConnectingPoint num="1" id="1326" /> <TGConnectingPoint num="2" id="1327" /> @@ -2228,9 +2230,7 @@ in DoorAndLockButton <extraparam> <blockType data="block" color="-4072719" /> <CryptoBlock value="false" /> -<Attribute access="0" id="isInCockpit" value="true" type="4" typeOther="" /> -<Attribute access="0" id="knowsEmergencyCode" value="true" type="4" typeOther="" /> -<Attribute access="0" id="code" value="" type="5" typeOther="Code" /> +<Attribute access="0" id="codeValue" value="1" type="8" typeOther="" /> </extraparam> </SUBCOMPONENT> @@ -2432,11 +2432,11 @@ DoorAndLockButton.IN_EMERGENCY_CALL --> DoorAndLockButton.CLOSED_AND_LOCKED | </COMPONENT> <SUBCOMPONENT type="5000" id="1469" > <father id="1519" num="0" /> -<cdparam x="757" y="83" /> -<sizeparam width="250" height="205" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="757" y="299" /> +<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="751" minY="0" maxY="285" /> -<infoparam name="Block0" value="DoorAndLockButton" /> +<cdrectangleparam minX="0" maxX="751" minY="0" maxY="290" /> +<infoparam name="Block0" value="Keyboard" /> <TGConnectingPoint num="0" id="1445" /> <TGConnectingPoint num="1" id="1446" /> <TGConnectingPoint num="2" id="1447" /> @@ -2464,9 +2464,8 @@ DoorAndLockButton.IN_EMERGENCY_CALL --> DoorAndLockButton.CLOSED_AND_LOCKED | <extraparam> <blockType data="cryptoblock" color="-4072719" /> <CryptoBlock value="true" /> -<Attribute access="0" id="inside" value="2" type="8" typeOther="" /> -<Attribute access="0" id="outside" value="2" type="8" typeOther="" /> -<Attribute access="0" id="timeout" value="0" type="8" typeOther="" /> +<Attribute access="0" id="codeValue" value="" type="8" typeOther="" /> +<Attribute access="0" id="code" value="" type="5" typeOther="Code" /> <Attribute access="0" id="m" value="" type="5" typeOther="Message" /> <Attribute access="0" id="sk" value="" type="5" typeOther="Key" /> <Attribute access="0" id="m1" value="" type="5" typeOther="Message" /> @@ -2490,22 +2489,16 @@ DoorAndLockButton.IN_EMERGENCY_CALL --> DoorAndLockButton.CLOSED_AND_LOCKED | <Method value="get2(Message msg, Message msg1, Message msg2)" /> <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" /> <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" /> -<Signal value="in lock()" attached="true" /> -<Signal value="in unlock()" attached="true" /> -<Signal value="in open()" attached="true" /> -<Signal value="in close()" attached="true" /> -<Signal value="in enterCockpit()" attached="true" /> -<Signal value="in leaveCockpit()" attached="true" /> -<Signal value="in emergencyCall()" attached="false" /> +<Signal value="in code(int codeValue)" attached="true" /> </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="5000" id="1494" > <father id="1519" num="1" /> -<cdparam x="757" y="299" /> -<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="757" y="83" /> +<sizeparam width="250" height="205" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="751" minY="0" maxY="290" /> -<infoparam name="Block0" value="Keyboard" /> +<cdrectangleparam minX="0" maxX="751" minY="0" maxY="285" /> +<infoparam name="Block0" value="DoorAndLockButton" /> <TGConnectingPoint num="0" id="1470" /> <TGConnectingPoint num="1" id="1471" /> <TGConnectingPoint num="2" id="1472" /> @@ -2533,8 +2526,9 @@ DoorAndLockButton.IN_EMERGENCY_CALL --> DoorAndLockButton.CLOSED_AND_LOCKED | <extraparam> <blockType data="cryptoblock" color="-4072719" /> <CryptoBlock value="true" /> -<Attribute access="0" id="codeValue" value="" type="8" typeOther="" /> -<Attribute access="0" id="code" value="" type="5" typeOther="Code" /> +<Attribute access="0" id="inside" value="2" type="8" typeOther="" /> +<Attribute access="0" id="outside" value="2" type="8" typeOther="" /> +<Attribute access="0" id="timeout" value="0" type="8" typeOther="" /> <Attribute access="0" id="m" value="" type="5" typeOther="Message" /> <Attribute access="0" id="sk" value="" type="5" typeOther="Key" /> <Attribute access="0" id="m1" value="" type="5" typeOther="Message" /> @@ -2558,7 +2552,13 @@ DoorAndLockButton.IN_EMERGENCY_CALL --> DoorAndLockButton.CLOSED_AND_LOCKED | <Method value="get2(Message msg, Message msg1, Message msg2)" /> <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" /> <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" /> -<Signal value="in code(int codeValue)" attached="true" /> +<Signal value="in lock()" attached="true" /> +<Signal value="in unlock()" attached="true" /> +<Signal value="in open()" attached="true" /> +<Signal value="in close()" attached="true" /> +<Signal value="in enterCockpit()" attached="true" /> +<Signal value="in leaveCockpit()" attached="true" /> +<Signal value="in emergencyCall()" attached="false" /> </extraparam> </SUBCOMPONENT> @@ -6188,7 +6188,7 @@ DoorAndLockButton.IN_EMERGENCY_CALL --> DoorAndLockButton.CLOSED_AND_LOCKED | <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <infoparam name="connector" value="" /> <TGConnectingPoint num="0" id="3042" /> -<P1 x="839" y="296" id="3199" /> +<P1 x="839" y="296" id="3224" /> <P2 x="802" y="303" id="3081" /> <AutomaticDrawing data="true" /> <extraparam> @@ -6203,7 +6203,7 @@ DoorAndLockButton.IN_EMERGENCY_CALL --> DoorAndLockButton.CLOSED_AND_LOCKED | <infoparam name="connector" value="" /> <TGConnectingPoint num="0" id="3044" /> <P1 x="802" y="205" id="3088" /> -<P2 x="1094" y="139" id="3224" /> +<P2 x="1094" y="139" id="3199" /> <AutomaticDrawing data="true" /> <extraparam> <isd value="in lock()" /> @@ -6573,11 +6573,11 @@ in DoorAndLockButton </COMPONENT> <SUBCOMPONENT type="5000" id="3213" > <father id="3263" num="0" /> -<cdparam x="839" y="246" /> -<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="1094" y="88" /> +<sizeparam width="212" height="205" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="1037" minY="0" maxY="298" /> -<infoparam name="Block0" value="Keyboard" /> +<cdrectangleparam minX="0" maxX="1075" minY="0" maxY="293" /> +<infoparam name="Block0" value="DoorAndLockButton" /> <TGConnectingPoint num="0" id="3189" /> <TGConnectingPoint num="1" id="3190" /> <TGConnectingPoint num="2" id="3191" /> @@ -6605,8 +6605,9 @@ in DoorAndLockButton <extraparam> <blockType data="cryptoblock" color="-4072719" /> <CryptoBlock value="true" /> -<Attribute access="0" id="codeValue" value="" type="8" typeOther="" /> -<Attribute access="0" id="code" value="" type="5" typeOther="Code" /> +<Attribute access="0" id="inside" value="2" type="8" typeOther="" /> +<Attribute access="0" id="outside" value="2" type="8" typeOther="" /> +<Attribute access="0" id="timeout" value="0" type="8" typeOther="" /> <Attribute access="0" id="m" value="" type="5" typeOther="Message" /> <Attribute access="0" id="sk" value="" type="5" typeOther="Key" /> <Attribute access="0" id="m1" value="" type="5" typeOther="Message" /> @@ -6630,16 +6631,22 @@ in DoorAndLockButton <Method value="get2(Message msg, Message msg1, Message msg2)" /> <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" /> <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" /> -<Signal value="in code(int codeValue)" attached="true" /> +<Signal value="in lock()" attached="true" /> +<Signal value="in unlock()" attached="true" /> +<Signal value="in open()" attached="true" /> +<Signal value="in close()" attached="true" /> +<Signal value="in enterCockpit()" attached="true" /> +<Signal value="in leaveCockpit()" attached="true" /> +<Signal value="in emergencyCall()" attached="false" /> </extraparam> </SUBCOMPONENT> <SUBCOMPONENT type="5000" id="3238" > <father id="3263" num="1" /> -<cdparam x="1094" y="88" /> -<sizeparam width="212" height="205" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="839" y="246" /> +<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="1075" minY="0" maxY="293" /> -<infoparam name="Block0" value="DoorAndLockButton" /> +<cdrectangleparam minX="0" maxX="1037" minY="0" maxY="298" /> +<infoparam name="Block0" value="Keyboard" /> <TGConnectingPoint num="0" id="3214" /> <TGConnectingPoint num="1" id="3215" /> <TGConnectingPoint num="2" id="3216" /> @@ -6667,9 +6674,8 @@ in DoorAndLockButton <extraparam> <blockType data="cryptoblock" color="-4072719" /> <CryptoBlock value="true" /> -<Attribute access="0" id="inside" value="2" type="8" typeOther="" /> -<Attribute access="0" id="outside" value="2" type="8" typeOther="" /> -<Attribute access="0" id="timeout" value="0" type="8" typeOther="" /> +<Attribute access="0" id="codeValue" value="" type="8" typeOther="" /> +<Attribute access="0" id="code" value="" type="5" typeOther="Code" /> <Attribute access="0" id="m" value="" type="5" typeOther="Message" /> <Attribute access="0" id="sk" value="" type="5" typeOther="Key" /> <Attribute access="0" id="m1" value="" type="5" typeOther="Message" /> @@ -6693,13 +6699,7 @@ in DoorAndLockButton <Method value="get2(Message msg, Message msg1, Message msg2)" /> <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" /> <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" /> -<Signal value="in lock()" attached="true" /> -<Signal value="in unlock()" attached="true" /> -<Signal value="in open()" attached="true" /> -<Signal value="in close()" attached="true" /> -<Signal value="in enterCockpit()" attached="true" /> -<Signal value="in leaveCockpit()" attached="true" /> -<Signal value="in emergencyCall()" attached="false" /> +<Signal value="in code(int codeValue)" attached="true" /> </extraparam> </SUBCOMPONENT> diff --git a/modeling/AVATAR/testStats.xml b/modeling/AVATAR/testStats.xml new file mode 100644 index 0000000000..e0e7dcf690 --- /dev/null +++ b/modeling/AVATAR/testStats.xml @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="1"> + +<Modeling type="AVATAR Design" nameTab="Design" tabs="Design$Block0" > +<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" > +<MainCode value="void __user_init() {"/> +<MainCode value="}"/> +<Optimized value="true" /> +<considerTimingOperators value="true" /> +<Validated value="Block0;" /> +<Ignored value="" /> + +<COMPONENT type="5000" id="4675" > +<cdparam x="234" y="40" /> +<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="Block0" value="Block0" /> +<TGConnectingPoint num="0" id="4676" /> +<TGConnectingPoint num="1" id="4677" /> +<TGConnectingPoint num="2" id="4678" /> +<TGConnectingPoint num="3" id="4679" /> +<TGConnectingPoint num="4" id="4680" /> +<TGConnectingPoint num="5" id="4681" /> +<TGConnectingPoint num="6" id="4682" /> +<TGConnectingPoint num="7" id="4683" /> +<TGConnectingPoint num="8" id="4684" /> +<TGConnectingPoint num="9" id="4685" /> +<TGConnectingPoint num="10" id="4686" /> +<TGConnectingPoint num="11" id="4687" /> +<TGConnectingPoint num="12" id="4688" /> +<TGConnectingPoint num="13" id="4689" /> +<TGConnectingPoint num="14" id="4690" /> +<TGConnectingPoint num="15" id="4691" /> +<TGConnectingPoint num="16" id="4692" /> +<TGConnectingPoint num="17" id="4693" /> +<TGConnectingPoint num="18" id="4694" /> +<TGConnectingPoint num="19" id="4695" /> +<TGConnectingPoint num="20" id="4696" /> +<TGConnectingPoint num="21" id="4697" /> +<TGConnectingPoint num="22" id="4698" /> +<TGConnectingPoint num="23" id="4699" /> +<extraparam> +<blockType data="block" color="-4072719" /> +<CryptoBlock value="false" /> +<Attribute access="0" id="x" value="" type="8" typeOther="" /> +</extraparam> +</COMPONENT> + + +</AVATARBlockDiagramPanel> + +<AVATARStateMachineDiagramPanel name="Block0" minX="10" maxX="2500" minY="10" maxY="1500" > +<CONNECTOR type="5102" id="4714" > +<cdparam x="409" y="124" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="4715" /> +<P1 x="409" y="124" id="4713" /> +<P2 x="409" y="180" id="4703" /> +<AutomaticDrawing data="true" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="4716" > +<father id="4714" num="0" /> +<cdparam x="416" y="152" /> +<sizeparam width="61" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<TGConnectingPoint num="0" id="4717" /> +<TGConnectingPoint num="1" id="4718" /> +<TGConnectingPoint num="2" id="4719" /> +<TGConnectingPoint num="3" id="4720" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="x" enabled="true"/> +<afterMax value="x" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + +<COMPONENT type="5108" id="4711" > +<cdparam x="331" y="99" /> +<sizeparam width="157" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="TGComponent" value="null" /> +<TGConnectingPoint num="0" id="4712" /> +<TGConnectingPoint num="1" id="4713" /> +<extraparam> +<Data variable="x" minValue="0" maxValue="100" functionId="5" extraAttribute1="20" extraAttribute2="30" /> +</extraparam> +</COMPONENT> + +<COMPONENT type="5101" id="4702" > +<cdparam x="399" y="185" /> +<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="stop state" value="null" /> +<TGConnectingPoint num="0" id="4703" /> +</COMPONENT> + +<COMPONENT type="5100" id="4700" > +<cdparam x="400" y="50" /> +<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="start state" value="null" /> +<TGConnectingPoint num="0" id="4701" /> +</COMPONENT> + +<CONNECTOR type="5102" id="4704" > +<cdparam x="407" y="70" /> +<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<infoparam name="connector" value="null" /> +<TGConnectingPoint num="0" id="4705" /> +<P1 x="407" y="70" id="4701" /> +<P2 x="409" y="94" id="4712" /> +<AutomaticDrawing data="true" /> +</CONNECTOR><SUBCOMPONENT type="-1" id="4706" > +<father id="4704" num="0" /> +<cdparam x="407" y="102" /> +<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<hidden value="false" /> +<enabled value="true" /> +<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> +<infoparam name="List of all parameters of an Avatar SMD transition" value="" /> +<TGConnectingPoint num="0" id="4707" /> +<TGConnectingPoint num="1" id="4708" /> +<TGConnectingPoint num="2" id="4709" /> +<TGConnectingPoint num="3" id="4710" /> +<extraparam> +<guard value="[ ]" enabled="true"/> +<afterMin value="" enabled="true"/> +<afterMax value="" enabled="true"/> +<extraDelay1 value="" enabled="true"/> +<extraDelay2 value="" enabled="true"/> +<delayDistributionLaw value="0" enabled="true"/> +<computeMin value="" enabled="true"/> +<computeMax value="" enabled="true"/> +<probability value="" enabled="true"/> +</extraparam> +</SUBCOMPONENT> + + +</AVATARStateMachineDiagramPanel> + +</Modeling> + + + + +</TURTLEGMODELING> \ No newline at end of file diff --git a/ttool/META-INF/MANIFEST.MF b/ttool/META-INF/MANIFEST.MF deleted file mode 100644 index 38955a0943..0000000000 --- a/ttool/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: jsoup-1.8.1.jar commons-codec-1.10.jar gs-core-1.3.jar gs-ui-1.3.jar commons-io-2.5.jar commons-math3-3.6.1.jar batik-awt-util.jar batik-dom.jar batik-svggen.jar batik-util.jar batik-xml.jar jautomata-core.jar com.microsoft.z3.jar jna-3.3.0.jar -Main-Class: Main - diff --git a/ttool/ttool.txt b/ttool/ttool.txt index 8950236ff4..1c454a49c8 100755 --- a/ttool/ttool.txt +++ b/ttool/ttool.txt @@ -1,2 +1,2 @@ Main-Class: Main -Class-Path: ./opencloud.jar ./JavaPlot.jar ./derbynet.jar ./commons-math3-3.6.1.jar ./jsoup-1.8.1.jar ./commons-codec-1.10.jar ./gs-core-2.0.jar ./gs-core-2.0.jar ./gs-ui-swing-2.0.jar ./commons-io-2.5.jar ./batik-codec.jar ./batik-constants.jar ./batik-xml.jar ./batik-ext.jar ./batik-extensions.jar ./batik-util.jar ./batik-svggen.jar ./batik-dom.jar ./batik-awt-util.jar xml-apis.jar ./jautomata-core.jar ./com.microsoft.z3.jar ./jgrapht-core-1.3.0.jar ./jgrapht-ext-1.3.0.jar ./jgrapht-io-1.3.0.jar ./jgraphx-3.4.1.3.jar ./json-java.jar ./jfreechart-1.6.0.jar +Class-Path: ./opencloud.jar ./JavaPlot.jar ./derbynet.jar ./commons-math3-3.6.1.jar ./jsoup-1.8.1.jar ./commons-codec-1.10.jar ./gs-core-2.0.jar ./gs-ui-swing-2.0.jar ./commons-io-2.5.jar ./batik-codec.jar ./batik-constants.jar ./batik-xml.jar ./batik-ext.jar ./batik-extensions.jar ./batik-util.jar ./batik-svggen.jar ./batik-dom.jar ./batik-awt-util.jar xml-apis.jar ./jautomata-core.jar ./com.microsoft.z3.jar ./jgrapht-core-1.3.0.jar ./jgrapht-ext-1.3.0.jar ./jgrapht-io-1.3.0.jar ./jgraphx-3.4.1.3.jar ./json-java.jar ./jfreechart-1.6.0.jar -- GitLab