repositories
/
mc1516the.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9246e17
)
YES kutmodel werkt
author
pimjager
<pim@pimjager.nl>
Thu, 16 Jun 2016 14:56:55 +0000
(16:56 +0200)
committer
pimjager
<pim@pimjager.nl>
Thu, 16 Jun 2016 14:56:55 +0000
(16:56 +0200)
uppaal/3_v2.xml
patch
|
blob
|
history
diff --git
a/uppaal/3_v2.xml
b/uppaal/3_v2.xml
index
8f30c8a
..
a49f41c
100644
(file)
--- a/
uppaal/3_v2.xml
+++ b/
uppaal/3_v2.xml
@@
-22,17
+22,17
@@
clock time;</declaration>
</location>
\r
<location id="id2" x="-42" y="85">
\r
<name x="-52" y="51">rod2</name>
\r
</location>
\r
<location id="id2" x="-42" y="85">
\r
<name x="-52" y="51">rod2</name>
\r
- <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
&& r1' == 1
&& r1' == 1
-&& r2' == 1
</label>
\r
-
<urgent/
>
\r
+&& r2' == 1
+
&& t >= 102</label
>
\r
</location>
\r
<location id="id3" x="-42" y="-68">
\r
<name x="-52" y="-102">rod1</name>
\r
</location>
\r
<location id="id3" x="-42" y="-68">
\r
<name x="-52" y="-102">rod1</name>
\r
- <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
&& r1' == 1
&& r1' == 1
-&& r2' == 1
</label>
\r
-
<urgent/
>
\r
+&& r2' == 1
+
&& t >= 102</label
>
\r
</location>
\r
<location id="id4" x="-178" y="8">
\r
<name x="-238" y="-59">inRange</name>
\r
</location>
\r
<location id="id4" x="-178" y="8">
\r
<name x="-238" y="-59">inRange</name>
\r
@@
-41,7
+41,6
@@
clock time;</declaration>
&& r2' == 1
&& t >= 102
&& t <= 110</label>
\r
&& r2' == 1
&& t >= 102
&& t <= 110</label>
\r
- <urgent/>
\r
</location>
\r
<init ref="id0"/>
\r
<transition>
\r
</location>
\r
<init ref="id0"/>
\r
<transition>
\r