add: colour attribute for speed cameras, remove: unneccessary timeste…

…ps attributes for emission detection and stress detection, docs: updated all files to reflect changes in attributes

docs/emission_junction.py

@@ -2,7 +2,6 @@
 
 # Initialiasing the object
 ej = trafficinterventions.EmissionJunction.EmissionJunction(
-    maxTimeSteps=1000, # Number of time steps, could be overridden by the system
     pathCFG="map.sumocfg", # .sumocfg file path
     outPath="Outputs/", # Output path for screenshots
     pathNET="osm.net.xml", # .net.xml file path

docs/speed_camera.py

@@ -8,7 +8,8 @@
     pathCFG="map.sumocfg", # Input file path
     outPath="Outputs/", # Output file path (for screenshots)
     summaryFilePath="summary.txt", # File which contains the appropriate positions - populated after the simulation
-    numLocs=5 # Number of locations you wish to retrieve
+    numLocs=5, # Number of locations you wish to retrieve
+    colour=(255,0,0) # Colour of the speed camera points
 )
 
 # Run the simulation and get outputs

docs/stress_junction.py

@@ -2,7 +2,6 @@
 
 # Initialiasing the object
 sj = trafficinterventions.StressJunction.StressJunction(
-        maxTimeSteps=1000, # Number of time steps, could be overridden by the system
         weightsArray=[1,1,1,1,1], # Weights for the parameters - in the order of [haltingNumber, CO2Emissions, StepOccupancy, vehicleLength, waitingTime]
         pathCFG="map.sumocfg", # .sumocfg file path
         outPath="Outputs/", # Output path for screenshots

src/trafficinterventions/EmissionJunction.py

@@ -13,7 +13,7 @@ class EmissionJunction:
     """
         @Method: Initialising variables and config
     """
-    def __init__(self, maxTimeSteps, pathCFG, outPath, pathNET, pathSummaryFile, numLocs, initialPoiLocation = (5064.74,3568.48)):
+    def __init__(self, pathCFG, outPath, pathNET, pathSummaryFile, numLocs, initialPoiLocation = (5064.74,3568.48)):
 
         # Check for Bash Shortcut
         if "SUMO_HOME" in os.environ:
@@ -25,7 +25,6 @@ def __init__(self, maxTimeSteps, pathCFG, outPath, pathNET, pathSummaryFile, num
             sys.exit("Please populate $SUMO_HOME in your .bashrc file.") 
 
         # Assign all variables
-        self.maxTimeSteps = maxTimeSteps
         self.pathCFG = pathCFG 
         self.outPath = outPath 
         self.pathNET = pathNET

src/trafficinterventions/SpeedCamera.py

@@ -117,7 +117,7 @@ class SpeedCamera:
     """
         @Method: Initialing variables and config
     """
-    def __init__(self, maxTimeSteps, nearestNeighbourDisallow, gridArray, pathCFG, outPath, summaryFilePath, numLocs):
+    def __init__(self, maxTimeSteps, nearestNeighbourDisallow, gridArray, pathCFG, outPath, summaryFilePath, numLocs, colour):
 
         # Check for Bash Shortcut
         if "SUMO_HOME" in os.environ:
@@ -139,6 +139,7 @@ def __init__(self, maxTimeSteps, nearestNeighbourDisallow, gridArray, pathCFG, o
         self.outPath = outPath
         self.summaryFilePath = summaryFilePath
         self.numLocs = numLocs
+        self.colour = colour 
 
         # Option Parser
         optParser = optparse.OptionParser()
@@ -217,7 +218,7 @@ def loop(self):
                             except Exception as e:
                                 print(e)
                     self.previousPOI = []
-                    traci.poi.add(poiID=nid, x = positionsList[i][0], y = positionsList[i][1], layer = 202.0, color = (255,0,0))
+                    traci.poi.add(poiID=nid, x = positionsList[i][0], y = positionsList[i][1], layer = 202.0, color = self.colour)
                     traci.gui.toggleSelection(nid, objType='poi')
                     self.previousPOI.append(nid)
 

src/trafficinterventions/StressJunction.py

@@ -68,7 +68,7 @@ class StressJunction:
     """
         @Method: Initialising variables and config
     """ 
-    def __init__(self, maxTimeSteps, weightsArray, pathCFG, outPath, pathNET, pathSummaryFile, numLocs, initialPoiLocation = (5064.74,3568.48)):
+    def __init__(self,  weightsArray, pathCFG, outPath, pathNET, pathSummaryFile, numLocs, initialPoiLocation = (5064.74,3568.48)):
 
         # Check for Bash Shortcut
         if "SUMO_HOME" in os.environ:
@@ -80,7 +80,6 @@ def __init__(self, maxTimeSteps, weightsArray, pathCFG, outPath, pathNET, pathSu
             sys.exit("Please populate $SUMO_HOME in your .bashrc file.") 
 
         # Assign all variables
-        self.maxTimeSteps = maxTimeSteps    
         self.weightsArray = weightsArray
         self.pathCFG = pathCFG
         self.outPath = outPath