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)
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
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
Commit 8ad5b23b821e160483b919f0f375313ec6dc79be - Assessment
Author: Jan Allersma
Author date (UTC): 2017-12-20 11:37
Committer name: Jan Allersma
Committer date (UTC): 2017-12-20 11:37
Parent(s): 7f12d9c9d44a2fa556d15e075723ec9c11c8b468
Signer:
Signing key:
Signing status: N
Tree: 85bfb2a7d219626c111d9f24905f31a0baa3d992
File Lines added Lines deleted
simulatie/model.py 2 2
simulatie/pyg.py 14 1
File simulatie/model.py changed (mode: 100644) (index 58417b9..29c827b)
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 = '/5'
5 host = '141.252.237.44'
6 6
7 7 recieveQueue = 'simulator' recieveQueue = 'simulator'
8 8 sendQueue = 'controller' sendQueue = 'controller'
File simulatie/pyg.py changed (mode: 100644) (index 244cdc7..c7027e3)
... ... class Vehicle(object):
126 126 def anim(self): def anim(self):
127 127 if self.speed[0] == 0 and self.speed[1] == 0: if self.speed[0] == 0 and self.speed[1] == 0:
128 128 if self.waiting and self.wp < len(tm.queues[self.trafficId]): if self.waiting and self.wp < len(tm.queues[self.trafficId]):
129 self.goto(tm.queues[self.trafficId][self.wp][0], tm.queues[self.trafficId][self.wp][1])
129 if self.wp + 1 == len(tm.queues[self.wp]):
130 if self.trafficId == 3 or self.trafficId == 4 or self.trafficId == 10:
131 self.goto(tm.queues[self.trafficId][self.wp][0] + (connection.lights[self.trafficId][1] * 40), tm.queues[self.trafficId][self.wp][1])
132 elif self.trafficId == 7 or self.trafficId == 8 or self.trafficId == 9:
133 self.goto(tm.queues[self.trafficId][self.wp][0] - (connection.lights[self.trafficId][1] * 40), tm.queues[self.trafficId][self.wp][1])
134 elif self.trafficId == 0 or self.trafficId == 1 or self.trafficId == 2:
135 self.goto(tm.queues[self.trafficId][self.wp][0], tm.queues[self.trafficId][self.wp][1] - (connection.lights[self.trafficId][1] * 40))
136 elif self.trafficId == 5 or self.trafficId == 6:
137 self.goto(tm.queues[self.trafficId][self.wp][0], tm.queues[self.trafficId][self.wp][1] + (connection.lights[self.trafficId][1] * 40))
138 else:
139 print("Not a car.")
140 else:
141 self.goto(tm.queues[self.trafficId][self.wp][0], tm.queues[self.trafficId][self.wp][1])
142
130 143 self.wp += 1 self.wp += 1
131 144 print("W: " + str(self.wp) + " / " + str(len(tm.queues[self.trafficId]))) print("W: " + str(self.wp) + " / " + str(len(tm.queues[self.trafficId])))
132 145
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