Skip to Content

Changes for page Basic design

Last modified by nfl on 2025/01/30 12:05
From version 10.1
edited by sna
on 2014/08/06 03:46
Change comment: There is no comment for this version
To version 13.1
edited by sna
on 2014/08/06 03:51
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -55,13 +55,8 @@
55 55  Next the train **must** wait for// int railDeparture(int train)// to return 1.
56 56  After the waiting has finished the controller can reach a final state and pass the control back to the train controller.
57 57  
58 -=== Structure ===
58 +=== Structure   ===
59 59  
60 -----
61 -
62 -
63 -
64 -
65 65  |=(((
66 66  {{{input int *_perm;}}}
67 67  
... ... @@ -111,9 +111,9 @@
111 111  
112 112  {{{    state backOff1 {}}}
113 113  
114 -{{{entry / *_ST_4_req[trainNum] = false;}}}
109 +{{{ entry / *_ST_4_req[trainNum] = false;}}}
115 115  
116 -{{{entry / *_LN_0_req[trainNum] = false;}}}
111 +{{{ entry / *_LN_0_req[trainNum] = false;}}}
117 117  
118 118  {{{    }}}}
119 119  
... ... @@ -121,7 +121,7 @@
121 121  
122 122  {{{ }}}
123 123  
124 -{{{final state gotPerm;}}}
119 +{{{ final state gotPerm;}}}
125 125  
126 126  {{{}}}}
127 127  
... ... @@ -129,7 +129,7 @@
129 129  
130 130  {{{ }}}
131 131  
132 -{{{state Dep_IC_ST {}}}
127 +{{{state Dep_*_ST {}}}
133 133  
134 134  {{{    entry / 'railPoint(*,STRAIGHT)';}}}
135 135  
... ... @@ -241,9 +241,9 @@
241 241  
242 242  {{{ }}}
243 243  
244 -{{{  state IC_LN_0_IC_LN_1}}}
239 +{{{  state *_LN_0_*_LN_1}}}
245 245  
246 -{{{  --> IC_LN_1 with 'railContact(IC_LN_1,0)';}}}
241 +{{{  --> *_LN_1 with 'railContact(*_LN_1,0)';}}}
247 247  
248 248  {{{ }}}
249 249  
... ... @@ -353,12 +353,18 @@
353 353  
354 354  {{{      }}}}
355 355  
356 -{{{      --> success with destTrack == 1 & *_ST_0_perm == trainNum & *_ST_1_perm == trainNum / i_arrOnTrack = 1}}}
351 +\\
357 357  
358 -{{{      --> success with destTrack == 2 & *_ST_0_perm == trainNum & *_ST_2_perm == trainNum / i_arrOnTrack = 2}}}
353 +{{{      --> success with destTrack == 1 & *_ST_0_perm == trainNum & *_ST_1_perm == trainNum / i_arrOnTrack = 1}}}
359 359  
360 -{{{      --> success with destTrack == 3 & *_ST_0_perm == trainNum & *_ST_3_perm == trainNum / i_arrOnTrack = 3}}}
355 +\\
361 361  
357 +{{{      --> success with destTrack == 2 & *_ST_0_perm == trainNum & *_ST_2_perm == trainNum / i_arrOnTrack = 2}}}
358 +
359 +\\
360 +
361 +{{{      --> success with destTrack == 3 & *_ST_0_perm == trainNum & *_ST_3_perm == trainNum / i_arrOnTrack = 3}}}
362 +
362 362  {{{      --> success with *_ST_0_perm == trainNum & *_ST_1_perm == trainNum / i_arrOnTrack = 1}}}
363 363  
364 364  {{{      --> success with *_ST_0_perm == trainNum & *_ST_2_perm == trainNum / i_arrOnTrack = 2}}}
... ... @@ -365,8 +365,11 @@
365 365  
366 366  {{{      --> success with *_ST_0_perm == trainNum & *_ST_3_perm == trainNum / i_arrOnTrack = 3}}}
367 367  
368 -{{{      --> resolving with *_ST_0_perm == trainNum | *_ST_3_perm == trainNum | *_ST_2_perm == trainNum | *_ST_1_perm == trainNum;}}}
369 369  
370 +\\
371 +
372 +{{{      --> resolving with *_ST_0_perm == trainNum | *_ST_3_perm == trainNum | *_ST_2_perm == trainNum | *_ST_1_perm == trainNum;}}}
373 +
370 370  {{{ }}}
371 371  
372 372  {{{      state resolving}}}
... ... @@ -427,7 +427,7 @@
427 427  
428 428  {{{    entry / 'railSignal(*_LN_5, FWD, RED)';}}}
429 429  
430 -{{{    entry / 'railTrackOff(*C_LN_5)';}}}
434 +{{{    entry / 'railTrackOff(*_LN_5)';}}}
431 431  
432 432  {{{    entry / 'railTrack(*_ST_0,FWD,trainNum,SLOW)';}}}
433 433  
Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -9471639
1 +9471652
URL
... ... @@ -1,1 +1,1 @@
1 -https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471639/Basic design
1 +https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471652/Basic design