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)
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
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
Commit 49fda0804f0e056fe6a060ff13bd1c10408f696e - Cars send signal once they're waiting, not before they're waiting.
Author: Jan Allersma
Author date (UTC): 2018-01-08 15:57
Committer name: Jan Allersma
Committer date (UTC): 2018-01-08 15:57
Parent(s): 8ad5b23b821e160483b919f0f375313ec6dc79be
Signer:
Signing key:
Signing status: N
Tree: 775df9c60205fc22f28ef6d1c514628947421446
File Lines added Lines deleted
simulatie/connection.py 1 5
simulatie/model.py 2 2
simulatie/pyg.py 8 6
simulatie/test/connection.py 2 2
simulatie/traffic.py 8 3
File simulatie/connection.py changed (mode: 100644) (index e28c850..d40085a)
... ... RecieveConnection = pika.BlockingConnection(pika.ConnectionParameters(host=model
49 49 channel = SendConnection.channel() channel = SendConnection.channel()
50 50 recieve = RecieveConnection.channel() recieve = RecieveConnection.channel()
51 51
52 inputEnabled = True
52 inputEnabled = True # Still being used?
53 53
54 54 recieve.queue_declare( recieve.queue_declare(
55 55 queue=model.recieveQueue, queue=model.recieveQueue,
 
... ... def sendMsg(msg, index, amount, dirRequests):
79 79
80 80 print('Msg sent. (' + msg + ')') print('Msg sent. (' + msg + ')')
81 81
82 for i in range(0, amount):
83 pyg.spawnVehicle(index, dirRequests)
84 time.sleep(2)
85
86 82 def update(index, addCars, dirRequests): def update(index, addCars, dirRequests):
87 83 if inputEnabled: if inputEnabled:
88 84 lights[index][1] += addCars lights[index][1] += addCars
File simulatie/model.py changed (mode: 100644) (index 29c827b..58417b9)
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 = '/5'
5 host = '141.252.237.44'
4 vhost = '/11'
5 host = '127.0.0.1'
6 6
7 7 recieveQueue = 'simulator' recieveQueue = 'simulator'
8 8 sendQueue = 'controller' sendQueue = 'controller'
File simulatie/pyg.py changed (mode: 100644) (index c7027e3..f1fb4e2)
... ... class Vehicle(object):
79 79 self.dest = [x,y] self.dest = [x,y]
80 80 self.speed = [0,0] self.speed = [0,0]
81 81 self.trafficId = trafficId self.trafficId = trafficId
82 self.dirRequest = dirRequest
82 83
83 84 self.wp = 1 self.wp = 1
84 85 self.waiting = True self.waiting = True
85 86 self.transform = 0 self.transform = 0
87 self.firedUpdate = False
86 88
87 89 self.rect.x = tm.queues[trafficId][0][0] self.rect.x = tm.queues[trafficId][0][0]
88 90 self.rect.y = tm.queues[trafficId][0][1] self.rect.y = tm.queues[trafficId][0][1]
 
... ... class Vehicle(object):
125 127
126 128 def anim(self): def anim(self):
127 129 if self.speed[0] == 0 and self.speed[1] == 0: if self.speed[0] == 0 and self.speed[1] == 0:
128 if self.waiting and self.wp < len(tm.queues[self.trafficId]):
130 if self.waiting and self.wp < len(tm.queues[self.trafficId]): # Is nog naar het stoplicht aan het rijden..
129 131 if self.wp + 1 == len(tm.queues[self.wp]): if self.wp + 1 == len(tm.queues[self.wp]):
130 132 if self.trafficId == 3 or self.trafficId == 4 or self.trafficId == 10: if self.trafficId == 3 or self.trafficId == 4 or self.trafficId == 10:
131 133 self.goto(tm.queues[self.trafficId][self.wp][0] + (connection.lights[self.trafficId][1] * 40), tm.queues[self.trafficId][self.wp][1]) self.goto(tm.queues[self.trafficId][self.wp][0] + (connection.lights[self.trafficId][1] * 40), tm.queues[self.trafficId][self.wp][1])
 
... ... class Vehicle(object):
136 138 elif self.trafficId == 5 or self.trafficId == 6: elif self.trafficId == 5 or self.trafficId == 6:
137 139 self.goto(tm.queues[self.trafficId][self.wp][0], tm.queues[self.trafficId][self.wp][1] + (connection.lights[self.trafficId][1] * 40)) self.goto(tm.queues[self.trafficId][self.wp][0], tm.queues[self.trafficId][self.wp][1] + (connection.lights[self.trafficId][1] * 40))
138 140 else: else:
139 print("Not a car.")
141 print("Not a car.")
140 142 else: else:
141 143 self.goto(tm.queues[self.trafficId][self.wp][0], tm.queues[self.trafficId][self.wp][1]) self.goto(tm.queues[self.trafficId][self.wp][0], tm.queues[self.trafficId][self.wp][1])
142 144
143 145 self.wp += 1 self.wp += 1
144 146 print("W: " + str(self.wp) + " / " + str(len(tm.queues[self.trafficId]))) print("W: " + str(self.wp) + " / " + str(len(tm.queues[self.trafficId])))
145 147
146 #elif self.waiting: # Debug
147 #time.sleep(1)
148 # tm.lights[self.trafficId]["Status"] = 1 # Debug
148 elif self.waiting and not self.firedUpdate: # Wacht voor het stoplicht.
149 connection.update(self.trafficId, 1, self.dirRequest)
150 self.firedUpdate = True
149 151
150 elif not self.waiting and self.wp < len(tm.waypoints[self.trafficId][self.direction]):
152 elif not self.waiting and self.wp < len(tm.waypoints[self.trafficId][self.direction]): # Al voorbij het stoplicht en nog aan het rijden.
151 153 self.goto(tm.waypoints[self.trafficId][self.direction][self.wp][0], tm.waypoints[self.trafficId][self.direction][self.wp][1]) self.goto(tm.waypoints[self.trafficId][self.direction][self.wp][0], tm.waypoints[self.trafficId][self.direction][self.wp][1])
152 154 self.wp += 1 self.wp += 1
153 155 print("NW: " + str(self.wp) + " / " + str(len(tm.waypoints[self.trafficId][self.direction]))) print("NW: " + str(self.wp) + " / " + str(len(tm.waypoints[self.trafficId][self.direction])))
File simulatie/test/connection.py changed (mode: 100644) (index 6a08a9e..5646262)
... ... def callback(ch, method, prop, body):
113 113 }, },
114 114 { {
115 115 "Id": 403, "Id": 403,
116 "Status": 0,
116 "Status": 1,
117 117 "Time": -1 "Time": -1
118 118 }, },
119 119 { {
 
... ... def callback(ch, method, prop, body):
133 133 }, },
134 134 { {
135 135 "Id": 407, "Id": 407,
136 "Status": 0,
136 "Status": 2,
137 137 "Time": -1 "Time": -1
138 138 }, },
139 139 { {
File simulatie/traffic.py changed (mode: 100644) (index db87130..9102094)
... ... import sys
2 2
3 3 import connection import connection
4 4 import trafficModel as tm import trafficModel as tm
5 import pyg
6
7 def spawnVehicle(index, amount, dirRequests):
8 for i in range(0, amount):
9 pyg.spawnVehicle(index, dirRequests)
5 10
6 11 while True: while True:
7 12 print("Vehicle internal ID:") print("Vehicle internal ID:")
 
... ... while True:
13 18 #ui = list(ui) #ui = list(ui)
14 19 if direction == None or direction == "": if direction == None or direction == "":
15 20 #print([connection.lights[int(vehicle)], connection.lights[1] + 1, 2]) #print([connection.lights[int(vehicle)], connection.lights[1] + 1, 2])
16 connection.update(int(vehicle), 1, None)
21 spawnVehicle(int(vehicle), 1, None)
17 22 else: else:
18 23 #print([connection.lights[int(vehicle)], connection.lights[1] + 1, int(direction)]) #print([connection.lights[int(vehicle)], connection.lights[1] + 1, int(direction)])
19 connection.update(int(vehicle), 1, [int(direction)])
24 spawnVehicle(int(vehicle), 1, [int(direction)])
20 25
21 sys.exit()
26 sys.exit()
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