diff --git a/build.txt b/build.txt index ab089d27699c6a33e051cebee8cd701fedc20f72..ca4f4b1509f198248469a27c4f27539080cc4b43 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -13198 \ No newline at end of file +13201 \ No newline at end of file diff --git a/doc/cli/scriptDSEWithZ3 b/doc/cli/scriptDSEWithZ3 new file mode 100644 index 0000000000000000000000000000000000000000..4ec1e300990ffba709dc52b8264509400fdc2292 --- /dev/null +++ b/doc/cli/scriptDSEWithZ3 @@ -0,0 +1,7 @@ +set model ./../tmlcode/specz3.tmap +tml load $model +tml checksyntax +tml loadz3lib /opt/z3/bin/libz3.dylib:/opt/z3/bin/libz3java.dylib +tml z3opt +tml save-result ../tmlcode/z3result +tml save-result-tml-mapping ../tmlcode/z3result diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src index 318ad1aba0dc6c25adff59226637339f0066ad94..ddc0929c15dc4d85c41f76012a09161c649c9b7c 100755 --- a/executablecode/Makefile.src +++ b/executablecode/Makefile.src @@ -1 +1 @@ -SRCS = generated_src/main.c generated_src/AlarmActuator.c generated_src/PressureSensor.c generated_src/PressureController.c generated_src/AlarmManager.c generated_src/MainController.c generated_src/Timer__alarmTimer__AlarmManager.c \ No newline at end of file +SRCS = generated_src/main.c generated_src/AlarmActuator.c generated_src/PressureSensor.c generated_src/PressureController.c generated_src/MainController.c generated_src/AlarmManager.c generated_src/Timer__alarmTimer__AlarmManager.c \ No newline at end of file diff --git a/modeling/DIPLODOCUS/BugTraceDisplaying.xml b/modeling/DIPLODOCUS/BugTraceDisplaying.xml deleted file mode 100644 index e9f9898172ac21fde103cca723beab56809991db..0000000000000000000000000000000000000000 --- a/modeling/DIPLODOCUS/BugTraceDisplaying.xml +++ /dev/null @@ -1,698 +0,0 @@ -<?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="2"> - -<Modeling type="TML Component Design" nameTab="TestCycleEvt_wait" tabs="TML Component Task Diagram$C1$C0" > -<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" > -<CONNECTOR type="126" id="1" > -<cdparam x="442" y="295" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="Connector between ports" /> -<P1 x="456" y="258" id="13" /> -<P2 x="613" y="277" id="2" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<COMPONENT type="1202" id="12" > -<cdparam x="626" y="195" /> -<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="Primitive component" value="C1" /> -<TGConnectingPoint num="0" id="4" /> -<TGConnectingPoint num="1" id="5" /> -<TGConnectingPoint num="2" id="6" /> -<TGConnectingPoint num="3" id="7" /> -<TGConnectingPoint num="4" id="8" /> -<TGConnectingPoint num="5" id="9" /> -<TGConnectingPoint num="6" id="10" /> -<TGConnectingPoint num="7" id="11" /> -<extraparam> -<Data isAttacker="No" daemon="false" Operation="" /> -<Attribute access="2" id="x" value="" type="0" typeOther="" /> -</extraparam> -</COMPONENT> -<SUBCOMPONENT type="1203" id="3" > -<father id="12" num="0" /> -<cdparam x="613" y="264" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" /> -<infoparam name="Primitive port" value="Event evt" /> -<TGConnectingPoint num="0" id="2" /> -<extraparam> -<Prop commName="evt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" /> -<Type type="1" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -</extraparam> -</SUBCOMPONENT> - -<COMPONENT type="1202" id="23" > -<cdparam x="243" y="158" /> -<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="Primitive component" value="C0" /> -<TGConnectingPoint num="0" id="15" /> -<TGConnectingPoint num="1" id="16" /> -<TGConnectingPoint num="2" id="17" /> -<TGConnectingPoint num="3" id="18" /> -<TGConnectingPoint num="4" id="19" /> -<TGConnectingPoint num="5" id="20" /> -<TGConnectingPoint num="6" id="21" /> -<TGConnectingPoint num="7" id="22" /> -<extraparam> -<Data isAttacker="No" daemon="false" Operation="" /> -<Attribute access="2" id="x" value="0" type="0" typeOther="" /> -</extraparam> -</COMPONENT> -<SUBCOMPONENT type="1203" id="14" > -<father id="23" num="0" /> -<cdparam x="430" y="245" /> -<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" /> -<infoparam name="Primitive port" value="Event evt" /> -<TGConnectingPoint num="0" id="13" /> -<extraparam> -<Prop commName="evt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" /> -<Type type="1" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -<Type type="0" typeOther="" /> -</extraparam> -</SUBCOMPONENT> - - -</TMLComponentTaskDiagramPanel> - -<TMLActivityDiagramPanel name="C1" minX="10" maxX="2500" minY="10" maxY="1500" > -<COMPONENT type="1001" id="25" > -<cdparam x="513" y="301" /> -<sizeparam width="20" height="20" minWidth="1" minHeight="1" 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="24" /> -</COMPONENT> - -<COMPONENT type="1010" id="28" > -<cdparam x="496" y="185" /> -<sizeparam width="49" height="20" minWidth="30" minHeight="1" 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="wait event" value="evt(x) " /> -<TGConnectingPoint num="0" id="26" /> -<TGConnectingPoint num="1" id="27" /> -<extraparam> -<Data eventName="evt" nbOfParams="5" /> -<Param index="0" value="x" /> -</extraparam> -</COMPONENT> - -<COMPONENT type="1030" id="31" > -<cdparam x="364" y="113" /> -<sizeparam width="92" height="20" minWidth="30" minHeight="1" 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="for ever loop" value="Loop for ever" /> -<TGConnectingPoint num="0" id="29" /> -<TGConnectingPoint num="1" id="30" /> -</COMPONENT> - -<COMPONENT type="1000" id="33" > -<cdparam x="400" y="50" /> -<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="32" /> -</COMPONENT> - -<CONNECTOR type="115" id="34" > -<cdparam x="407" y="65" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="407" y="65" id="32" /> -<P2 x="410" y="108" id="29" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="115" id="35" > -<cdparam x="456" y="127" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="456" y="127" id="30" /> -<P2 x="520" y="180" id="26" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="115" id="36" > -<cdparam x="500" y="181" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="520" y="210" id="27" /> -<P2 x="523" y="296" id="24" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> - -</TMLActivityDiagramPanel> - -<TMLActivityDiagramPanel name="C0" minX="10" maxX="2500" minY="10" maxY="1500" > -<COMPONENT type="1026" id="40" > -<cdparam x="551" y="238" /> -<sizeparam width="10" height="30" minWidth="1" minHeight="1" 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="delay" value="null" /> -<TGConnectingPoint num="0" id="38" /> -<TGConnectingPoint num="1" id="39" /> -</COMPONENT> -<SUBCOMPONENT type="-1" id="37" > -<father id="40" num="0" /> -<cdparam x="566" y="258" /> -<sizeparam width="28" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> -<infoparam name="value of the delay" value="1 us" /> -<extraparam> -<TimeDelay minDelay="1" maxDelay="nope" hasMaxDelay="false" unit="us" /> -</extraparam> -</SUBCOMPONENT> - -<COMPONENT type="1030" id="43" > -<cdparam x="374" y="88" /> -<sizeparam width="92" height="20" minWidth="30" minHeight="1" 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="for ever loop" value="Loop for ever" /> -<TGConnectingPoint num="0" id="41" /> -<TGConnectingPoint num="1" id="42" /> -</COMPONENT> - -<COMPONENT type="1001" id="45" > -<cdparam x="562" y="325" /> -<sizeparam width="20" height="20" minWidth="1" minHeight="1" 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="44" /> -</COMPONENT> - -<COMPONENT type="1011" id="48" > -<cdparam x="494" y="170" /> -<sizeparam width="66" height="20" minWidth="30" minHeight="1" 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="action state" value="x = x + 1" /> -<TGConnectingPoint num="0" id="46" /> -<TGConnectingPoint num="1" id="47" /> -</COMPONENT> - -<COMPONENT type="1008" id="51" > -<cdparam x="488" y="122" /> -<sizeparam width="45" height="20" minWidth="30" minHeight="1" 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="send event" value="evt(x)" /> -<TGConnectingPoint num="0" id="49" /> -<TGConnectingPoint num="1" id="50" /> -<extraparam> -<Data eventName="evt" nbOfParams="5" /> -<Param index="0" value="x" /> -</extraparam> -</COMPONENT> - -<COMPONENT type="1000" id="53" > -<cdparam x="400" y="50" /> -<sizeparam width="15" height="15" minWidth="1" minHeight="1" 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="52" /> -</COMPONENT> - -<CONNECTOR type="115" id="54" > -<cdparam x="564" y="306" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="556" y="273" id="39" /> -<P2 x="572" y="320" id="44" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="115" id="55" > -<cdparam x="407" y="65" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="407" y="65" id="52" /> -<P2 x="420" y="83" id="41" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="115" id="56" > -<cdparam x="479" y="139" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="466" y="102" id="42" /> -<P2 x="510" y="117" id="49" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="115" id="57" > -<cdparam x="532" y="197" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="510" y="147" id="50" /> -<P2 x="527" y="165" id="46" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> -<CONNECTOR type="115" id="58" > -<cdparam x="555" y="255" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="null" /> -<P1 x="527" y="195" id="47" /> -<P2 x="556" y="233" id="38" /> -<AutomaticDrawing data="true" /> -</CONNECTOR> - -</TMLActivityDiagramPanel> - -</Modeling> - - - - -<Modeling type="TML Architecture" nameTab="Architecture" > -<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" > -<COMPONENT type="1102" id="83" > -<cdparam x="496" y="341" /> -<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="Bus0" value="name" /> -<TGConnectingPoint num="0" id="59" /> -<TGConnectingPoint num="1" id="60" /> -<TGConnectingPoint num="2" id="61" /> -<TGConnectingPoint num="3" id="62" /> -<TGConnectingPoint num="4" id="63" /> -<TGConnectingPoint num="5" id="64" /> -<TGConnectingPoint num="6" id="65" /> -<TGConnectingPoint num="7" id="66" /> -<TGConnectingPoint num="8" id="67" /> -<TGConnectingPoint num="9" id="68" /> -<TGConnectingPoint num="10" id="69" /> -<TGConnectingPoint num="11" id="70" /> -<TGConnectingPoint num="12" id="71" /> -<TGConnectingPoint num="13" id="72" /> -<TGConnectingPoint num="14" id="73" /> -<TGConnectingPoint num="15" id="74" /> -<TGConnectingPoint num="16" id="75" /> -<TGConnectingPoint num="17" id="76" /> -<TGConnectingPoint num="18" id="77" /> -<TGConnectingPoint num="19" id="78" /> -<TGConnectingPoint num="20" id="79" /> -<TGConnectingPoint num="21" id="80" /> -<TGConnectingPoint num="22" id="81" /> -<TGConnectingPoint num="23" id="82" /> -<extraparam> -<info stereotype="Bus" nodeName="Bus0" /> -<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" /> -</extraparam> -</COMPONENT> - -<COMPONENT type="1105" id="108" > -<cdparam x="749" y="86" /> -<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="Memory0" value="name" /> -<TGConnectingPoint num="0" id="84" /> -<TGConnectingPoint num="1" id="85" /> -<TGConnectingPoint num="2" id="86" /> -<TGConnectingPoint num="3" id="87" /> -<TGConnectingPoint num="4" id="88" /> -<TGConnectingPoint num="5" id="89" /> -<TGConnectingPoint num="6" id="90" /> -<TGConnectingPoint num="7" id="91" /> -<TGConnectingPoint num="8" id="92" /> -<TGConnectingPoint num="9" id="93" /> -<TGConnectingPoint num="10" id="94" /> -<TGConnectingPoint num="11" id="95" /> -<TGConnectingPoint num="12" id="96" /> -<TGConnectingPoint num="13" id="97" /> -<TGConnectingPoint num="14" id="98" /> -<TGConnectingPoint num="15" id="99" /> -<TGConnectingPoint num="16" id="100" /> -<TGConnectingPoint num="17" id="101" /> -<TGConnectingPoint num="18" id="102" /> -<TGConnectingPoint num="19" id="103" /> -<TGConnectingPoint num="20" id="104" /> -<TGConnectingPoint num="21" id="105" /> -<TGConnectingPoint num="22" id="106" /> -<TGConnectingPoint num="23" id="107" /> -<extraparam> -<info stereotype="MEMORY" nodeName="Memory0" /> -<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" /> -</extraparam> -</COMPONENT> - -<COMPONENT type="1100" id="151" > -<cdparam x="213" y="55" /> -<sizeparam width="345" height="232" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="CPU0" value="name" /> -<TGConnectingPoint num="0" id="127" /> -<TGConnectingPoint num="1" id="128" /> -<TGConnectingPoint num="2" id="129" /> -<TGConnectingPoint num="3" id="130" /> -<TGConnectingPoint num="4" id="131" /> -<TGConnectingPoint num="5" id="132" /> -<TGConnectingPoint num="6" id="133" /> -<TGConnectingPoint num="7" id="134" /> -<TGConnectingPoint num="8" id="135" /> -<TGConnectingPoint num="9" id="136" /> -<TGConnectingPoint num="10" id="137" /> -<TGConnectingPoint num="11" id="138" /> -<TGConnectingPoint num="12" id="139" /> -<TGConnectingPoint num="13" id="140" /> -<TGConnectingPoint num="14" id="141" /> -<TGConnectingPoint num="15" id="142" /> -<TGConnectingPoint num="16" id="143" /> -<TGConnectingPoint num="17" id="144" /> -<TGConnectingPoint num="18" id="145" /> -<TGConnectingPoint num="19" id="146" /> -<TGConnectingPoint num="20" id="147" /> -<TGConnectingPoint num="21" id="148" /> -<TGConnectingPoint num="22" id="149" /> -<TGConnectingPoint num="23" id="150" /> -<extraparam> -<info stereotype="CPURR" nodeName="CPU0" /> -<attributes nbOfCores="1" byteDataSize="4" schedulingPolicy="0" sliceTime="1" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/> -</extraparam> -</COMPONENT> -<SUBCOMPONENT type="1101" id="117" > -<father id="151" num="0" /> -<cdparam x="324" y="174" /> -<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="0" maxX="177" minY="0" maxY="192" /> -<infoparam name="TGComponent" value="TestCycleEvt_wait::C1" /> -<TGConnectingPoint num="0" id="109" /> -<TGConnectingPoint num="1" id="110" /> -<TGConnectingPoint num="2" id="111" /> -<TGConnectingPoint num="3" id="112" /> -<TGConnectingPoint num="4" id="113" /> -<TGConnectingPoint num="5" id="114" /> -<TGConnectingPoint num="6" id="115" /> -<TGConnectingPoint num="7" id="116" /> -<extraparam> -<info value="TestCycleEvt_wait::C1" taskName="C1" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C1" fatherComponentMECType="0" /> -</extraparam> -</SUBCOMPONENT> -<SUBCOMPONENT type="1101" id="126" > -<father id="151" num="1" /> -<cdparam x="299" y="116" /> -<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="0" maxX="177" minY="0" maxY="192" /> -<infoparam name="TGComponent" value="TestCycleEvt_wait::C0" /> -<TGConnectingPoint num="0" id="118" /> -<TGConnectingPoint num="1" id="119" /> -<TGConnectingPoint num="2" id="120" /> -<TGConnectingPoint num="3" id="121" /> -<TGConnectingPoint num="4" id="122" /> -<TGConnectingPoint num="5" id="123" /> -<TGConnectingPoint num="6" id="124" /> -<TGConnectingPoint num="7" id="125" /> -<extraparam> -<info value="TestCycleEvt_wait::C0" taskName="C0" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C0" fatherComponentMECType="0" /> -</extraparam> -</SUBCOMPONENT> - -<CONNECTOR type="125" id="152" > -<cdparam x="799" y="286" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="{info}" /> -<P1 x="799" y="286" id="98" /> -<P2 x="683" y="341" id="68" /> -<AutomaticDrawing data="true" /> -<extraparam> -<info priority="0" /> -<spy value="false" /> -</extraparam> -</CONNECTOR> -<CONNECTOR type="125" id="153" > -<cdparam x="389" y="286" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="{info}" /> -<P1 x="385" y="287" id="133" /> -<P2 x="558" y="341" id="67" /> -<AutomaticDrawing data="true" /> -<extraparam> -<info priority="0" /> -<spy value="false" /> -</extraparam> -</CONNECTOR> - -</TMLArchiDiagramPanel> - -</Modeling> - - - - -<Modeling type="TML Architecture" nameTab="ArchitectureWithFPGA" > -<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" > -<COMPONENT type="1116" id="196" > -<cdparam x="55" y="154" /> -<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="FPGA0" value="name" /> -<TGConnectingPoint num="0" id="172" /> -<TGConnectingPoint num="1" id="173" /> -<TGConnectingPoint num="2" id="174" /> -<TGConnectingPoint num="3" id="175" /> -<TGConnectingPoint num="4" id="176" /> -<TGConnectingPoint num="5" id="177" /> -<TGConnectingPoint num="6" id="178" /> -<TGConnectingPoint num="7" id="179" /> -<TGConnectingPoint num="8" id="180" /> -<TGConnectingPoint num="9" id="181" /> -<TGConnectingPoint num="10" id="182" /> -<TGConnectingPoint num="11" id="183" /> -<TGConnectingPoint num="12" id="184" /> -<TGConnectingPoint num="13" id="185" /> -<TGConnectingPoint num="14" id="186" /> -<TGConnectingPoint num="15" id="187" /> -<TGConnectingPoint num="16" id="188" /> -<TGConnectingPoint num="17" id="189" /> -<TGConnectingPoint num="18" id="190" /> -<TGConnectingPoint num="19" id="191" /> -<TGConnectingPoint num="20" id="192" /> -<TGConnectingPoint num="21" id="193" /> -<TGConnectingPoint num="22" id="194" /> -<TGConnectingPoint num="23" id="195" /> -<extraparam> -<info stereotype="FPGA" nodeName="FPGA0" /> -<attributes capacity="100" byteDataSize="4" mappingPenalty="0" reconfigurationTime="50" goIdleTime="10" maxConsecutiveIdleCycles="10" execiTime="1" execcTime="1" clockRatio="1" operation ="" scheduling ="" /> -</extraparam> -</COMPONENT> -<SUBCOMPONENT type="1101" id="162" > -<father id="196" num="0" /> -<cdparam x="128" y="271" /> -<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" /> -<infoparam name="TGComponent" value="TestCycleEvt_wait::C0" /> -<TGConnectingPoint num="0" id="154" /> -<TGConnectingPoint num="1" id="155" /> -<TGConnectingPoint num="2" id="156" /> -<TGConnectingPoint num="3" id="157" /> -<TGConnectingPoint num="4" id="158" /> -<TGConnectingPoint num="5" id="159" /> -<TGConnectingPoint num="6" id="160" /> -<TGConnectingPoint num="7" id="161" /> -<extraparam> -<info value="TestCycleEvt_wait::C0" taskName="C0" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C0" fatherComponentMECType="0" /> -</extraparam> -</SUBCOMPONENT> -<SUBCOMPONENT type="1101" id="171" > -<father id="196" num="1" /> -<cdparam x="120" y="210" /> -<sizeparam width="168" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="0" maxX="82" minY="0" maxY="160" /> -<infoparam name="TGComponent" value="TestCycleEvt_wait::C1" /> -<TGConnectingPoint num="0" id="163" /> -<TGConnectingPoint num="1" id="164" /> -<TGConnectingPoint num="2" id="165" /> -<TGConnectingPoint num="3" id="166" /> -<TGConnectingPoint num="4" id="167" /> -<TGConnectingPoint num="5" id="168" /> -<TGConnectingPoint num="6" id="169" /> -<TGConnectingPoint num="7" id="170" /> -<extraparam> -<info value="TestCycleEvt_wait::C1" taskName="C1" referenceTaskName="TestCycleEvt_wait" priority="0" operationMEC="C1" fatherComponentMECType="0" /> -</extraparam> -</SUBCOMPONENT> - -<COMPONENT type="1102" id="221" > -<cdparam x="496" y="341" /> -<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="Bus0" value="name" /> -<TGConnectingPoint num="0" id="197" /> -<TGConnectingPoint num="1" id="198" /> -<TGConnectingPoint num="2" id="199" /> -<TGConnectingPoint num="3" id="200" /> -<TGConnectingPoint num="4" id="201" /> -<TGConnectingPoint num="5" id="202" /> -<TGConnectingPoint num="6" id="203" /> -<TGConnectingPoint num="7" id="204" /> -<TGConnectingPoint num="8" id="205" /> -<TGConnectingPoint num="9" id="206" /> -<TGConnectingPoint num="10" id="207" /> -<TGConnectingPoint num="11" id="208" /> -<TGConnectingPoint num="12" id="209" /> -<TGConnectingPoint num="13" id="210" /> -<TGConnectingPoint num="14" id="211" /> -<TGConnectingPoint num="15" id="212" /> -<TGConnectingPoint num="16" id="213" /> -<TGConnectingPoint num="17" id="214" /> -<TGConnectingPoint num="18" id="215" /> -<TGConnectingPoint num="19" id="216" /> -<TGConnectingPoint num="20" id="217" /> -<TGConnectingPoint num="21" id="218" /> -<TGConnectingPoint num="22" id="219" /> -<TGConnectingPoint num="23" id="220" /> -<extraparam> -<info stereotype="Bus" nodeName="Bus0" /> -<attributes byteDataSize="4" arbitrationPolicy="0" sliceTime="10000" pipelineSize="1" clockRatio="1" privacy="0" referenceAttack="null" /> -</extraparam> -</COMPONENT> - -<COMPONENT type="1105" id="246" > -<cdparam x="749" y="86" /> -<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="Memory0" value="name" /> -<TGConnectingPoint num="0" id="222" /> -<TGConnectingPoint num="1" id="223" /> -<TGConnectingPoint num="2" id="224" /> -<TGConnectingPoint num="3" id="225" /> -<TGConnectingPoint num="4" id="226" /> -<TGConnectingPoint num="5" id="227" /> -<TGConnectingPoint num="6" id="228" /> -<TGConnectingPoint num="7" id="229" /> -<TGConnectingPoint num="8" id="230" /> -<TGConnectingPoint num="9" id="231" /> -<TGConnectingPoint num="10" id="232" /> -<TGConnectingPoint num="11" id="233" /> -<TGConnectingPoint num="12" id="234" /> -<TGConnectingPoint num="13" id="235" /> -<TGConnectingPoint num="14" id="236" /> -<TGConnectingPoint num="15" id="237" /> -<TGConnectingPoint num="16" id="238" /> -<TGConnectingPoint num="17" id="239" /> -<TGConnectingPoint num="18" id="240" /> -<TGConnectingPoint num="19" id="241" /> -<TGConnectingPoint num="20" id="242" /> -<TGConnectingPoint num="21" id="243" /> -<TGConnectingPoint num="22" id="244" /> -<TGConnectingPoint num="23" id="245" /> -<extraparam> -<info stereotype="MEMORY" nodeName="Memory0" /> -<attributes byteDataSize="4" memorySize="1024" clockRatio="1" bufferType="0" /> -</extraparam> -</COMPONENT> - -<COMPONENT type="1100" id="271" > -<cdparam x="332" y="44" /> -<sizeparam width="345" height="232" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<hidden value="false" /> -<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" /> -<infoparam name="CPU0" value="name" /> -<TGConnectingPoint num="0" id="247" /> -<TGConnectingPoint num="1" id="248" /> -<TGConnectingPoint num="2" id="249" /> -<TGConnectingPoint num="3" id="250" /> -<TGConnectingPoint num="4" id="251" /> -<TGConnectingPoint num="5" id="252" /> -<TGConnectingPoint num="6" id="253" /> -<TGConnectingPoint num="7" id="254" /> -<TGConnectingPoint num="8" id="255" /> -<TGConnectingPoint num="9" id="256" /> -<TGConnectingPoint num="10" id="257" /> -<TGConnectingPoint num="11" id="258" /> -<TGConnectingPoint num="12" id="259" /> -<TGConnectingPoint num="13" id="260" /> -<TGConnectingPoint num="14" id="261" /> -<TGConnectingPoint num="15" id="262" /> -<TGConnectingPoint num="16" id="263" /> -<TGConnectingPoint num="17" id="264" /> -<TGConnectingPoint num="18" id="265" /> -<TGConnectingPoint num="19" id="266" /> -<TGConnectingPoint num="20" id="267" /> -<TGConnectingPoint num="21" id="268" /> -<TGConnectingPoint num="22" id="269" /> -<TGConnectingPoint num="23" id="270" /> -<extraparam> -<info stereotype="CPURR" nodeName="CPU0" /> -<attributes nbOfCores="2" byteDataSize="4" schedulingPolicy="0" sliceTime="10000" goIdleTime="10" maxConsecutiveIdleCycles="10" pipelineSize="5" taskSwitchingTime="20" branchingPredictionPenalty="2" cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/> -</extraparam> -</COMPONENT> - -<CONNECTOR type="125" id="272" > -<cdparam x="315" y="280" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="{info}" /> -<P1 x="242" y="354" id="187" /> -<P2 x="496" y="353" id="207" /> -<AutomaticDrawing data="true" /> -<extraparam> -<info priority="0" /> -<spy value="false" /> -</extraparam> -</CONNECTOR> -<CONNECTOR type="125" id="273" > -<cdparam x="799" y="286" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="{info}" /> -<P1 x="799" y="286" id="236" /> -<P2 x="683" y="341" id="206" /> -<AutomaticDrawing data="true" /> -<extraparam> -<info priority="0" /> -<spy value="false" /> -</extraparam> -</CONNECTOR> -<CONNECTOR type="125" id="274" > -<cdparam x="389" y="286" /> -<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> -<infoparam name="connector" value="{info}" /> -<P1 x="504" y="276" id="253" /> -<P2 x="558" y="341" id="205" /> -<AutomaticDrawing data="true" /> -<extraparam> -<info priority="0" /> -<spy value="false" /> -</extraparam> -</CONNECTOR> - -</TMLArchiDiagramPanel> - -</Modeling> - - - - -</TURTLEGMODELING> \ No newline at end of file diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java index bd7cf2e0707ec6debb15099ff8d50f343a5d4cc8..fd33a534b3728e5a8ca26338fab1299897e6d2ec 100755 --- a/src/main/java/ui/util/DefaultText.java +++ b/src/main/java/ui/util/DefaultText.java @@ -50,8 +50,8 @@ package ui.util; */ public class DefaultText { - public static String BUILD = "13197"; - public static String DATE = "2019/10/18 03:04:42 CET"; + public static String BUILD = "13200"; + public static String DATE = "2019/10/21 03:04:27 CET"; public static StringBuffer sbAbout = makeAbout();