Axel HUYNH-PHUC
							
						 
					 | 
					
						
						
							
						
						b012c4c4a8
					 | 
					
						
						
							
							Merge pull request #4 from Ahp06/Axel
						
						
						
						
						
						
						
						Axel 
						
						
					 | 
					
						2018-12-07 22:18:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						20a1c11628
					 | 
					
						
						
							
							Put logger into config.py
						
						
						
						
						
						
					 | 
					
						2018-12-07 17:40:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						e25a952500
					 | 
					
						
						
							
							Added reverse_actions method
						
						
						
						
						
						
					 | 
					
						2018-12-07 17:16:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						c07748f340
					 | 
					
						
						
							
							Added info logs
						
						
						
						
						
						
					 | 
					
						2018-12-07 16:46:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						342320bd4a
					 | 
					
						
						
							
							Added a logs file output
						
						
						
						
						
						
					 | 
					
						2018-12-07 16:30:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						70b29c47b2
					 | 
					
						
						
							
							Changed config and added lock area mode
						
						
						
						
						
						
					 | 
					
						2018-12-06 21:49:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						30cd4eb72e
					 | 
					
						
						
							
							Added 'remove vehicles from simulation' into actions
						
						
						
						
						
						
					 | 
					
						2018-12-03 21:46:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						e249fbe30c
					 | 
					
						
						
							
							Changed configuration file
						
						
						
						
						
						
					 | 
					
						2018-12-03 21:17:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						07155c639f
					 | 
					
						
						
							
							Fixed tls duration mode
						
						
						
						
						
						
					 | 
					
						2018-12-03 21:05:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						27ecd5c780
					 | 
					
						
						
							
							Added logic program list into trafic lights
						
						
						
						
						
						
					 | 
					
						2018-11-29 17:00:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						635004bcb9
					 | 
					
						
						
							
							Added logic program list into trafic lights
						
						
						
						
						
						
					 | 
					
						2018-11-29 11:48:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						9a964c97e9
					 | 
					
						
						
							
							Added initial max speed information into Lane class
						
						
						
						
						
						
					 | 
					
						2018-11-23 19:40:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						0df0897c72
					 | 
					
						
						
							
							Added TrafficLight model and actions on traffic lights
						
						
						
						
						
						
					 | 
					
						2018-11-23 14:40:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						7972f4d794
					 | 
					
						
						
							
							Changed code structure
						
						
						
						
						
						
					 | 
					
						2018-11-23 13:53:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c681652ec
					 | 
					
						
						
							
							Reformat code (#3)
						
						
						
						
						
						
						
						* Reformat code
* Replace global variable areas with local one 
						
						
					 | 
					
						2018-11-23 12:40:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Axel HUYNH-PHUC
							
						 
					 | 
					
						
						
							
						
						f603a51bb3
					 | 
					
						
						
							
							Merge pull request #2 from Ahp06/Axel
						
						
						
						
						
						
						
						Axel 
						
						
					 | 
					
						2018-11-20 16:21:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						f092e6af8d
					 | 
					
						
						
							
							Changed some config parameters
						
						
						
						
						
						
					 | 
					
						2018-11-20 14:54:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						4c0ffc3778
					 | 
					
						
						
							
							Changed vehicle class
						
						
						
						
						
						
					 | 
					
						2018-11-20 13:52:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						77d196d6c3
					 | 
					
						
						
							
							Fixed a bug about grid initialization
						
						
						
						
						
						
					 | 
					
						2018-11-19 16:28:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e058f06928
					 | 
					
						
						
							
							Improve speed of the actions
						
						
						
						
						
						
					 | 
					
						2018-11-16 16:41:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1cf12fec81
					 | 
					
						
						
							
							Rename SUMOFactory.py to actions.py
						
						
						
						
						
						
					 | 
					
						2018-11-16 16:41:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b33d3b750a
					 | 
					
						
						
							
							Delete SUMOFactory class
						
						
						
						
						
						
					 | 
					
						2018-11-16 16:41:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9600dee7e5
					 | 
					
						
						
							
							Chache vehicle information locally at each step
						
						
						
						
						
						
					 | 
					
						2018-11-16 16:40:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09841d4cfb
					 | 
					
						
						
							
							Merge branch 'model' into optimisation
						
						
						
						
						
						
					 | 
					
						2018-11-16 16:40:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						779539ee69
					 | 
					
						
						
							
							Use __contains__ method to check vehicules in area
						
						
						
						
						
						
					 | 
					
						2018-11-16 16:40:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8d51343e0c
					 | 
					
						
						
							
							Rename area.py to model.py
						
						
						
						
						
						
					 | 
					
						2018-11-16 16:40:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						938e64b1f4
					 | 
					
						
						
							
							Fix lock_area with correct speed value (9 m/s)
						
						
						
						
						
						
					 | 
					
						2018-11-16 16:39:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						89ffc95426
					 | 
					
						
						
							
							Merge branch 'master' into dev
						
						
						
						
						
						
					 | 
					
						2018-11-16 16:36:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0d4961bd09
					 | 
					
						
						
							
							Fix sumo config name
						
						
						
						
						
						
					 | 
					
						2018-11-14 15:02:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						429ab253f0
					 | 
					
						
						
							
							Merge branch 'global-configuration' into dev
						
						
						
						
						
						
					 | 
					
						2018-11-14 14:57:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7cbc1d85a0
					 | 
					
						
						
							
							Externalize configuration in config.py
						
						
						
						
						
						
					 | 
					
						2018-11-14 14:56:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6c36eafe09
					 | 
					
						
						
							
							Update existing code to use the new area data model
						
						
						
						
						
						
					 | 
					
						2018-11-14 14:40:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a79858d04
					 | 
					
						
						
							
							Add area data model
						
						
						
						
						
						
					 | 
					
						2018-11-14 14:40:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						572812c5fe
					 | 
					
						
						
							
							Add sumo factory to interact with the simulation
						
						
						
						
						
						
					 | 
					
						2018-11-07 11:23:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d8982b8c3b
					 | 
					
						
						
							
							Merge pull request #1 from Ahp06/dev
						
						
						
						
						
						
						
						Change absolute to relative path using SUMO_HOME 
						
						
					 | 
					
						2018-10-19 08:43:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2811ad7c22
					 | 
					
						
						
							
							Change absolute to relative path using SUMO_HOME
						
						
						
						
						
						
					 | 
					
						2018-10-19 08:40:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						3db7647d0b
					 | 
					
						
						
							
							Add Emissions getter and simulation example
						
						
						
						
						
						
					 | 
					
						2018-10-12 14:17:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ahp06
							
						 
					 | 
					
						
						
							
						
						c6170192d2
					 | 
					
						
						
							
							Init git
						
						
						
						
						
						
					 | 
					
						2018-10-12 14:00:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |