This commit is contained in:
f1iwq2
2020-02-15 17:44:58 +01:00
parent 110f42baaa
commit dec80cafac
23 changed files with 1943 additions and 924 deletions

251
1train.txt Normal file
View File

@@ -0,0 +1,251 @@
1 Tick=283 Det=521=0
2 Tick=283 Det=521=0
3 Tick=283 Det=524=0
4 Tick=283 Det=531=0
5 Tick=283 Det=518=0
6 Tick=283 Det=518=0
7 Tick=283 Det=519=0
8 Tick=283 Det=523=0
9 Tick=283 Det=526=0
10 Tick=283 Det=527=0
11 Tick=283 Det=526=0
12 Tick=283 Det=523=0
13 Tick=283 Det=513=1
14 Tick=283 Det=524=0
15 Tick=283 Det=515=0
16 Tick=283 Det=514=0
17 Tick=283 Det=516=1
18 Tick=283 Det=516=1
19 Tick=283 Det=515=0
20 Tick=283 Det=525=0
21 Tick=283 Det=528=0
22 Tick=283 Det=528=0
23 Tick=283 Det=522=0
24 Tick=283 Det=514=0
25 Tick=283 Det=522=0
26 Tick=283 Det=519=0
27 Tick=283 Det=527=0
28 Tick=283 Det=531=0
29 Tick=283 Det=525=0
30 Tick=283 Det=535=0
31 Tick=283 Det=535=0
32 Tick=283 Det=535=0
33 Tick=283 Det=535=0
34 Tick=284 Det=534=0
35 Tick=284 Det=534=0
36 Tick=284 Det=533=0
37 Tick=284 Det=533=0
38 Tick=284 Det=520=1
39 Tick=284 Det=520=1
40 Tick=284 Det=517=0
41 Tick=284 Det=517=0
42 Tick=284 Det=538=1
43 Tick=284 Det=538=1
44 Tick=284 Det=529=0
45 Tick=284 Det=529=0
46 Tick=284 Det=530=0
47 Tick=284 Det=530=0
48 Tick=284 Det=537=0
49 Tick=284 Det=537=0
50 Tick=284 Det=513=1
51 Tick=285 Det=518=0
52 Tick=285 Det=518=0
53 Tick=285 Det=519=1
54 Tick=285 Det=519=1
55 Tick=285 Det=520=0
56 Tick=285 Det=520=0
57 Tick=285 Det=517=0
58 Tick=285 Det=517=0
59 Tick=297 Det=518=0
60 Tick=297 Det=518=0
61 Tick=297 Det=519=0
62 Tick=297 Det=519=0
63 Tick=297 Det=520=0
64 Tick=297 Det=520=0
65 Tick=297 Det=517=0
66 Tick=297 Det=517=0
67 Tick=354 Det=513=0
68 Tick=354 Det=515=0
69 Tick=354 Det=514=0
70 Tick=354 Det=516=1
71 Tick=354 Det=516=1
72 Tick=354 Det=515=0
73 Tick=354 Det=514=0
74 Tick=354 Det=513=0
75 Tick=381 Det=531=1
76 Tick=381 Det=531=1
77 Tick=381 Det=529=0
78 Tick=381 Det=529=0
79 Tick=381 Det=530=0
80 Tick=381 Det=530=0
81 Tick=385 Det=531=0
82 Tick=385 Det=529=0
83 Tick=385 Det=529=0
84 Tick=385 Det=530=0
85 Tick=385 Det=530=0
86 Tick=390 Det=518=1
87 Tick=390 Det=518=1
88 Tick=390 Det=519=0
89 Tick=390 Det=519=0
90 Tick=390 Det=520=0
91 Tick=390 Det=520=0
92 Tick=390 Det=517=0
93 Tick=390 Det=517=0
94 Tick=399 Det=531=0
95 Tick=417 Det=518=1
96 Tick=417 Det=518=1
97 Tick=417 Det=519=1
98 Tick=417 Det=519=1
99 Tick=417 Det=520=0
100 Tick=417 Det=520=0
101 Tick=417 Det=517=0
102 Tick=417 Det=517=0
103 Tick=419 Det=518=0
104 Tick=419 Det=519=1
105 Tick=419 Det=519=1
106 Tick=419 Det=520=0
107 Tick=419 Det=520=0
108 Tick=419 Det=517=0
109 Tick=419 Det=517=0
110 Tick=423 Det=518=0
111 Tick=423 Det=518=0
112 Tick=423 Det=519=0
113 Tick=423 Det=519=0
114 Tick=423 Det=520=0
115 Tick=423 Det=520=0
116 Tick=423 Det=517=0
117 Tick=423 Det=517=0
118 Tick=439 Det=518=0
119 Tick=442 Det=521=0
120 Tick=442 Det=521=0
121 Tick=442 Det=524=0
122 Tick=442 Det=523=1
123 Tick=442 Det=523=1
124 Tick=442 Det=524=0
125 Tick=442 Det=522=0
126 Tick=442 Det=522=0
127 Tick=479 Det=521=0
128 Tick=479 Det=521=0
129 Tick=479 Det=524=0
130 Tick=479 Det=523=0
131 Tick=479 Det=524=0
132 Tick=479 Det=522=0
133 Tick=479 Det=522=0
134 Tick=482 Det=526=1
135 Tick=482 Det=527=0
136 Tick=482 Det=526=1
137 Tick=482 Det=525=0
138 Tick=482 Det=528=0
139 Tick=482 Det=528=0
140 Tick=482 Det=527=0
141 Tick=482 Det=525=0
142 Tick=493 Det=523=0
143 Tick=521 Det=527=0
144 Tick=521 Det=526=0
145 Tick=521 Det=525=0
146 Tick=521 Det=528=0
147 Tick=521 Det=528=0
148 Tick=521 Det=527=0
149 Tick=521 Det=525=0
150 Tick=534 Det=526=0
151 Tick=583 Det=513=1
152 Tick=583 Det=515=0
153 Tick=583 Det=514=0
154 Tick=583 Det=516=1
155 Tick=583 Det=516=1
156 Tick=583 Det=515=0
157 Tick=583 Det=514=0
158 Tick=583 Det=513=1
159 Tick=607 Det=515=0
160 Tick=607 Det=514=0
161 Tick=607 Det=516=1
162 Tick=607 Det=516=1
163 Tick=607 Det=515=0
164 Tick=607 Det=514=0
165 Tick=607 Det=513=0
166 Tick=618 Det=513=0
167 Tick=631 Det=531=1
168 Tick=631 Det=531=1
169 Tick=631 Det=529=0
170 Tick=631 Det=529=0
171 Tick=631 Det=530=0
172 Tick=631 Det=530=0
173 Tick=636 Det=531=0
174 Tick=636 Det=529=0
175 Tick=636 Det=529=0
176 Tick=636 Det=530=0
177 Tick=636 Det=530=0
178 Tick=640 Det=518=1
179 Tick=640 Det=518=1
180 Tick=640 Det=519=0
181 Tick=640 Det=519=0
182 Tick=640 Det=520=0
183 Tick=640 Det=520=0
184 Tick=640 Det=517=0
185 Tick=640 Det=517=0
186 Tick=645 Det=531=0
187 Tick=668 Det=518=1
188 Tick=668 Det=518=1
189 Tick=668 Det=519=1
190 Tick=668 Det=519=1
191 Tick=668 Det=520=0
192 Tick=668 Det=520=0
193 Tick=668 Det=517=0
194 Tick=668 Det=517=0
195 Tick=670 Det=518=0
196 Tick=670 Det=519=1
197 Tick=670 Det=519=1
198 Tick=670 Det=520=0
199 Tick=670 Det=520=0
200 Tick=670 Det=517=0
201 Tick=670 Det=517=0
202 Tick=672 Det=518=0
203 Tick=672 Det=518=0
204 Tick=672 Det=519=0
205 Tick=672 Det=519=0
206 Tick=672 Det=520=0
207 Tick=672 Det=520=0
208 Tick=672 Det=517=0
209 Tick=672 Det=517=0
210 Tick=690 Det=518=0
211 Tick=692 Det=521=0
212 Tick=692 Det=521=0
213 Tick=692 Det=524=0
214 Tick=692 Det=523=1
215 Tick=692 Det=523=1
216 Tick=692 Det=524=0
217 Tick=692 Det=522=0
218 Tick=692 Det=522=0
219 Tick=730 Det=521=0
220 Tick=730 Det=521=0
221 Tick=730 Det=524=0
222 Tick=730 Det=523=0
223 Tick=730 Det=524=0
224 Tick=730 Det=522=0
225 Tick=730 Det=522=0
226 Tick=733 Det=526=1
227 Tick=733 Det=527=0
228 Tick=733 Det=526=1
229 Tick=733 Det=525=0
230 Tick=733 Det=528=0
231 Tick=733 Det=528=0
232 Tick=733 Det=527=0
233 Tick=733 Det=525=0
234 Tick=744 Det=523=0
235 Tick=772 Det=527=0
236 Tick=772 Det=526=0
237 Tick=772 Det=525=0
238 Tick=772 Det=528=0
239 Tick=772 Det=528=0
240 Tick=772 Det=527=0
241 Tick=772 Det=525=0
242 Tick=785 Det=526=0
243 Tick=857 Det=513=1
244 Tick=857 Det=515=0
245 Tick=857 Det=514=0
246 Tick=857 Det=516=1
247 Tick=857 Det=516=1
248 Tick=857 Det=515=0
249 Tick=857 Det=514=0
250 Tick=857 Det=513=1

61
2 trains.txt Normal file
View File

@@ -0,0 +1,61 @@
départ depuis 2 trains en 523 et 526
1 Tick=370 Det=523=1 BB
2 Tick=370 Det=526=1 CC en tete
3 Tick=370 Det=516=1 TGV en garage
4 Tick=371 Det=520=1 ???
-------------------------------
5 Tick=505 Det=526=0 CC quitte
6 Tick=550 Det=523=0 BB quitte
7 Tick=559 Det=526=1 BB arrive
8 Tick=578 Det=513=1 CC arrive
9 Tick=606 Det=513=0 CC quitte
10 Tick=638 Det=531=1 CC arrive
11 Tick=638 Det=526=0 BB quitte
12 Tick=643 Det=531=0 CC quitte
13 Tick=649 Det=518=1 CC arrive
14 Tick=649 Det=520=0 ???
15 Tick=685 Det=518=0 CC quitte
16 Tick=712 Det=513=1 BB arrive
17 Tick=716 Det=523=1 CC arrive
18 Tick=730 Det=513=0 BB quitte
19 Tick=766 Det=531=1 BB arrive
20 Tick=766 Det=523=0 CC quitte
21 Tick=774 Det=531=0 BB quitte
22 Tick=774 Det=526=1 CC arrive
23 Tick=779 Det=518=1 BB arrive
24 Tick=809 Det=518=0 BB quitte
25 Tick=819 Det=526=0 CC quitte
26 Tick=839 Det=523=1 BB arrive
27 Tick=871 Det=523=0 BB quitte
28 Tick=876 Det=526=1 BB arrive
29 Tick=933 Det=513=1 CC arrive
trains arretés
BB CC
1 523 1
2 526 1
5 526 0
6 523 0
7 526 1
8 513 1
9 513 0
10 531 1
11 526 0
12 531 0
13 518 1
14 520???
15 518 0
16 513 1
17 523 1
18 513 0
19 531 1
20 523 0
21 531 0
22 526 1
23 518 1
24 518 0
25 526 0
26 523 1
27 523 0
28 526 1
29 513 1

306
2trains_séparés.txt Normal file
View File

@@ -0,0 +1,306 @@
1 Tick=1016 Det=521=0
2 Tick=1016 Det=521=0
3 Tick=1016 Det=524=0
4 Tick=1016 Det=531=0
5 Tick=1016 Det=518=0
6 Tick=1016 Det=518=0
7 Tick=1016 Det=519=0
8 Tick=1016 Det=523=0
9 Tick=1016 Det=526=1
10 Tick=1016 Det=527=0
11 Tick=1016 Det=526=1
12 Tick=1016 Det=523=0
13 Tick=1016 Det=513=0
14 Tick=1016 Det=524=0
15 Tick=1016 Det=515=0
16 Tick=1016 Det=514=0
17 Tick=1016 Det=516=1
18 Tick=1016 Det=516=1
19 Tick=1016 Det=515=0
20 Tick=1016 Det=525=0
21 Tick=1016 Det=528=1
22 Tick=1016 Det=528=1
23 Tick=1016 Det=522=0
24 Tick=1017 Det=514=0
25 Tick=1017 Det=522=0
26 Tick=1017 Det=519=0
27 Tick=1017 Det=527=0
28 Tick=1017 Det=531=0
29 Tick=1017 Det=525=0
30 Tick=1017 Det=535=0
31 Tick=1017 Det=535=0
32 Tick=1017 Det=535=0
33 Tick=1017 Det=535=0
34 Tick=1017 Det=534=0
35 Tick=1017 Det=534=0
36 Tick=1017 Det=533=0
37 Tick=1017 Det=533=0
38 Tick=1017 Det=520=0
39 Tick=1017 Det=520=0
40 Tick=1017 Det=517=0
41 Tick=1017 Det=517=0
42 Tick=1017 Det=538=0
43 Tick=1017 Det=538=0
44 Tick=1017 Det=529=0
45 Tick=1017 Det=529=0
46 Tick=1017 Det=530=0
47 Tick=1017 Det=530=0
48 Tick=1017 Det=537=0
49 Tick=1017 Det=537=0
50 Tick=1017 Det=513=0
51 Tick=1044 Det=526=0
52 Tick=1044 Det=527=0
53 Tick=1044 Det=526=0
54 Tick=1044 Det=525=0
55 Tick=1044 Det=528=1
56 Tick=1044 Det=528=1
57 Tick=1044 Det=527=0
58 Tick=1044 Det=525=0
59 Tick=1057 Det=526=0
60 Tick=1057 Det=527=0
61 Tick=1057 Det=526=0
62 Tick=1057 Det=525=0
63 Tick=1057 Det=528=0
64 Tick=1057 Det=528=0
65 Tick=1057 Det=527=0
66 Tick=1057 Det=525=0
67 Tick=1076 Det=531=1
68 Tick=1076 Det=531=1
69 Tick=1076 Det=529=0
70 Tick=1076 Det=529=0
71 Tick=1076 Det=530=0
72 Tick=1076 Det=530=0
73 Tick=1081 Det=531=0
74 Tick=1081 Det=529=0
75 Tick=1081 Det=529=0
76 Tick=1081 Det=530=0
77 Tick=1081 Det=530=0
78 Tick=1086 Det=518=1
79 Tick=1086 Det=518=1
80 Tick=1086 Det=519=0
81 Tick=1086 Det=519=0
82 Tick=1086 Det=520=0
83 Tick=1086 Det=520=0
84 Tick=1086 Det=517=0
85 Tick=1086 Det=517=0
86 Tick=1097 Det=531=0
87 Tick=1115 Det=518=0
88 Tick=1115 Det=519=0
89 Tick=1115 Det=519=0
90 Tick=1115 Det=520=0
91 Tick=1115 Det=520=0
92 Tick=1115 Det=517=0
93 Tick=1115 Det=517=0
94 Tick=1121 Det=518=0
95 Tick=1138 Det=521=0
96 Tick=1138 Det=521=0
97 Tick=1138 Det=524=0
98 Tick=1138 Det=523=1
99 Tick=1138 Det=523=1
100 Tick=1138 Det=524=0
101 Tick=1138 Det=522=0
102 Tick=1138 Det=522=0
103 Tick=1141 Det=513=1
104 Tick=1141 Det=515=0
105 Tick=1141 Det=514=0
106 Tick=1141 Det=516=1
107 Tick=1141 Det=516=1
108 Tick=1141 Det=515=0
109 Tick=1141 Det=514=0
110 Tick=1141 Det=513=1
111 Tick=1183 Det=521=0
112 Tick=1183 Det=521=0
113 Tick=1183 Det=524=0
114 Tick=1183 Det=523=0
115 Tick=1183 Det=524=0
116 Tick=1183 Det=522=0
117 Tick=1183 Det=522=0
118 Tick=1191 Det=526=1
119 Tick=1191 Det=527=0
120 Tick=1191 Det=526=1
121 Tick=1191 Det=525=0
122 Tick=1191 Det=528=0
123 Tick=1191 Det=528=0
124 Tick=1191 Det=527=0
125 Tick=1191 Det=525=0
126 Tick=1194 Det=513=0
127 Tick=1194 Det=515=0
128 Tick=1194 Det=514=0
129 Tick=1194 Det=516=1
130 Tick=1194 Det=516=1
131 Tick=1194 Det=515=0
132 Tick=1194 Det=514=0
133 Tick=1194 Det=513=0
134 Tick=1214 Det=523=0
135 Tick=1242 Det=531=1
136 Tick=1242 Det=531=1
137 Tick=1242 Det=529=0
138 Tick=1242 Det=529=0
139 Tick=1242 Det=530=0
140 Tick=1242 Det=530=0
141 Tick=1251 Det=531=0
142 Tick=1251 Det=529=0
143 Tick=1251 Det=529=0
144 Tick=1251 Det=530=0
145 Tick=1251 Det=530=0
146 Tick=1260 Det=518=1
147 Tick=1260 Det=518=1
148 Tick=1260 Det=519=0
149 Tick=1260 Det=519=0
150 Tick=1260 Det=520=0
151 Tick=1260 Det=520=0
152 Tick=1260 Det=517=0
153 Tick=1260 Det=517=0
154 Tick=1272 Det=531=0
155 Tick=1283 Det=527=0
156 Tick=1283 Det=526=0
157 Tick=1283 Det=525=0
158 Tick=1283 Det=528=0
159 Tick=1283 Det=528=0
160 Tick=1283 Det=527=0
161 Tick=1283 Det=525=0
162 Tick=1290 Det=526=0
163 Tick=1310 Det=518=0
164 Tick=1310 Det=519=0
165 Tick=1310 Det=519=0
166 Tick=1310 Det=520=0
167 Tick=1310 Det=520=0
168 Tick=1310 Det=517=0
169 Tick=1310 Det=517=0
170 Tick=1321 Det=518=0
171 Tick=1326 Det=513=0
172 Tick=1326 Det=515=0
173 Tick=1326 Det=514=1
174 Tick=1326 Det=516=1
175 Tick=1326 Det=516=1
176 Tick=1326 Det=515=0
177 Tick=1326 Det=514=1
178 Tick=1326 Det=513=0
179 Tick=1376 Det=513=1
180 Tick=1376 Det=515=0
181 Tick=1376 Det=514=1
182 Tick=1376 Det=516=1
183 Tick=1376 Det=516=1
184 Tick=1376 Det=515=0
185 Tick=1376 Det=514=1
186 Tick=1376 Det=513=1
187 Tick=1397 Det=521=0
188 Tick=1397 Det=521=0
189 Tick=1397 Det=524=0
190 Tick=1397 Det=523=0
191 Tick=1397 Det=523=0
192 Tick=1397 Det=524=0
193 Tick=1397 Det=522=1
194 Tick=1397 Det=522=1
195 Tick=1400 Det=515=0
196 Tick=1421 Det=514=0
197 Tick=1422 Det=513=0
198 Tick=1437 Det=531=1
199 Tick=1437 Det=531=1
200 Tick=1437 Det=529=0
201 Tick=1437 Det=529=0
202 Tick=1437 Det=530=0
203 Tick=1437 Det=530=0
204 Tick=1441 Det=531=0
205 Tick=1441 Det=531=0
206 Tick=1441 Det=529=0
207 Tick=1441 Det=529=0
208 Tick=1441 Det=530=0
209 Tick=1441 Det=530=0
210 Tick=1446 Det=518=1
211 Tick=1446 Det=518=1
212 Tick=1446 Det=519=0
213 Tick=1446 Det=519=0
214 Tick=1446 Det=520=0
215 Tick=1446 Det=520=0
216 Tick=1446 Det=517=0
217 Tick=1446 Det=517=0
218 Tick=1475 Det=518=0
219 Tick=1475 Det=519=0
220 Tick=1475 Det=519=0
221 Tick=1475 Det=520=0
222 Tick=1475 Det=520=0
223 Tick=1475 Det=517=0
224 Tick=1475 Det=517=0
225 Tick=1490 Det=518=0
226 Tick=1491 Det=521=0
227 Tick=1491 Det=521=0
228 Tick=1491 Det=524=0
229 Tick=1491 Det=523=0
230 Tick=1491 Det=523=0
231 Tick=1491 Det=524=0
232 Tick=1491 Det=522=0
233 Tick=1498 Det=521=0
234 Tick=1498 Det=521=0
235 Tick=1498 Det=524=0
236 Tick=1498 Det=523=1
237 Tick=1498 Det=523=1
238 Tick=1498 Det=524=0
239 Tick=1498 Det=522=0
240 Tick=1498 Det=522=0
241 Tick=1500 Det=522=0
242 Tick=1541 Det=521=0
243 Tick=1541 Det=521=0
244 Tick=1541 Det=524=0
245 Tick=1541 Det=526=0
246 Tick=1541 Det=527=1
247 Tick=1541 Det=526=0
248 Tick=1541 Det=523=0
249 Tick=1541 Det=524=0
250 Tick=1541 Det=525=0
251 Tick=1541 Det=528=0
252 Tick=1541 Det=528=0
253 Tick=1541 Det=522=0
254 Tick=1541 Det=522=0
255 Tick=1541 Det=527=1
256 Tick=1541 Det=525=0
257 Tick=1551 Det=526=1
258 Tick=1551 Det=527=1
259 Tick=1551 Det=526=1
260 Tick=1551 Det=525=0
261 Tick=1551 Det=528=0
262 Tick=1551 Det=528=0
263 Tick=1551 Det=527=1
264 Tick=1551 Det=525=0
265 Tick=1552 Det=523=0
266 Tick=1598 Det=527=1
267 Tick=1598 Det=526=0
268 Tick=1598 Det=525=0
269 Tick=1598 Det=528=0
270 Tick=1598 Det=528=0
271 Tick=1598 Det=527=1
272 Tick=1598 Det=525=0
273 Tick=1606 Det=526=0
274 Tick=1606 Det=526=0
275 Tick=1606 Det=525=0
276 Tick=1606 Det=528=0
277 Tick=1606 Det=528=0
278 Tick=1606 Det=527=0
279 Tick=1606 Det=525=0
280 Tick=1643 Det=518=0
281 Tick=1643 Det=518=0
282 Tick=1643 Det=519=1
283 Tick=1643 Det=519=1
284 Tick=1643 Det=520=0
285 Tick=1643 Det=520=0
286 Tick=1643 Det=517=0
287 Tick=1643 Det=517=0
288 Tick=1645 Det=527=0
289 Tick=1651 Det=526=0
290 Tick=1708 Det=513=1
291 Tick=1708 Det=515=0
292 Tick=1709 Det=514=0
293 Tick=1709 Det=516=1
294 Tick=1709 Det=516=1
295 Tick=1709 Det=515=0
296 Tick=1709 Det=514=0
297 Tick=1709 Det=513=1
298 Tick=1709 Det=518=0
299 Tick=1709 Det=518=0
300 Tick=1709 Det=519=0
301 Tick=1709 Det=519=0
302 Tick=1709 Det=520=0
303 Tick=1709 Det=520=0
304 Tick=1709 Det=517=0
305 Tick=1709 Det=517=0

View File

@@ -31,12 +31,12 @@
-M -M
-$M16384,1048576 -$M16384,1048576
-K$00400000 -K$00400000
-LE"c:\program files\borland\delphi7\Projects\Bpl" -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
-LN"c:\program files\borland\delphi7\Projects\Bpl" -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
-U"c:\program files\borland\delphi7\Lib\Debug" -U"c:\program files (x86)\borland\delphi7\Lib\Debug"
-O"c:\program files\borland\delphi7\Lib\Debug" -O"c:\program files (x86)\borland\delphi7\Lib\Debug"
-I"c:\program files\borland\delphi7\Lib\Debug" -I"c:\program files (x86)\borland\delphi7\Lib\Debug"
-R"c:\program files\borland\delphi7\Lib\Debug" -R"c:\program files (x86)\borland\delphi7\Lib\Debug"
-w-UNSAFE_TYPE -w-UNSAFE_TYPE
-w-UNSAFE_CODE -w-UNSAFE_CODE
-w-UNSAFE_CAST -w-UNSAFE_CAST

View File

@@ -111,7 +111,7 @@ AutoIncBuild=1
MajorVer=1 MajorVer=1
MinorVer=0 MinorVer=0
Release=0 Release=0
Build=4 Build=5
Debug=0 Debug=0
PreRelease=0 PreRelease=0
Special=0 Special=0
@@ -122,7 +122,7 @@ CodePage=1252
[Version Info Keys] [Version Info Keys]
CompanyName= CompanyName=
FileDescription= FileDescription=
FileVersion=1.0.0.4 FileVersion=1.0.0.5
InternalName= InternalName=
LegalCopyright= LegalCopyright=
LegalTrademarks= LegalTrademarks=

View File

@@ -5,7 +5,8 @@ uses
UnitPrinc in 'UnitPrinc.pas' {FormPrinc}, UnitPrinc in 'UnitPrinc.pas' {FormPrinc},
UnitDebug in 'UnitDebug.pas' {FormDebug}, UnitDebug in 'UnitDebug.pas' {FormDebug},
verif_version in 'verif_version.pas' {FormVersion}, verif_version in 'verif_version.pas' {FormVersion},
UnitPilote in 'UnitPilote.pas' {FormPilote}; UnitPilote in 'UnitPilote.pas' {FormPilote},
UnitSimule in 'UnitSimule.pas' {FormSimulation};
{$R *.res} {$R *.res}
@@ -14,5 +15,6 @@ begin
Application.CreateForm(TFormPrinc, FormPrinc); Application.CreateForm(TFormPrinc, FormPrinc);
Application.CreateForm(TFormDebug, FormDebug); Application.CreateForm(TFormDebug, FormDebug);
Application.CreateForm(TFormPilote, FormPilote); Application.CreateForm(TFormPilote, FormPilote);
Application.CreateForm(TFormSimulation, FormSimulation);
Application.Run; Application.Run;
end. end.

Binary file not shown.

Binary file not shown.

View File

@@ -1,6 +1,6 @@
object FormDebug: TFormDebug object FormDebug: TFormDebug
Left = 514 Left = 509
Top = 56 Top = 108
BorderStyle = bsSingle BorderStyle = bsSingle
Caption = 'Fen'#234'tre de d'#233'bug' Caption = 'Fen'#234'tre de d'#233'bug'
ClientHeight = 639 ClientHeight = 639
@@ -47,10 +47,10 @@ object FormDebug: TFormDebug
ParentFont = False ParentFont = False
end end
object Label3: TLabel object Label3: TLabel
Left = 456 Left = 448
Top = 88 Top = 136
Width = 265 Width = 105
Height = 73 Height = 225
AutoSize = False AutoSize = False
Caption = 'Label3' Caption = 'Label3'
Color = clGray Color = clGray
@@ -79,10 +79,10 @@ object FormDebug: TFormDebug
OnKeyPress = EditNivDebugKeyPress OnKeyPress = EditNivDebugKeyPress
end end
object MemoEvtDet: TMemo object MemoEvtDet: TMemo
Left = 564 Left = 560
Top = 416 Top = 368
Width = 181 Width = 185
Height = 173 Height = 221
Color = clBlack Color = clBlack
Font.Charset = ANSI_CHARSET Font.Charset = ANSI_CHARSET
Font.Color = clYellow Font.Color = clYellow
@@ -91,8 +91,9 @@ object FormDebug: TFormDebug
Font.Style = [] Font.Style = []
Lines.Strings = ( Lines.Strings = (
'Tableau des '#233'v'#232'nements ' 'Tableau des '#233'v'#232'nements '
'd'#233'tecteurs') 'fronts descendants d'#233'tecteurs')
ParentFont = False ParentFont = False
ScrollBars = ssVertical
TabOrder = 1 TabOrder = 1
end end
object ButtonEcrLog: TButton object ButtonEcrLog: TButton
@@ -150,7 +151,7 @@ object FormDebug: TFormDebug
end end
object MemoDet: TMemo object MemoDet: TMemo
Left = 560 Left = 560
Top = 176 Top = 136
Width = 185 Width = 185
Height = 225 Height = 225
Color = clMaroon Color = clMaroon
@@ -173,8 +174,38 @@ object FormDebug: TFormDebug
WordWrap = True WordWrap = True
OnClick = ButtonAffEvtChronoClick OnClick = ButtonAffEvtChronoClick
end end
object CheckAffAffecTrains: TCheckBox
Left = 448
Top = 88
Width = 289
Height = 17
Caption = 'Affichage d'#39'affectation des trains aux d'#233'tecteurs'
Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
TabOrder = 9
OnClick = CheckAffAffecTrainsClick
end
object CheckBoxTraceLIste: TCheckBox
Left = 448
Top = 112
Width = 289
Height = 17
Caption = 'Affichage des '#233'valuations des routes'
Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
TabOrder = 10
OnClick = CheckBoxTraceLIsteClick
end
object SaveDialog: TSaveDialog object SaveDialog: TSaveDialog
Left = 464 Left = 464
Top = 336 Top = 384
end end
end end

View File

@@ -21,6 +21,8 @@ type
ButtonCherche: TButton; ButtonCherche: TButton;
MemoDet: TMemo; MemoDet: TMemo;
ButtonAffEvtChrono: TButton; ButtonAffEvtChrono: TButton;
CheckAffAffecTrains: TCheckBox;
CheckBoxTraceLIste: TCheckBox;
procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure ButtonEcrLogClick(Sender: TObject); procedure ButtonEcrLogClick(Sender: TObject);
@@ -29,6 +31,8 @@ type
procedure ButtonRazTamponClick(Sender: TObject); procedure ButtonRazTamponClick(Sender: TObject);
procedure ButtonChercheClick(Sender: TObject); procedure ButtonChercheClick(Sender: TObject);
procedure ButtonAffEvtChronoClick(Sender: TObject); procedure ButtonAffEvtChronoClick(Sender: TObject);
procedure CheckAffAffecTrainsClick(Sender: TObject);
procedure CheckBoxTraceLIsteClick(Sender: TObject);
private private
{ Déclarations privées } { Déclarations privées }
public public
@@ -40,15 +44,20 @@ Const Max_Event_det_tick = 10000;
var var
FormDebug: TFormDebug; FormDebug: TFormDebug;
NivDebug : integer; NivDebug : integer;
AffSignal : boolean; AffSignal,AffAffect : boolean;
N_event_det : integer; // index du dernier évènement (de 1 à 20) N_event_det : integer; // index du dernier évènement (de 1 à 20)
event_det : array[1..20] of integer; event_det : array[1..20] of integer;
// tick 1/10s,détecteur // tick 1/10s,détecteur
N_Event_tick : integer ; // dernier index N_Event_tick : integer ; // dernier index
event_det_tick : array[1..Max_Event_det_tick] of
// tableau des évènements détecteurs
event_det_tick : array[0..Max_Event_det_tick] of
record record
tick : longint; tick : longint;
detecteur : array[1..1100] of integer; detecteur : array[1..1100] of integer; // état du détecteur [...]
train : integer ;
suivant : integer ; // d'ou vient le train
traite : boolean; // traité lors de a recherche d'une route
end; end;
@@ -128,7 +137,6 @@ begin
end; end;
procedure TFormDebug.CheckAffSigClick(Sender: TObject); procedure TFormDebug.CheckAffSigClick(Sender: TObject);
begin begin
AffSignal:=checkAffSig.Checked; AffSignal:=checkAffSig.Checked;
@@ -183,4 +191,14 @@ begin
end; end;
end; end;
procedure TFormDebug.CheckAffAffecTrainsClick(Sender: TObject);
begin
AffAffect:=CheckAffAffecTrains.checked;
end;
procedure TFormDebug.CheckBoxTraceLIsteClick(Sender: TObject);
begin
TraceListe:=CheckBoxTraceLIste.checked;
end;
end. end.

Binary file not shown.

View File

@@ -4,7 +4,7 @@ object FormPilote: TFormPilote
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Pilotage' Caption = 'Pilotage'
ClientHeight = 350 ClientHeight = 350
ClientWidth = 332 ClientWidth = 542
Color = clBtnFace Color = clBtnFace
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@@ -202,4 +202,48 @@ object FormPilote: TFormPilote
Text = 'EditNbFeux' Text = 'EditNbFeux'
OnKeyPress = EditNbreFeuxKeyPress OnKeyPress = EditNbreFeuxKeyPress
end end
object GroupBox3: TGroupBox
Left = 328
Top = 48
Width = 209
Height = 97
Caption = 'pilotage unisemaf'
TabOrder = 4
object RadioButton1: TRadioButton
Left = 8
Top = 24
Width = 145
Height = 17
Caption = 'Algo1 pilotage inverse'
TabOrder = 0
OnClick = RadioButton1Click
end
object RadioButton2: TRadioButton
Left = 8
Top = 40
Width = 145
Height = 17
Caption = 'Algo2 pilotage normal'
TabOrder = 1
OnClick = RadioButton2Click
end
object RadioButton3: TRadioButton
Left = 8
Top = 56
Width = 193
Height = 17
Caption = 'Algo3 pilotage bits '#224' 1 seuls normal'
TabOrder = 2
OnClick = RadioButton3Click
end
object RadioButton4: TRadioButton
Left = 8
Top = 72
Width = 193
Height = 17
Caption = 'Algo4 pilotage bits '#224' 1 seuls inverse'
TabOrder = 3
OnClick = RadioButton4Click
end
end
end end

View File

@@ -31,6 +31,11 @@ type
ButtonPilote: TButton; ButtonPilote: TButton;
EditNbreFeux: TEdit; EditNbreFeux: TEdit;
LabelNbFeux: TLabel; LabelNbFeux: TLabel;
GroupBox3: TGroupBox;
RadioButton1: TRadioButton;
RadioButton2: TRadioButton;
RadioButton3: TRadioButton;
RadioButton4: TRadioButton;
procedure RadioVertClick(Sender: TObject); procedure RadioVertClick(Sender: TObject);
procedure RadioVertCliClick(Sender: TObject); procedure RadioVertCliClick(Sender: TObject);
procedure RadioJauneClick(Sender: TObject); procedure RadioJauneClick(Sender: TObject);
@@ -49,6 +54,10 @@ type
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure ButtonPiloteClick(Sender: TObject); procedure ButtonPiloteClick(Sender: TObject);
procedure EditNbreFeuxKeyPress(Sender: TObject; var Key: Char); procedure EditNbreFeuxKeyPress(Sender: TObject; var Key: Char);
procedure RadioButton1Click(Sender: TObject);
procedure RadioButton2Click(Sender: TObject);
procedure RadioButton3Click(Sender: TObject);
procedure RadioButton4Click(Sender: TObject);
private private
{ Déclarations privées } { Déclarations privées }
public public
@@ -223,6 +232,7 @@ begin
if feux[i].aspect<10 then if feux[i].aspect<10 then
begin begin
EtatSignalCplx[AdrPilote]:=EtatSignalCplx[0]; EtatSignalCplx[AdrPilote]:=EtatSignalCplx[0];
//Affiche(IntToSTR(EtatSignalCplx[AdrPilote]),clyellow);
envoi_signal(AdrPilote); envoi_signal(AdrPilote);
end end
else else
@@ -253,4 +263,36 @@ if ord(Key) = VK_RETURN then
end; end;
end; end;
procedure TFormPilote.RadioButton1Click(Sender: TObject);
begin
uni1:=RadioButton1.checked;
uni2:=RadioButton2.checked;
uni3:=RadioButton3.checked;
uni4:=RadioButton4.checked;
end;
procedure TFormPilote.RadioButton2Click(Sender: TObject);
begin
uni1:=RadioButton1.checked;
uni2:=RadioButton2.checked;
uni3:=RadioButton3.checked;
uni4:=RadioButton4.checked;
end;
procedure TFormPilote.RadioButton3Click(Sender: TObject);
begin
uni1:=RadioButton1.checked;
uni2:=RadioButton2.checked;
uni3:=RadioButton3.checked;
uni4:=RadioButton4.checked;
end;
procedure TFormPilote.RadioButton4Click(Sender: TObject);
begin
uni1:=RadioButton1.checked;
uni2:=RadioButton2.checked;
uni3:=RadioButton3.checked;
uni4:=RadioButton4.checked;
end;
end. end.

Binary file not shown.

View File

@@ -1,6 +1,6 @@
object FormPrinc: TFormPrinc object FormPrinc: TFormPrinc
Left = 172 Left = 33
Top = 78 Top = 205
BorderStyle = bsSingle BorderStyle = bsSingle
Caption = 'Client TCP-IP CDM Rail ou USB - syst'#232'me LENZ' Caption = 'Client TCP-IP CDM Rail ou USB - syst'#232'me LENZ'
ClientHeight = 607 ClientHeight = 607
@@ -13,7 +13,7 @@ object FormPrinc: TFormPrinc
Font.Style = [] Font.Style = []
Menu = MainMenu1 Menu = MainMenu1
OldCreateOrder = False OldCreateOrder = False
Position = poDesktopCenter Position = poDefault
ShowHint = True ShowHint = True
OnClose = FormClose OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
@@ -677,8 +677,8 @@ object FormPrinc: TFormPrinc
Visible = False Visible = False
end end
object Image2feux: TImage object Image2feux: TImage
Left = 656 Left = 1096
Top = 0 Top = 104
Width = 33 Width = 33
Height = 57 Height = 57
Picture.Data = { Picture.Data = {
@@ -1198,10 +1198,10 @@ object FormPrinc: TFormPrinc
Visible = False Visible = False
end end
object BoutVersion: TButton object BoutVersion: TButton
Left = 705 Left = 656
Top = 10 Top = 0
Width = 74 Width = 83
Height = 25 Height = 33
Caption = 'Dem version' Caption = 'Dem version'
TabOrder = 0 TabOrder = 0
OnClick = BoutVersionClick OnClick = BoutVersionClick
@@ -1226,7 +1226,7 @@ object FormPrinc: TFormPrinc
object BoutonRaf: TButton object BoutonRaf: TButton
Left = 912 Left = 912
Top = 64 Top = 64
Width = 105 Width = 89
Height = 33 Height = 33
Caption = 'Rafraichissement' Caption = 'Rafraichissement'
TabOrder = 2 TabOrder = 2
@@ -1298,8 +1298,8 @@ object FormPrinc: TFormPrinc
end end
end end
object ButtonTest: TButton object ButtonTest: TButton
Left = 864 Left = 832
Top = 8 Top = 0
Width = 105 Width = 105
Height = 33 Height = 33
Caption = 'Demande '#233'tat de la r'#233'trosignalisation' Caption = 'Demande '#233'tat de la r'#233'trosignalisation'
@@ -1308,10 +1308,10 @@ object FormPrinc: TFormPrinc
OnClick = ButtonTestClick OnClick = ButtonTestClick
end end
object ButtonInfo: TButton object ButtonInfo: TButton
Left = 1032 Left = 1008
Top = 72 Top = 64
Width = 75 Width = 81
Height = 25 Height = 33
Caption = 'Informations' Caption = 'Informations'
TabOrder = 7 TabOrder = 7
OnClick = ButtonInfoClick OnClick = ButtonInfoClick
@@ -1321,46 +1321,23 @@ object FormPrinc: TFormPrinc
Top = 111 Top = 111
Width = 419 Width = 419
Height = 46 Height = 46
Caption = 'Test d'#233'tecteur /feu suivant / pr'#233'c'#233'dent' Caption = 'Trains'
TabOrder = 6 TabOrder = 6
object LabelDetSP: TLabel object Label1: TLabel
Left = 356 Left = 16
Top = 20 Top = 20
Width = 52 Width = 89
Height = 18 Height = 13
AutoSize = False Caption = 'Nombre de trains : '
Caption = '0'
Font.Charset = ANSI_CHARSET
Font.Color = clWindowText
Font.Height = -16
Font.Name = 'Arial'
Font.Style = []
ParentFont = False
end end
object EditDetecteur1: TEdit object EditNbTrains: TEdit
Left = 13 Left = 112
Top = 20 Top = 16
Width = 44 Width = 89
Height = 21 Height = 21
TabOrder = 0 TabOrder = 0
Text = '0' Text = 'EditNbTrains'
end OnKeyPress = EditNbTrainsKeyPress
object BoutCalcZone: TButton
Left = 160
Top = 20
Width = 105
Height = 20
Caption = 'calcule zone suivante'
TabOrder = 2
OnClick = BoutCalcZoneClick
end
object EditDetecteur2: TEdit
Left = 69
Top = 20
Width = 44
Height = 21
TabOrder = 1
Text = '0'
end end
end end
object StatusBar1: TStatusBar object StatusBar1: TStatusBar
@@ -1371,30 +1348,30 @@ object FormPrinc: TFormPrinc
Panels = <> Panels = <>
SimplePanel = True SimplePanel = True
end end
object MSComm1: TMSComm object MSCommUSBLenz: TMSComm
Left = 1120 Left = 1120
Top = 8 Top = 8
Width = 32 Width = 32
Height = 32 Height = 32
OnComm = MSComm1Comm OnComm = MSCommUSBLenzComm
ControlData = { ControlData = {
2143341208000000ED030000ED03000001568A64000006000000010000040000 2143341208000000ED030000ED03000001568A64000006000000010000040000
00020000802500000000080000000000000000003F00000001000000} 00020000802500000000080000000000000000003F00000001000000}
end end
object loco: TButton object loco: TButton
Left = 976 Left = 944
Top = 10 Top = 0
Width = 75 Width = 75
Height = 25 Height = 33
Caption = 'loco' Caption = 'loco'
TabOrder = 10 TabOrder = 10
OnClick = locoClick OnClick = locoClick
end end
object ButtonAffDebug: TButton object ButtonAffDebug: TButton
Left = 784 Left = 744
Top = 10 Top = 0
Width = 75 Width = 81
Height = 25 Height = 33
Caption = 'Affiche debug' Caption = 'Affiche debug'
TabOrder = 11 TabOrder = 11
OnClick = ButtonAffDebugClick OnClick = ButtonAffDebugClick
@@ -1485,6 +1462,10 @@ object FormPrinc: TFormPrinc
end end
object Divers1: TMenuItem object Divers1: TMenuItem
Caption = 'Divers' Caption = 'Divers'
object FichierSimu: TMenuItem
Caption = 'Ouvrir un fichier de simulation'
OnClick = FichierSimuClick
end
object Versions1: TMenuItem object Versions1: TMenuItem
Caption = 'Versions' Caption = 'Versions'
Hint = 'Versions' Hint = 'Versions'

File diff suppressed because it is too large Load Diff

BIN
UnitSimule.dcu Normal file

Binary file not shown.

53
UnitSimule.dfm Normal file
View File

@@ -0,0 +1,53 @@
object FormSimulation: TFormSimulation
Left = 332
Top = 283
Width = 438
Height = 189
Caption = 'Simulation'
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = []
OldCreateOrder = False
OnCreate = FormCreate
PixelsPerInch = 96
TextHeight = 13
object Label1: TLabel
Left = 16
Top = 32
Width = 330
Height = 16
Caption = 'Intervalle de temps entre deux '#233'v'#232'nements d'#233'tecteurs (s)'
Font.Charset = ANSI_CHARSET
Font.Color = clWindowText
Font.Height = -13
Font.Name = 'Arial'
Font.Style = []
ParentFont = False
end
object Button1: TButton
Left = 160
Top = 96
Width = 105
Height = 41
Caption = 'Charger un fichier de simulation'
TabOrder = 0
WordWrap = True
OnClick = Button1Click
end
object EditIntervalle: TEdit
Left = 352
Top = 32
Width = 49
Height = 21
TabOrder = 1
Text = '2'
OnChange = EditIntervalleChange
end
object OpenDialog: TOpenDialog
Left = 40
Top = 64
end
end

106
UnitSimule.pas Normal file
View File

@@ -0,0 +1,106 @@
unit UnitSimule;
interface
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, UnitPrinc;
type
TFormSimulation = class(TForm)
Button1: TButton;
OpenDialog: TOpenDialog;
EditIntervalle: TEdit;
Label1: TLabel;
procedure Button1Click(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure EditIntervalleChange(Sender: TObject);
private
{ Déclarations privées }
public
{ Déclarations publiques }
end;
var
FormSimulation: TFormSimulation;
Intervalle : integer;
implementation
{$R *.dfm}
procedure TFormSimulation.Button1Click(Sender: TObject);
var s : string;
fte : textFile;
i,k,erreur : integer;
sortie : boolean;
begin
s:=GetCurrentDir;
s:='C:\Program Files (x86)\Borland\Delphi7\Projects\Signaux_complexes_GL';
OpenDialog.InitialDir:=s;
OpenDialog.DefaultExt:='txt';
OpenDialog.Filter:='Fichiers texte (*.txt)|*.txt|Tous fichiers (*.*)|*.*';
if openDialog.Execute then
begin
s:=openDialog.FileName;
assignFile(fte,s);
reset(fte);
index_simule:=1;
repeat
readln(fte,s);
i:=pos('Tick=',s);
if i<>0 then
begin
Delete(s,1,i+4);
val(s,k,erreur);
k:=Index_Simule*Intervalle*10+tick+80; // démarre dans 8s
Tablo_simule[index_simule].tick:=k;
i:=pos('Det=',s);
if i<>0 then
begin
Delete(s,1,i+3);
val(s,k,erreur);
Tablo_simule[index_simule].detecteur:=k;
i:=pos('=',s);
if i<>0 then
begin
Delete(s,1,i);
val(s,k,erreur);
Tablo_simule[index_simule].etat:=k;
s:='Tick='+intToSTR(Tablo_simule[index_simule].tick)+
' Detecteur='+intToSTR(Tablo_simule[index_simule].detecteur)+
'='+intToSTR(Tablo_simule[index_simule].etat);
Affiche(s,ClLime);
inc(index_simule);
end;
end;
end;
sortie:=eof(fte) or (index_simule>199);
until sortie ;
Affiche('Intervalle='+intToSTR(intervalle),clyellow);
dec(index_simule);
closeFile(fte);
FormSimulation.Close;
end;
end;
procedure TFormSimulation.FormCreate(Sender: TObject);
begin
Intervalle:=2;
EditIntervalle.Text:=IntToSTR(Intervalle);
end;
procedure TFormSimulation.EditIntervalleChange(Sender: TObject);
var i, erreur : integer;
begin
Val(EditIntervalle.Text,i,erreur);
if erreur=0 then Intervalle:=i;
end;
end.

View File

@@ -107,7 +107,7 @@ A31,0
476,9,0,1,(538,A23),1 476,9,0,1,(538,A23),1
497,9,0,4,(531,A19),1 497,9,0,4,(531,A19),1
600,7,0,0,(521,A8),1 600,7,0,0,(521,A8),1
610,9,0,6,(520,A20),0,7 197,5,0,6,(520,A20),0,51
0 0
/ /

Binary file not shown.

View File

@@ -22,7 +22,7 @@ var
FormVersion: TFormVersion; FormVersion: TFormVersion;
Lance_verif : integer; Lance_verif : integer;
Const Version='1.11';// sert à la comparaison de la version publiée Const Version='1.2';// sert à la comparaison de la version publiée
implementation implementation
@@ -100,6 +100,7 @@ var s,s2,s3,Version_p,Url,LocalFile : string;
i,j : integer; i,j : integer;
V_publie,V_utile : real; V_publie,V_utile : real;
begin begin
//Affiche('vérifie version',clLime);
Url:='http://cdmrail.free.fr/ForumCDR/viewtopic.php?f=77&t=3906#p50499'; Url:='http://cdmrail.free.fr/ForumCDR/viewtopic.php?f=77&t=3906#p50499';
LocalFile:='page.txt'; LocalFile:='page.txt';
trouve_version:=false; trouve_version:=false;
@@ -174,7 +175,7 @@ begin
else formVersion.Free; else formVersion.Free;
end; end;
if V_utile=V_publie then Formprinc.Hint:='Votre version '+Version_p+' est à jour'; // if V_utile=V_publie then Affiche('Votre version '+Version_p+' est à jour',clLime);
end; end;
end end