From: pimjager <pim@pimjager.nl>
Date: Thu, 16 Jun 2016 14:56:55 +0000 (+0200)
Subject: YES kutmodel werkt
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=8439966f2bc1fe022435fa8fa314d5354952a9fe;p=mc1516the.git

YES kutmodel werkt
---

diff --git a/uppaal/3_v2.xml b/uppaal/3_v2.xml
index 8f30c8a..a49f41c 100644
--- a/uppaal/3_v2.xml
+++ b/uppaal/3_v2.xml
@@ -22,17 +22,17 @@ clock time;</declaration>
 		</location>
 		<location id="id2" x="-42" y="85">
 			<name x="-52" y="51">rod2</name>
-			<label kind="invariant" x="-34" y="102">t' == 0.1*t - 12.0
+			<label kind="invariant" x="-8" y="68">t' == 0.1*t - 12.0
 &amp;&amp; r1' == 1 
-&amp;&amp; r2' == 1</label>
-			<urgent/>
+&amp;&amp; r2' == 1
+&amp;&amp; t &gt;= 102</label>
 		</location>
 		<location id="id3" x="-42" y="-68">
 			<name x="-52" y="-102">rod1</name>
-			<label kind="invariant" x="-25" y="-76">t' == 0.1*t - 11.2
+			<label kind="invariant" x="-17" y="-102">t' == 0.1*t - 11.2
 &amp;&amp; r1' == 1 
-&amp;&amp; r2' == 1</label>
-			<urgent/>
+&amp;&amp; r2' == 1
+&amp;&amp; t &gt;= 102</label>
 		</location>
 		<location id="id4" x="-178" y="8">
 			<name x="-238" y="-59">inRange</name>
@@ -41,7 +41,6 @@ clock time;</declaration>
 &amp;&amp; r2' == 1
 &amp;&amp; t &gt;= 102
 &amp;&amp; t &lt;= 110</label>
-			<urgent/>
 		</location>
 		<init ref="id0"/>
 		<transition>