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)
Work done during lecture. 7a0518a31a21e7ee0be11bc0966647acae129a94 Jan Allersma 2018-01-10 12:40:34
Traffic queues now implemented on all traffic. bcf0ece12b63e87894a2f9d1138145353054fbab Jan Allersma 2018-01-08 21:37:25
Pedestrian don't think they're cars anymore! Also small code cleanup. 7c6e2978497442330d56fd334cf8b33e73c7525a Jan Allersma 2018-01-08 20:53:51
Cars send signal once they're waiting, not before they're waiting. 49fda0804f0e056fe6a060ff13bd1c10408f696e Jan Allersma 2018-01-08 15:57:41
Assessment 8ad5b23b821e160483b919f0f375313ec6dc79be Jan Allersma 2017-12-20 11:37:13
TrafficLights working..? 7f12d9c9d44a2fa556d15e075723ec9c11c8b468 Jan Allersma 2017-12-19 15:22:32
Add lights and fully working train. ee0e851a1b482f162918f8723fc0c62d257aff83 Jan Allersma 2017-12-18 16:59:33
Commit after fixing issues during lecture 93b7f5e88a7a4427867054ebabe0505963b14da0 Jan Allersma 2017-12-13 12:49:55
Some more fixes :D 09f121a8de8ef6f49abbf0a52b0e9d9c033ade58 Jan Allersma 2017-12-09 15:09:38
Also added additional waypoints for 106. 1567c42fbaa689848d2ca2620e37bb83bb30eaf4 Jan Allersma 2017-12-07 13:40:56
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
Commit 7a0518a31a21e7ee0be11bc0966647acae129a94 - Work done during lecture.
Author: Jan Allersma
Author date (UTC): 2018-01-10 12:40
Committer name: Jan Allersma
Committer date (UTC): 2018-01-10 12:40
Parent(s): bcf0ece12b63e87894a2f9d1138145353054fbab
Signing key:
Tree: 70802af7fbfc62fc8e546f4534b30fb042a17175
File Lines added Lines deleted
TestResultsSimulator.txt 5 6
simulatie/model.py 2 2
simulatie/pyg.py 3 3
simulatie/trafficModel.py 1 1
File TestResultsSimulator.txt changed (mode: 100644) (index 27de9bb..ecdba74)
1 Voetgangers extra out of the blue. als ze op een vluchtheuvel moeten w8en.. Maybe DONE?
2 Alle voetgangers freezen als eentje staat te w8en.
3 201 nog implemtenteren.. DONE!
4 treinen nog implementeren.. Maybe DONE?
5 De simulator queue'd zelf.. Is dat zo?
6 Als alles klaar is, stuur ie nul ipv count - 1.. DONE!
1 Verkeer doet raar bij spam..
2
3 treinen nog implementeren..
4
5 Controller gaat zich ook als simulator gedragen.
File simulatie/model.py changed (mode: 100644) (index 58417b9..c8a7567)
1 1 # Jan Allersma: groep 8. Maakt simulator. # Jan Allersma: groep 8. Maakt simulator.
2 2 uname = 'softdev' uname = 'softdev'
3 3 passwd = 'softdev' passwd = 'softdev'
4 vhost = '/11'
5 host = '127.0.0.1'
4 vhost = '/8'
5 host = '141.252.237.84'
6 6
7 7 recieveQueue = 'simulator' recieveQueue = 'simulator'
8 8 sendQueue = 'controller' sendQueue = 'controller'
File simulatie/pyg.py changed (mode: 100644) (index 180cc84..a8470af)
... ... class Vehicle(object):
66 66 else: # zijn slagbomen else: # zijn slagbomen
67 67 pass pass
68 68
69 if dirRequest == None or dirRequest == 2:
69 if dirRequest == None or dirRequest == [2]:
70 70 self.direction = 0 self.direction = 0
71 elif dirRequest == 4:
71 elif dirRequest == [4]:
72 72 self.direction = 1 self.direction = 1
73 73 else: else:
74 print("ERROR: DIRECTION REQUEST NOT FOUND!")
74 print("ERROR: DIRECTION REQUEST " + str(dirRequest) + " NOT FOUND!")
75 75 self.direction = 0 self.direction = 0
76 76
77 77 self.rect = self.auto.get_rect() self.rect = self.auto.get_rect()
File simulatie/trafficModel.py changed (mode: 100644) (index 79ad33b..f13c902)
... ... queues = [
296 296 [470, 850], [470, 690] [470, 850], [470, 690]
297 297 ], ],
298 298 [ # 107 [ # 107
299 [430, 850], [470, 690]
299 [430, 850], [430, 690]
300 300 ], ],
301 301 [ # 108 [ # 108
302 302 [-50, 450], [150, 450] [-50, 450], [150, 450]
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