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)
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
Code for testing 16/10/17. Use simulatie/rabbit/combination.py mainly. c5e87d7fe5abbcd3316b1538a0d647fd23faa59f Jan Allersma 2017-10-15 19:13:23
Added more paths. Some of them are WIP. 03ad1039e22bd1ebd301bda99e78f38239a15077 Jan Allersma 2017-09-21 14:40:44
Added paths... 5561d21918f048a40ca9686112638a48805917e3 Jan Allersma 2017-09-21 13:06:43
Added first paths of crossroad. Also added reference of crossroad. 43a5ddf291e38b47bad02a92af58839d86f9d449 Jan Allersma 2017-09-21 12:21:53
Added first paths of crossroad. Also added reference of crossroad. bb687a8152231d0c89fed827baefcfbf067be90c Jan Allersma 2017-09-21 12:21:11
Fixed typo. db82c84f8d834e62cb37333ff973ddc54af5372f Jan Allersma 2017-09-20 20:51:15
RabbitMQ test.First attempt. 876d29c668f5e027a820f3ff48a6ca080fc530c2 Jan Allersma 2017-09-19 13:47:31
Initial commit 6a565c61a3337232d0e7a136ffb2f49b431c2a40 Jan Allersma 2017-09-11 06:52:38
Commit cdd1c17cfe8cc73985945aad5878e4891e92eab1 - User input for sending msg.
Author: Jan Allersma
Author date (UTC): 2017-11-14 23:05
Committer name: Jan Allersma
Committer date (UTC): 2017-11-14 23:05
Parent(s): f37cf730ff7a0ad2e08cd769da5f488051ac6dd4
Signer:
Signing key:
Signing status: N
Tree: 1a92481a98131b1b4b0541bd385be7b9a694d785
File Lines added Lines deleted
simulatie/kruispunt.png 0 0
simulatie/model.py 2 2
simulatie/pyg.py 22 31
simulatie/traffic.py 29 2
File simulatie/kruispunt.png added (mode: 100644) (index 0000000..7da3d6b)
File simulatie/model.py changed (mode: 100644) (index 23f3004..2055742)
... ... passwd = 'softdev'
4 4 vhost = '/11' vhost = '/11'
5 5 host = '127.0.0.1'#'141.252.237.17' host = '127.0.0.1'#'141.252.237.17'
6 6
7 recieveQueue = 'controller'
8 sendQueue = 'simulator'
7 recieveQueue = 'simulator'
8 sendQueue = 'controller'
File simulatie/pyg.py changed (mode: 100644) (index d490572..eb29611)
... ... pygame.init()
7 7
8 8 screen = pygame.display.set_mode((800,600)) screen = pygame.display.set_mode((800,600))
9 9 screen.fill((255,255,255)) screen.fill((255,255,255))
10 speed= [1,1]
10 bg = pygame.transform.scale(pygame.image.load("kruispunt.png"), (800,600))
11 11
12 12 class Auto(object): class Auto(object):
13 13 def __init__(self, x, y): def __init__(self, x, y):
14 self.auto = pygame.image.load("auto.png")
15 self.auto = pygame.transform.scale(self.auto, (64,64))
14 self.auto = pygame.transform.scale(pygame.image.load("auto.png"), (64,64))
16 15 self.rect = self.auto.get_rect() self.rect = self.auto.get_rect()
17 self.x = x
18 self.y = y
19 16 self.dest = [x,y] self.dest = [x,y]
20
21 def _move_callb(self):
22 origin = [self.x, self.y]
23 print(str(origin) + " -> " + str(self.dest) + "\n")
24 if origin[0] > self.dest[0]:
25 self.rect.move([-1,0])
26 elif origin[0] < self.dest[0]:
27 self.rect.move([1,0])
28 #screen.blit(self.auto, self.rect)
29 print("origin(" + str(origin) + ") > dest(" + str(self.dest) + ")\n")
30 if origin[1] > self.dest[1]:
31 self.rect.move([0,-1])
32 elif origin[1] < self.dest[1]:
33 self.rect.move([0,1])
34 #screen.blit(self.auto, self.rect)
35 print("origin(" + str(origin) + ") < dest(" + str(self.dest) + ")\n")
36 #screen.blit(self.auto, self.rect)
17 self.speed = [0,0]
18
19 def update(self):
20 self.rect = self.rect.move(self.speed)
21 if self.dest[0] == self.rect.center[0] or self.dest[0] == self.rect.center[0]+1 or self.dest[0] == self.rect.center[0]-1:
22 self.speed[0] = 0
23 elif self.dest[0] > self.rect.center[0]:
24 self.speed[0] = 1
25 elif self.dest[0] < self.rect.center[0]:
26 self.speed[0] = -1
27 if self.dest[1] == self.rect.center[1] or self.dest[1] == self.rect.center[1]-1 or self.dest[1] == self.rect.center[1]+1:
28 self.speed[1] = 0
29 elif self.dest[1] > self.rect.center[1]:
30 self.speed[1] = 1
31 elif self.dest[1] < self.rect.center[1]:
32 self.speed[1] = -1
37 33
38 34 def goto(self, x, y): def goto(self, x, y):
39 35 self.dest = [x,y] self.dest = [x,y]
40
36 self.speed = [1,1]
41 37
42 38 car = Auto(50,50) car = Auto(50,50)
43 #car.goto(1000, 1500)
44 39 clock = pygame.time.Clock() clock = pygame.time.Clock()
40 car.goto(200,500)
45 41
46 42 # Mainloop # Mainloop
47 43 while True: while True:
 
... ... while True:
49 45 for event in pygame.event.get(): for event in pygame.event.get():
50 46 if event.type == pygame.QUIT: sys.exit() if event.type == pygame.QUIT: sys.exit()
51 47
52 car.rect = car.rect.move(speed)
53 if car.rect.left < 0 or car.rect.right > 800:
54 speed[0] = -speed[0]
55 if car.rect.top < 0 or car.rect.bottom > 600:
56 speed[1] = -speed[1]
57
58 # car._move_callb()
59 48 screen.fill((255,255,255)) screen.fill((255,255,255))
49 screen.blit(bg, bg.get_rect())
50 car.update()
60 51 screen.blit(car.auto, car.rect) screen.blit(car.auto, car.rect)
61 52 pygame.display.flip() pygame.display.flip()
File simulatie/traffic.py changed (mode: 100644) (index d38dd2e..6baa330)
... ... import connection
7 7 # lights = [[id, amountOfCars, DirRequests]] # lights = [[id, amountOfCars, DirRequests]]
8 8 lights = [ lights = [
9 9 [101, 0, None], [101, 0, None],
10 [102, 0, None]
10 [102, 0, None],
11 [103, 0, None],
12 [104, 0, None],
13 [105, 0, None],
14 [106, 0, None],
15 [107, 0, None],
16 [108, 0, None],
17 [109, 0, None],
18 [110, 0, None],
19 [201, 0, None],
20 [301, 0, None],
21 [302, 0, None],
22 [303, 0, None],
23 [304, 0, None],
24 [305, 0, None],
25 [401, 0, None],
26 [402, 0, None],
27 [403, 0, None],
28 [404, 0, None],
29 [405, 0, None],
30 [406, 0, None],
31 [501, 0, None],
32 [601, 0, None]
11 33 ] ]
12 34
13 35 msg = '' msg = ''
 
... ... update(0, 1, None)
30 52 time.sleep(5) time.sleep(5)
31 53 update(1, 2, None) update(1, 2, None)
32 54
33 raw_input()
55 while True:
56 ui = raw_input()
57 ui = list(ui)
58 print([lights[int(ui[0])], int(ui[1]), None])
59 update(int(ui[0]), int(ui[1]), None)
60
34 61 sys.exit() 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