plaatjes 2

[mc1516the.git] / uppaal / 2.xml

diff --git a/uppaal/2.xml b/uppaal/2.xml
index 0f68e2c..dcbd6c3 100644 (file)
--- a/uppaal/2.xml
+++ b/uppaal/2.xml
@@ -52,7 +52,7 @@ void register() {
                        <source ref="id2"/>\r
                        <target ref="id2"/>\r
                        <label kind="guard" x="-280" y="8">x&gt;0 &amp;&amp; !grid[x-1][y]</label>\r
-                       <label kind="synchronisation" x="-246" y="102">left[id]!</label>\r
+                       <label kind="synchronisation" x="-153" y="-42">left[id]!</label>\r
                        <label kind="assignment" x="-340" y="34">grid[x+length-1][y]:=false,
 grid[x-1][y]:=true,
 x:=x-1</label>\r
@@ -63,7 +63,7 @@ x:=x-1</label>
                        <source ref="id2"/>\r
                        <target ref="id2"/>\r
                        <label kind="guard" x="-306" y="-263">x+length &lt; 6 &amp;&amp; !grid[x+length][y]</label>\r
-                       <label kind="synchronisation" x="-221" y="-204">right[id]!</label>\r
+                       <label kind="synchronisation" x="-170" y="-170">right[id]!</label>\r
                        <label kind="assignment" x="-331" y="-229">grid[x][y]:=false,
 grid[x+length][y]:=true,
 x:=x+1</label>\r
@@ -93,7 +93,7 @@ x:=x+1</label>
                <transition>\r
                        <source ref="id3"/>\r
                        <target ref="id5"/>\r
-                       <label kind="synchronisation" x="-228" y="-72">start?</label>\r
+                       <label kind="synchronisation" x="-246" y="-59">start?</label>\r
                </transition>\r
                <transition>\r
                        <source ref="id4"/>\r
@@ -105,9 +105,9 @@ x:=x+1</label>
                <transition>\r
                        <source ref="id5"/>\r
                        <target ref="id5"/>\r
-                       <label kind="guard" x="-170" y="153">y&gt;0 &amp;&amp; !grid[x][y-1]</label>\r
-                       <label kind="synchronisation" x="-119" y="119">down[id]!</label>\r
-                       <label kind="assignment" x="-221" y="51">grid[x][y-1]:=true,
+                       <label kind="guard" x="-153" y="153">y&gt;0 &amp;&amp; !grid[x][y-1]</label>\r
+                       <label kind="synchronisation" x="-153" y="119">down[id]!</label>\r
+                       <label kind="assignment" x="-153" y="51">grid[x][y-1]:=true,
 grid[x][y+length-1]:=false,
 y:=y-1</label>\r
                        <nail x="-153" y="42"/>\r
@@ -116,9 +116,9 @@ y:=y-1</label>
                <transition>\r
                        <source ref="id5"/>\r
                        <target ref="id5"/>\r
-                       <label kind="guard" x="-204" y="-221">y+length &lt; 6 &amp;&amp; !grid[x][y+length]</label>\r
-                       <label kind="synchronisation" x="-127" y="-195">up[id]!</label>\r
-                       <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>\r
+                       <label kind="synchronisation" x="-161" y="-178">up[id]!</label>\r
+                       <label kind="assignment" x="-161" y="-153">grid[x][y+length]:=true,
 grid[x][y]:=false,
 y:=y+1</label>\r
                        <nail x="-178" y="-102"/>\r
@@ -129,33 +129,33 @@ y:=y+1</label>
                <name>Player</name>\r
                <declaration>int[0,N] registered;
 bool done = 0;</declaration>\r
-               <location id="id6" x="-493" y="-255">\r
+               <location id="id6" x="-476" y="-459">\r
                </location>\r
-               <location id="id7" x="-680" y="-246">\r
+               <location id="id7" x="-663" y="-450">\r
                </location>\r
-               <location id="id8" x="-799" y="-246">\r
+               <location id="id8" x="-782" y="-450">\r
                </location>\r
                <init ref="id8"/>\r
                <transition>\r
                        <source ref="id7"/>\r
                        <target ref="id6"/>\r
-                       <label kind="synchronisation" x="-629" y="-272">finish?</label>\r
-                       <label kind="assignment" x="-662" y="-250">done := 1</label>\r
+                       <label kind="synchronisation" x="-612" y="-476">finish?</label>\r
+                       <label kind="assignment" x="-645" y="-454">done := 1</label>\r
                </transition>\r
                <transition>\r
                        <source ref="id8"/>\r
                        <target ref="id7"/>\r
-                       <label kind="guard" x="-781" y="-280">registered == N</label>\r
-                       <label kind="synchronisation" x="-781" y="-263">start!</label>\r
+                       <label kind="guard" x="-764" y="-484">registered == N</label>\r
+                       <label kind="synchronisation" x="-764" y="-467">start!</label>\r
                </transition>\r
                <transition>\r
                        <source ref="id8"/>\r
                        <target ref="id8"/>\r
-                       <label kind="synchronisation" x="-875" y="-365">reg?</label>\r
-                       <label kind="assignment" x="-926" y="-382">registered := registered+1</label>\r
-                       <nail x="-892" y="-263"/>\r
-                       <nail x="-833" y="-331"/>\r
-                       <nail x="-765" y="-314"/>\r
+                       <label kind="synchronisation" x="-833" y="-561">reg?</label>\r
+                       <label kind="assignment" x="-909" y="-578">registered := registered+1</label>\r
+                       <nail x="-875" y="-467"/>\r
+                       <nail x="-816" y="-535"/>\r
+                       <nail x="-748" y="-518"/>\r
                </transition>\r
        </template>\r
        <template>\r
@@ -216,7 +216,7 @@ x:=x-1</label>
                <transition>\r
                        <source ref="id15"/>\r
                        <target ref="id9"/>\r
-                       <label kind="probability" x="127" y="34">1</label>\r
+                       <label kind="probability" x="161" y="-34">1</label>\r
                </transition>\r
                <transition>\r
                        <source ref="id15"/>\r