X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=uppaal%2F2.xml;h=dcbd6c3fa8407b0143f20d8c60941afcf1ccc383;hb=175407c2b06242eca3a373fd6e75f8bb46bffa19;hp=29e4e8f5da335c65c2f3d26d0da9e875a48ea584;hpb=53484c4fd63f80db558d9c0a4f00b3e8e61f2db2;p=mc1516the.git

diff --git a/uppaal/2.xml b/uppaal/2.xml
index 29e4e8f..dcbd6c3 100644
--- a/uppaal/2.xml
+++ b/uppaal/2.xml
@@ -3,11 +3,15 @@
 <nta>
 	<declaration>// Place global declarations here.
 // Intermediate
-const int N = 13;
+//const int N=13;
 // Advanced
-//const int N = 7
+//const int N = 7;
+//hard from website 1
+const int N=13;
+//hard from website 2
+//const int N=9;
 
-typedef int[0,N-1] id_c;
+typedef int[0, N-1] id_c;
 
 broadcast chan up[N], down[N], left[N], right[N], start, leftRed, rightRed;
 
@@ -48,7 +52,7 @@ void register() {
 			<source ref="id2"/>
 			<target ref="id2"/>
 			<label kind="guard" x="-280" y="8">x&gt;0 &amp;&amp; !grid[x-1][y]</label>
-			<label kind="synchronisation" x="-246" y="102">down[id]!</label>
+			<label kind="synchronisation" x="-153" y="-42">left[id]!</label>
 			<label kind="assignment" x="-340" y="34">grid[x+length-1][y]:=false,
 grid[x-1][y]:=true,
 x:=x-1</label>
@@ -59,7 +63,7 @@ x:=x-1</label>
 			<source ref="id2"/>
 			<target ref="id2"/>
 			<label kind="guard" x="-306" y="-263">x+length &lt; 6 &amp;&amp; !grid[x+length][y]</label>
-			<label kind="synchronisation" x="-221" y="-204">up[id]!</label>
+			<label kind="synchronisation" x="-170" y="-170">right[id]!</label>
 			<label kind="assignment" x="-331" y="-229">grid[x][y]:=false,
 grid[x+length][y]:=true,
 x:=x+1</label>
@@ -89,7 +93,7 @@ x:=x+1</label>
 		<transition>
 			<source ref="id3"/>
 			<target ref="id5"/>
-			<label kind="synchronisation" x="-228" y="-72">start?</label>
+			<label kind="synchronisation" x="-246" y="-59">start?</label>
 		</transition>
 		<transition>
 			<source ref="id4"/>
@@ -101,10 +105,10 @@ x:=x+1</label>
 		<transition>
 			<source ref="id5"/>
 			<target ref="id5"/>
-			<label kind="guard" x="-170" y="153">y&gt;0 &amp;&amp; !grid[x][y-1]</label>
-			<label kind="synchronisation" x="-119" y="119">left[id]!</label>
-			<label kind="assignment" x="-221" y="51">grid[x][y-1]:=true,
-grid[x][y+length-1]:=true,
+			<label kind="guard" x="-153" y="153">y&gt;0 &amp;&amp; !grid[x][y-1]</label>
+			<label kind="synchronisation" x="-153" y="119">down[id]!</label>
+			<label kind="assignment" x="-153" y="51">grid[x][y-1]:=true,
+grid[x][y+length-1]:=false,
 y:=y-1</label>
 			<nail x="-153" y="42"/>
 			<nail x="-34" y="42"/>
@@ -112,9 +116,9 @@ y:=y-1</label>
 		<transition>
 			<source ref="id5"/>
 			<target ref="id5"/>
-			<label kind="guard" x="-204" y="-221">y+length &lt; 6 &amp;&amp; !grid[x][y+length]</label>
-			<label kind="synchronisation" x="-127" y="-195">right[id]!</label>
-			<label kind="assignment" x="-263" y="-161">grid[x][y+length]:=true,
+			<label kind="guard" x="-161" y="-204">y+length &lt; 6 &amp;&amp; !grid[x][y+length]</label>
+			<label kind="synchronisation" x="-161" y="-178">up[id]!</label>
+			<label kind="assignment" x="-161" y="-153">grid[x][y+length]:=true,
 grid[x][y]:=false,
 y:=y+1</label>
 			<nail x="-178" y="-102"/>
@@ -125,33 +129,33 @@ y:=y+1</label>
 		<name>Player</name>
 		<declaration>int[0,N] registered;
 bool done = 0;</declaration>
-		<location id="id6" x="-493" y="-255">
+		<location id="id6" x="-476" y="-459">
 		</location>
-		<location id="id7" x="-680" y="-246">
+		<location id="id7" x="-663" y="-450">
 		</location>
-		<location id="id8" x="-799" y="-246">
+		<location id="id8" x="-782" y="-450">
 		</location>
 		<init ref="id8"/>
 		<transition>
 			<source ref="id7"/>
 			<target ref="id6"/>
-			<label kind="synchronisation" x="-629" y="-272">finish?</label>
-			<label kind="assignment" x="-662" y="-250">done := 1</label>
+			<label kind="synchronisation" x="-612" y="-476">finish?</label>
+			<label kind="assignment" x="-645" y="-454">done := 1</label>
 		</transition>
 		<transition>
 			<source ref="id8"/>
 			<target ref="id7"/>
-			<label kind="guard" x="-781" y="-280">registered == N</label>
-			<label kind="synchronisation" x="-781" y="-263">start!</label>
+			<label kind="guard" x="-764" y="-484">registered == N</label>
+			<label kind="synchronisation" x="-764" y="-467">start!</label>
 		</transition>
 		<transition>
 			<source ref="id8"/>
 			<target ref="id8"/>
-			<label kind="synchronisation" x="-875" y="-365">reg?</label>
-			<label kind="assignment" x="-926" y="-382">registered := registered+1</label>
-			<nail x="-892" y="-263"/>
-			<nail x="-833" y="-331"/>
-			<nail x="-765" y="-314"/>
+			<label kind="synchronisation" x="-833" y="-561">reg?</label>
+			<label kind="assignment" x="-909" y="-578">registered := registered+1</label>
+			<nail x="-875" y="-467"/>
+			<nail x="-816" y="-535"/>
+			<nail x="-748" y="-518"/>
 		</transition>
 	</template>
 	<template>
@@ -161,59 +165,100 @@ bool done = 0;</declaration>
     grid[x][3] = true;
     grid[x+1][3] = true;
 }</declaration>
-		<location id="id9" x="493" y="-51">
+		<location id="id9" x="42" y="136">
+			<urgent/>
+		</location>
+		<location id="id10" x="59" y="-238">
+			<urgent/>
 		</location>
-		<location id="id10" x="51" y="-59">
+		<location id="id11" x="493" y="-51">
 		</location>
-		<location id="id11" x="-93" y="-68">
+		<location id="id12" x="51" y="-59">
 		</location>
-		<location id="id12" x="-204" y="-68">
+		<location id="id13" x="-93" y="-68">
+		</location>
+		<location id="id14" x="-204" y="-68">
 			<urgent/>
 		</location>
-		<init ref="id12"/>
+		<branchpoint id="id15" x="187" y="-85">
+		</branchpoint>
+		<init ref="id14"/>
 		<transition>
-			<source ref="id10"/>
-			<target ref="id9"/>
-			<label kind="guard" x="416" y="-93">x == 4</label>
-			<label kind="synchronisation" x="416" y="-76">finish!</label>
+			<source ref="id9"/>
+			<target ref="id12"/>
+			<label kind="guard" x="67" y="38">x &lt;= 0 || grid[x-1][3]</label>
+			<nail x="93" y="8"/>
 		</transition>
 		<transition>
 			<source ref="id10"/>
-			<target ref="id10"/>
-			<label kind="guard" x="0" y="161">x &gt; 0 &amp;&amp; grid[x-1][3]</label>
-			<label kind="synchronisation" x="25" y="119">leftRed!</label>
-			<label kind="assignment" x="-85" y="85">grid[x+1][3]:=false,
-grid[x-1][3]:=true,
-x:=x-1</label>
-			<nail x="-25" y="42"/>
-			<nail x="178" y="51"/>
+			<target ref="id12"/>
+			<label kind="guard" x="93" y="-187">x+2 &gt;= 6 || grid[x+2][3]</label>
+			<nail x="102" y="-127"/>
 		</transition>
 		<transition>
 			<source ref="id10"/>
-			<target ref="id10"/>
-			<label kind="guard" x="-17" y="-255">x+2 &lt; 6 &amp;&amp; grid[x+2][3]</label>
-			<label kind="synchronisation" x="25" y="-221">rightRed!</label>
-			<label kind="assignment" x="-85" y="-187">grid[x-1][3]:=false,
+			<target ref="id12"/>
+			<label kind="guard" x="-136" y="-161">x+2 &lt; 6 &amp;&amp; !grid[x+2][3]</label>
+			<label kind="synchronisation" x="-68" y="-144">rightRed!</label>
+			<label kind="assignment" x="-85" y="-212">grid[x][3]:=false,
 grid[x+2][3]:=true,
 x:=x+1</label>
-			<nail x="-17" y="-144"/>
-			<nail x="144" y="-136"/>
 		</transition>
 		<transition>
-			<source ref="id11"/>
+			<source ref="id9"/>
+			<target ref="id12"/>
+			<label kind="guard" x="-144" y="-25">x &gt; 0 &amp;&amp; !grid[x-1][3]</label>
+			<label kind="synchronisation" x="-93" y="0">leftRed!</label>
+			<label kind="assignment" x="-144" y="25">grid[x+1][3]:=false,
+grid[x-1][3]:=true,
+x:=x-1</label>
+		</transition>
+		<transition>
+			<source ref="id15"/>
+			<target ref="id9"/>
+			<label kind="probability" x="161" y="-34">1</label>
+		</transition>
+		<transition>
+			<source ref="id15"/>
 			<target ref="id10"/>
-			<label kind="synchronisation" x="-75" y="-80">start?</label>
+			<label kind="probability" x="178" y="-127">3</label>
+		</transition>
+		<transition>
+			<source ref="id12"/>
+			<target ref="id15"/>
 		</transition>
 		<transition>
 			<source ref="id12"/>
 			<target ref="id11"/>
+			<label kind="guard" x="416" y="-93">x == 4</label>
+			<label kind="synchronisation" x="416" y="-76">finish!</label>
+		</transition>
+		<transition>
+			<source ref="id13"/>
+			<target ref="id12"/>
+			<label kind="synchronisation" x="-75" y="-80">start?</label>
+		</transition>
+		<transition>
+			<source ref="id14"/>
+			<target ref="id13"/>
 			<label kind="synchronisation" x="-186" y="-85">reg!</label>
 			<label kind="assignment" x="-186" y="-68">register()</label>
 		</transition>
 	</template>
 	<system>// Place template instantiations here.
 
+
+
+//easy test puzzle
+/*
+RED = RedCar(0,2);
+V1 = VertCar(2, 1, 4, 3);
+V2 = VertCar(3, 2, 5, 2);
+system RED, V1, V2, Player;
+*/
+
 // Intermediate puzzle
+
 H1 = HorzCar(2, 0, 0, 5);
 H2 = HorzCar(2, 1, 2, 5);
 V3 = VertCar(2, 2, 4, 4);
@@ -221,13 +266,14 @@ V4 = VertCar(2, 3, 2, 3);
 V5 = VertCar(3, 4, 5, 2);
 V6 = VertCar(2, 5, 1, 3);
 H7 = HorzCar(2, 6, 3, 4);
-H8 = RedCar(7, 2); //RED
+RED = RedCar(7, 2); //RED
 V9 = VertCar(3, 8, 0, 0);
 HA = HorzCar(2, 9, 1, 0);
 VB = VertCar(2, 10, 3, 0);
 HC = HorzCar(2, 11, 4, 1);
 HD = HorzCar(2, 12, 4, 0);
-system H1, H2, V3, V4, V5, V6, H7, H8, V9, HA, VB, HC, HD, Player;
+system H1, H2, V3, V4, V5, V6, H7, RED, V9, HA, VB, HC, HD, Player;
+
 
 // Advanced puzzle
 /*
@@ -235,15 +281,44 @@ H1 = HorzCar(2, 0, 0, 5);
 V2 = VertCar(2, 1, 2, 4);
 V3 = VertCar(3, 2, 3, 3);
 V4 = VertCar(3, 3, 0, 2);
-H5 = HorzCar(2, 4, 1, 3);
+RED = RedCar(4, 1);
 H6 = HorzCar(3, 5, 1, 2);
 H7 = HorzCar(3, 6, 3, 0);
-system H1, V2, V3, V4, H5, H6, H7
+system H1, V2, V3, V4, RED, H6, H7, Player;
 */
 
-// List one or more processes to be composed into a system.
+//Hard from website 1
+//Can not be solved
+/*
+V1 = VertCar(2, 0, 0, 3);
+V2 = VertCar(2, 1, 1, 0);
+V3 = VertCar(2, 2, 2, 1);
+V4 = VertCar(2, 3, 3, 4);
+V5 = VertCar(3, 4, 4, 3);
+V6 = VertCar(3, 5, 5, 3);
+H7 = HorzCar(2, 6, 0, 2);
+H8 = HorzCar(3, 7, 0, 5);
+H85= HorzCar(3,12, 1, 4); 
+H9 = HorzCar(2, 8, 2, 0);
+RED = RedCar(9, 2);
+HB = HorzCar(2,10, 4, 0);
+HC = HorzCar(2,11, 4, 1);
+system V1, V2, V3, V4, V5, V6, H7, H8, H85, H9, RED, HB, HC, Player;
+*/
 
-    </system>
+//Hard from website 2
+/*
+V1 = VertCar(2, 0, 0, 0);
+V2 = VertCar(3, 1, 2, 3);
+V3 = VertCar(3, 2, 3, 0);
+V4 = VertCar(3, 3, 5, 3);
+H5 = HorzCar(2, 4, 1, 1);
+RED = RedCar(5, 3);
+H7 = HorzCar(2, 6, 3, 5);
+H8 = HorzCar(2, 7, 4, 0);
+H9 = HorzCar(2, 8, 4, 2);
+system V1, V2, V3, V4, H5, RED, H7, H8, H9, Player;
+*/</system>
 	<queries>
 		<query>
 			<formula>E&lt;&gt; Player.done == 1