kapstok / NHL-SoftDev (public) (License: Unspecified) (since 2018-11-16) (hash sha1)
No description available
Clone URLs: https://rocketgit.com/user/kapstok/NHL-SoftDev ssh://rocketgit@ssh.rocketgit.com/user/kapstok/NHL-SoftDev git://git.rocketgit.com/user/kapstok/NHL-SoftDev
19.12.2017 Final Herkansing testcase7 master
List of commits:
Subject Hash Author Date (UTC)
Fixed some bugs (See TestResultsSimulator.txt for more info). 7c4466770f8b4da0af1156856a40b32cd11b6d37 Jan Allersma 2017-12-07 13:31:04
Werk van Simulator na testen 05/12/17. 80af7ffb5438b855a2e73fb185ba66c1cd50efe3 Jan Allersma 2017-12-05 09:45:11
Nieuwe plattegrond toegevoegd. b520f51bdd4a4d25e5d1a54cd094cf3b4632a369 Jan Allersma 2017-12-02 14:19:52
More Waypoints! 465108ac6a127bbda26b40989fd6a68cd3e00aad Jan Allersma 2017-11-30 12:52:22
Added voetganger. dad12c3d2eb2a7160838c3495e4a7a2d382e493f Jan Allersma 2017-11-30 12:32:35
Added all waiting waypoints for 1xx. bbba002738e0a26b085673400c76329d3055d8ba Jan Allersma 2017-11-29 12:00:37
Simulation now working correctly for ID's 101, 102 and 103. 1bc2fb65bb75b3a1f63cf7690472152fe1f32564 Jan Allersma 2017-11-28 16:22:53
Autos kunnen gespawned worden en rijden dan de goede richting op. b36ef1cafeda20d5753b72c6f8e6ac8423c42d95 Jan Allersma 2017-11-26 21:44:39
Last changes before test case 5. 258ba4735dfd2078f8e4f034fffed2bbbb086f2a Jan Allersma 2017-11-22 14:08:37
hallo dit is kapot maar het werkt woehoe 4475c2633e962688c71634d633ac8789524f16cf XCBouke 2017-11-22 13:58:54
It's actually working now! With a gameloop and new icons :D 0b65d450fea6d9f679029f2d6765c7e2d1126cdd Jan Allersma 2017-11-20 22:02:23
Something... Works?? 9a6afe028642b571483fccd6d6bdab10dee68e9c Jan Allersma 2017-11-20 15:14:07
User input for sending msg. cdd1c17cfe8cc73985945aad5878e4891e92eab1 Jan Allersma 2017-11-14 23:05:53
prutsen veel prusten f37cf730ff7a0ad2e08cd769da5f488051ac6dd4 XCBouke 2017-11-09 21:32:15
uglyJsonCode created online with Bitbucket ed6c9c541947ec64827b6e80ed959feb1b0f9b85 XCBouke 2017-11-09 14:29:36
Connectie created online with Bitbucket (send en recieve in 1) b484aff52014ff8d1dbaf8387cf1479cf236f33a XCBouke 2017-11-09 14:28:29
Ready for test case 3. Also BIG cleanup. bda906e19e3b82fb91df53eb2208e8def822c6b5 Jan Allersma 2017-11-05 21:38:16
test case 2 fix(?) dd86d637d166707a31b644dad711c7a9e39dbc8d Jan Allersma 2017-11-04 10:55:03
Test case 2 9ea6eadbd85dde0e9522068718092b1f0e9b49f0 Jan Allersma 2017-10-29 22:37:57
Added threading. 4540fe1669c9e145e613edf2459031e7bec500ea Jan Allersma 2017-10-29 20:47:49
Commit 7c4466770f8b4da0af1156856a40b32cd11b6d37 - Fixed some bugs (See TestResultsSimulator.txt for more info).
Author: Jan Allersma
Author date (UTC): 2017-12-07 13:31
Committer name: Jan Allersma
Committer date (UTC): 2017-12-07 13:31
Parent(s): 182edf3492314e498d01f1169c8df138e481271e
Signer:
Signing key:
Signing status: N
Tree: badadb169a22b9eeebb08e63b2f8963aa0189663
File Lines added Lines deleted
TestResultsSimulator.txt 6 0
simulatie/connection.py 48 34
simulatie/pyg.py 21 14
simulatie/traffic.py 12 3
simulatie/trafficModel.py 34 33
File TestResultsSimulator.txt added (mode: 100644) (index 0000000..bd0fc12)
1 Voetgangers extra out of the blue. als ze op een vluchtheuvel moeten w8en.
2 Alle voetgangers freezen als eentje staat te w8en.
3 201 nog implemtenteren.. DONE!
4 treinen nog implementeren
5 De simulator queue'd zelf.
6 Als alles klaar is, stuur ie nul ipv count - 1.. DONE!
File simulatie/connection.py changed (mode: 100644) (index 085c47c..94ff54b)
... ... import time
9 9
10 10 # lights = [[id, amountOfVehicles, DirRequests]] # lights = [[id, amountOfVehicles, DirRequests]]
11 11 lights = [ lights = [
12 [101, 0, None],
13 [102, 0, None],
14 [103, 0, None],
15 [104, 0, None],
16 [105, 0, None],
17 [106, 0, None],
18 [107, 0, None],
19 [108, 0, None],
20 [109, 0, None],
21 [110, 0, None],
22 [201, 0, None],
23 [301, 0, None],
24 [302, 0, None],
25 [303, 0, None],
26 [304, 0, None],
27 [305, 0, None],
28 [401, 0, None],
29 [402, 0, None],
30 [403, 0, None],
31 [404, 0, None],
32 [405, 0, None],
33 [406, 0, None],
34 [407, 0, None],
35 [408, 0, None],
36 [409, 0, None],
37 [410, 0, None],
38 [411, 0, None],
39 [412, 0, None],
40 [501, 0, None],
41 [601, 0, None]
12 [101, 0, list()],
13 [102, 0, list()],
14 [103, 0, list()],
15 [104, 0, list()],
16 [105, 0, list()],
17 [106, 0, list()],
18 [107, 0, list()],
19 [108, 0, list()],
20 [109, 0, list()],
21 [110, 0, list()],
22 [201, 0, list()],
23 [301, 0, list()],
24 [302, 0, list()],
25 [303, 0, list()],
26 [304, 0, list()],
27 [305, 0, list()],
28 [401, 0, list()],
29 [402, 0, list()],
30 [403, 0, list()],
31 [404, 0, list()],
32 [405, 0, list()],
33 [406, 0, list()],
34 [407, 0, list()],
35 [408, 0, list()],
36 [409, 0, list()],
37 [410, 0, list()],
38 [411, 0, list()],
39 [412, 0, list()],
40 [501, 0, list()],
41 [601, 0, list()]
42 42 ] ]
43 43
44 44 msg = '' msg = ''
 
... ... def sendMsg(msg, index, amount):
72 72 pyg.spawnVehicle(index) pyg.spawnVehicle(index)
73 73 time.sleep(2) time.sleep(2)
74 74
75 def update(index, amountOfCars, dirRequests):
76 lights[index][1] = amountOfCars
75 def update(index, addCars, dirRequests):
76 lights[index][1] += addCars
77 77 lights[index][2] = dirRequests lights[index][2] = dirRequests
78 waitingVehicles = None
79 vehicleMutation = 0
80
81 if addCars < 0:
82 vehicleMutation *= -1
83
84 for i in range(0, vehicleMutation):
85 if addCars > 0:
86 lights[index][2].append(dirRequests[i])
87 else:
88 lights[index][2].pop()
89
90 if len(lights[index][2]) > 0:
91 waitingVehicles = lights[index][2]
78 92
79 93 msg = json.dumps({ msg = json.dumps({
80 94 "TrafficUpdate": { "TrafficUpdate": {
81 95 "LightId": lights[index][0], "LightId": lights[index][0],
82 96 "Count": lights[index][1], "Count": lights[index][1],
83 "DirectionRequests": lights[index][2]
97 "DirectionRequests": waitingVehicles
84 98 } }
85 99 }, sort_keys=True, indent=4, separators=(',',': ')) }, sort_keys=True, indent=4, separators=(',',': '))
86 100
87 sendMsg(msg, index, amountOfCars)
101 sendMsg(msg, index, amountOfCars) # Geeft deze functie de bug bij een transform?
88 102
89 103 def listen(): def listen():
90 104 print('Waiting for a sign..') print('Waiting for a sign..')
File simulatie/pyg.py changed (mode: 100644) (index 08f55a2..61daeb7)
... ... import time
6 6 import json import json
7 7
8 8 import trafficModel as tm import trafficModel as tm
9 import connection
9 #import connection
10 10
11 11 vehicles = list() vehicles = list()
12 12 lights = list() lights = list()
 
... ... class Light(object):
41 41
42 42
43 43 class Vehicle(object): class Vehicle(object):
44 def __init__(self, x, y, trafficId):
44 def __init__(self, x, y, trafficId, dirRequest):
45 45 trafficType = tm.lights[trafficId]["Id"] trafficType = tm.lights[trafficId]["Id"]
46 46 print("Traffic type: " + str(trafficType)) print("Traffic type: " + str(trafficType))
47 47
 
... ... class Vehicle(object):
58 58 else: # zijn slagbomen else: # zijn slagbomen
59 59 pass pass
60 60
61 if dirRequest == None or dirRequest == 2:
62 self.direction = 0
63 elif dirRequest == 4:
64 self.direction = 1
65 else:
66 print("ERROR: DIRECTION REQUEST NOT FOUND!")
67
61 68 self.rect = self.auto.get_rect() self.rect = self.auto.get_rect()
62 69 self.dest = [x,y] self.dest = [x,y]
63 70 self.speed = [0,0] self.speed = [0,0]
 
... ... class Vehicle(object):
113 120 self.wp += 1 self.wp += 1
114 121 print("W: " + str(self.wp) + " / " + str(len(tm.queues[self.trafficId]))) print("W: " + str(self.wp) + " / " + str(len(tm.queues[self.trafficId])))
115 122
116 #elif self.waiting: # Debug
117 # time.sleep(1)
118 # tm.lights[self.trafficId]["Status"] = 1 # Debug
123 elif self.waiting: # Debug
124 time.sleep(1)
125 tm.lights[self.trafficId]["Status"] = 1 # Debug
119 126
120 elif not self.waiting and self.wp < len(tm.waypoints[self.trafficId]):
121 self.goto(tm.waypoints[self.trafficId][self.wp][0], tm.waypoints[self.trafficId][self.wp][1])
127 elif not self.waiting and self.wp < len(tm.waypoints[self.trafficId][self.direction]):
128 self.goto(tm.waypoints[self.trafficId][self.direction][self.wp][0], tm.waypoints[self.trafficId][self.direction][self.wp][1])
122 129 self.wp += 1 self.wp += 1
123 print("NW: " + str(self.wp) + " / " + str(len(tm.waypoints[self.trafficId])))
130 print("NW: " + str(self.wp) + " / " + str(len(tm.waypoints[self.trafficId][self.direction])))
124 131
125 132 elif not self.waiting: # Check for transform elif not self.waiting: # Check for transform
126 133 if self.transform != 0: if self.transform != 0:
 
... ... class Vehicle(object):
129 136 self.waiting = True self.waiting = True
130 137
131 138 self.transform = self.checkForTransform() self.transform = self.checkForTransform()
132 connection.update(self.trafficId, 1, None)
139 # connection.update(self.trafficId, 1, self.direction)
133 140 else: else:
134 141 pass # Desctructor here? pass # Desctructor here?
135 142
 
... ... class Vehicle(object):
139 146 if tm.lights[self.trafficId]["Status"] != 0 and self.waiting and self.wp <= len(tm.queues[self.trafficId]): if tm.lights[self.trafficId]["Status"] != 0 and self.waiting and self.wp <= len(tm.queues[self.trafficId]):
140 147 self.waiting = False self.waiting = False
141 148 self.wp = 0 self.wp = 0
142 connection.update(self.trafficId, 0, None)
149 #connection.update(self.trafficId, -1, self.direction)
143 150 self.update() self.update()
144 151
145 152 clock = pygame.time.Clock() clock = pygame.time.Clock()
 
... ... def spawnVehicle(index):
173 180
174 181 # Mainloop # Mainloop
175 182 def gameloop(): def gameloop():
176 #id = 28
177 #car = Vehicle(tm.queues[id][0][0],tm.queues[id][0][1],id)
183 id = 10
184 car = Vehicle(tm.queues[id][0][0],tm.queues[id][0][1],id,4)
178 185
179 186 for i in range(0, len(tm.lights)): for i in range(0, len(tm.lights)):
180 187 lights.append(Light(i)) lights.append(Light(i))
 
... ... def gameloop():
190 197 vehicle.trafficCheck() vehicle.trafficCheck()
191 198 #for light in lights: #for light in lights:
192 199 # light.lightCheck() # light.lightCheck()
193 #car.trafficCheck()
200 car.trafficCheck()
194 201 pygame.display.flip() pygame.display.flip()
195 202
196 #gameloop()
203 gameloop()
File simulatie/traffic.py changed (mode: 100644) (index 9d8c434..8b0a0b6)
1 1 import sys import sys
2 2
3 3 import connection import connection
4 import trafficModel as tm
4 5
5 6 while True: while True:
7 print("Vehicle internal ID:")
6 8 vehicle = raw_input() vehicle = raw_input()
7 aantal = raw_input()
9 #print("Amount of vehicles:")
10 #aantal = raw_input()
11 print("Direction Reqeust:")
12 direction = raw_input()
8 13 #ui = list(ui) #ui = list(ui)
9 print([connection.lights[int(vehicle)], int(aantal), None])
10 connection.update(int(vehicle), int(aantal), None)
14 if direction == None:
15 print([connection.lights[int(vehicle)], connection.lights[1] + 1, None])
16 connection.update(int(vehicle), 1, None)
17 else:
18 print([connection.lights[int(vehicle)], connection.lights[1] + 1, int(direction)])
19 connection.update(int(vehicle), 1, int(direction))
11 20
12 21 sys.exit() sys.exit()
File simulatie/trafficModel.py changed (mode: 100644) (index d8bd5da..5ecebdf)
... ... queues = [
292 292 [ # 105 [ # 105
293 293 [850, 400], [650, 400] [850, 400], [650, 400]
294 294 ], ],
295 [ # 106A
295 [ # 106
296 296 [470, 850], [470, 690] [470, 850], [470, 690]
297 297 ], ],
298 298 [ # 107 [ # 107
299 299 [430, 850], [470, 690] [430, 850], [470, 690]
300 300 ], ],
301 [ #108
301 [ # 108
302 302 [-50, 450], [150, 450] [-50, 450], [150, 450]
303 303 ], ],
304 304 [ # 109 [ # 109
 
... ... queues = [
308 308 [-50, 350], [150, 350] [-50, 350], [150, 350]
309 309 ], ],
310 310 [ # 201 [ # 201
311 [0,0]
311 [850, 300], [650, 300]
312 312 ], ],
313 313 [ # 301 [ # 301
314 314 [250, -50], [250, 250] [250, -50], [250, 250]
 
... ... queues = [
371 371
372 372 waypoints = [ waypoints = [
373 373 [ # 101 [ # 101
374 [300, 280], [-50, 300]
374 [[300, 280], [-50, 300]]
375 375 ], ],
376 376 [ # 102 [ # 102
377 [350, 300], [310, 600], [310, 850]
377 [[350, 300], [310, 600], [310, 850]]
378 378 ], ],
379 379 [ # 103 [ # 103
380 [400, 350], [850, 450]
380 [[400, 350], [850, 450]]
381 381 ], ],
382 382 [ #104 [ #104
383 [500, 350], [490, -50]
383 [[500, 350], [490, -50]]
384 384 ], ],
385 385 [ #105 [ #105
386 [500, 400], [300, 300], [-50, 300]
386 [[500, 400], [300, 300], [-50, 300]]
387 387 ], ],
388 [ # 106A
389 [470, 500], [490, -50]
388 [ # 106
389 [[470, 500], [490, -50]]
390 390 ], ],
391 391 [ # 107 [ # 107
392 [420, 400], [300, 300], [-50, 300]
392 [[420, 400], [300, 300], [-50, 300]]
393 393 ], ],
394 394 [ # 108 [ # 108
395 [310, 450], [310, 850]
395 [[310, 450], [310, 850]]
396 396 ], ],
397 397 [ # 109 [ # 109
398 [310, 400], [500, 450], [850, 450]
398 [[310, 400], [500, 450], [850, 450]]
399 399 ], ],
400 400 [ # 110 [ # 110
401 [450, 350], [490, -50]
401 [[450, 350], [490, -50]]
402 402 ], ],
403 403 [ # 201 [ # 201
404 [0,0]
404 [[-50,300]], # Rechtdoor
405 [[500, 300], [490, -50]] # Rechts afslaan
405 406 ], ],
406 407 [ # 301 [ # 301
407 [250, 250], [250, 850]
408 [[250, 250], [250, 850]]
408 409 ], ],
409 410 [ # 302 [ # 302
410 [250, 250], [850, 250]
411 [[250, 250], [850, 250]]
411 412 ], ],
412 413 [ # 303 [ # 303
413 [-50, 250]
414 [[-50, 250]]
414 415 ], ],
415 416 [ # 304 [ # 304
416 [540, -50]
417 [[540, -50]]
417 418 ], ],
418 419 [ # 305 [ # 305
419 [250, -50]
420 [[250, -50]]
420 421 ], ],
421 422 [ # 401 [ # 401
422 [220, 325]
423 [[220, 325]]
423 424 ], ],
424 425 [ # 402 [ # 402
425 [470, 200]
426 [[470, 200]]
426 427 ], ],
427 428 [ # 403 [ # 403
428 [460, 200]
429 [[460, 200]]
429 430 ], ],
430 431 [ # 404 [ # 404
431 [570, 420]
432 [[570, 420]]
432 433 ], ],
433 434 [ # 405 [ # 405
434 [570, 410]
435 [[570, 410]]
435 436 ], ],
436 437 [ # 406 [ # 406
437 [220, 500], [220, 325]
438 [[220, 500], [220, 325]]
438 439 ], ],
439 440 [ # 407 [ # 407
440 [-50, 200]
441 [[-50, 200]]
441 442 ], ],
442 443 [ # 408 [ # 408
443 [850, 200]
444 [[850, 200]]
444 445 ], ],
445 446 [ # 409 [ # 409
446 [570, -50]
447 [[570, -50]]
447 448 ], ],
448 449 [ # 410 [ # 410
449 [570, 850]
450 [[570, 850]]
450 451 ], ],
451 452 [ # 411 [ # 411
452 [220, 850]
453 [[220, 850]]
453 454 ], ],
454 455 [ # 412 [ # 412
455 [220, -50]
456 [[220, -50]]
456 457 ], ],
457 458 [ # 501 [ # 501
458 [850, 650]
459 [[850, 650]]
459 460 ] ]
460 461 ] ]
461 462
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/kapstok/NHL-SoftDev

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/kapstok/NHL-SoftDev

Clone this repository using git:
git clone git://git.rocketgit.com/user/kapstok/NHL-SoftDev

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main