Changes for page Basic design

Last modified by nfl on 2025/01/30 12:05

From version 13.1
edited by sna
on 2014/08/06 03:51
Change comment: There is no comment for this version
To version 10.1
edited by sna
on 2014/08/06 03:46
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -55,8 +55,13 @@
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 +
60 60  |=(((
61 61  {{{input int *_perm;}}}
62 62  
... ... @@ -106,9 +106,9 @@
106 106  
107 107  {{{    state backOff1 {}}}
108 108  
109 -{{{ entry / *_ST_4_req[trainNum] = false;}}}
114 +{{{entry / *_ST_4_req[trainNum] = false;}}}
110 110  
111 -{{{ entry / *_LN_0_req[trainNum] = false;}}}
116 +{{{entry / *_LN_0_req[trainNum] = false;}}}
112 112  
113 113  {{{    }}}}
114 114  
... ... @@ -116,7 +116,7 @@
116 116  
117 117  {{{ }}}
118 118  
119 -{{{ final state gotPerm;}}}
124 +{{{final state gotPerm;}}}
120 120  
121 121  {{{}}}}
122 122  
... ... @@ -124,7 +124,7 @@
124 124  
125 125  {{{ }}}
126 126  
127 -{{{state Dep_*_ST {}}}
132 +{{{state Dep_IC_ST {}}}
128 128  
129 129  {{{    entry / 'railPoint(*,STRAIGHT)';}}}
130 130  
... ... @@ -236,9 +236,9 @@
236 236  
237 237  {{{ }}}
238 238  
239 -{{{  state *_LN_0_*_LN_1}}}
244 +{{{  state IC_LN_0_IC_LN_1}}}
240 240  
241 -{{{  --> *_LN_1 with 'railContact(*_LN_1,0)';}}}
246 +{{{  --> IC_LN_1 with 'railContact(IC_LN_1,0)';}}}
242 242  
243 243  {{{ }}}
244 244  
... ... @@ -348,18 +348,12 @@
348 348  
349 349  {{{      }}}}
350 350  
351 -\\
356 +{{{      --> success with destTrack == 1 & *_ST_0_perm == trainNum & *_ST_1_perm == trainNum / i_arrOnTrack = 1}}}
352 352  
353 -{{{      --> success with destTrack == 1 & *_ST_0_perm == trainNum & *_ST_1_perm == trainNum / i_arrOnTrack = 1}}}
358 +{{{      --> success with destTrack == 2 & *_ST_0_perm == trainNum & *_ST_2_perm == trainNum / i_arrOnTrack = 2}}}
354 354  
355 -\\
360 +{{{      --> success with destTrack == 3 & *_ST_0_perm == trainNum & *_ST_3_perm == trainNum / i_arrOnTrack = 3}}}
356 356  
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 -
363 363  {{{      --> success with *_ST_0_perm == trainNum & *_ST_1_perm == trainNum / i_arrOnTrack = 1}}}
364 364  
365 365  {{{      --> success with *_ST_0_perm == trainNum & *_ST_2_perm == trainNum / i_arrOnTrack = 2}}}
... ... @@ -366,11 +366,8 @@
366 366  
367 367  {{{      --> success with *_ST_0_perm == trainNum & *_ST_3_perm == trainNum / i_arrOnTrack = 3}}}
368 368  
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 -
374 374  {{{ }}}
375 375  
376 376  {{{      state resolving}}}
... ... @@ -431,7 +431,7 @@
431 431  
432 432  {{{    entry / 'railSignal(*_LN_5, FWD, RED)';}}}
433 433  
434 -{{{    entry / 'railTrackOff(*_LN_5)';}}}
430 +{{{    entry / 'railTrackOff(*C_LN_5)';}}}
435 435  
436 436  {{{    entry / 'railTrack(*_ST_0,FWD,trainNum,SLOW)';}}}
437 437  
Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -9471652
1 +9471639
URL
... ... @@ -1,1 +1,1 @@
1 -https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471652/Basic design
1 +https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471639/Basic design