Allow Docker init overwrite / renaming variables

Author: Starofall

Dockerfile

@@ -20,4 +20,4 @@ RUN python /app/setup.py install
 # Add sources
 ADD ./ /app/
 WORKDIR /app
-ENTRYPOINT ["python","/app/forever.py"]
+CMD ["python","/app/forever.py"]

app/routing/CustomRouter.py

@@ -14,8 +14,8 @@ class CustomRouter(object):
     edgeMap = None
     graph = None
 
-    # the percentage of smart cars that should be victimized
-    victimsPercentage = 0.0
+    # the percentage of smart cars that should be used for exploration
+    explorationPercentage = 0.0
     # randomizes the routes
     routeRandomSigma = 0.3
     # how much speed influences the routing
@@ -38,7 +38,6 @@ def init(self):
                                 {'length': edge.length, 'maxSpeed': edge.maxSpeed,
                                  'lanes': len(edge.lanes), 'edgeID': edge.id})
 
-
     @classmethod
     def minimalRoute(cls, fr, to, tick, car):
         """creates a minimal route based on length / speed  """
@@ -68,7 +67,7 @@ def route(cls, fr, to, tick, car):
         # else:
         # 3) Advanced cost function that combines duration with averaging
         # isVictim = ??? random x percent (how many % routes have been victomized before)
-        isVictim = cls.victimsPercentage > random()
+        isVictim = cls.explorationPercentage > random()
         if isVictim:
             victimizationChoice = 1
         else:
@@ -87,7 +86,7 @@ def route(cls, fr, to, tick, car):
             cls.freshnessUpdateFactor * \
             victimizationChoice
 
-    # generate route
+        # generate route
         route = find_path(cls.graph, fr, to, cost_func=cost_func)
         # wrap the route in a result object
         return RouterResult(route, isVictim)

app/simulation/Simulation.py

@@ -23,7 +23,7 @@ def applyFileConfig(cls):
         """ reads configs from a json and applies it at realtime to the simulation """
         try:
             config = json.load(open('./knobs.json'))
-            CustomRouter.victimsPercentage = config['victimsPercentage']
+            CustomRouter.explorationPercentage = config['explorationPercentage']
             CustomRouter.averageEdgeDurationFactor = config['averageEdgeDurationFactor']
             CustomRouter.maxSpeedAndLengthFactor = config['maxSpeedAndLengthFactor']
             CustomRouter.freshnessUpdateFactor = config['freshnessUpdateFactor']
@@ -76,9 +76,9 @@ def loop(cls):
                     # kafka mode
                     newConf = KafkaConnector.checkForNewConfiguration()
                     if newConf is not None:
-                        if "victim_percentage" in newConf:
-                            CustomRouter.victimsPercentage = newConf["victim_percentage"]
-                            print("setting victimsPercentage: " + str(newConf["victim_percentage"]))
+                        if "exploration_percentage" in newConf:
+                            CustomRouter.explorationPercentage = newConf["exploration_percentage"]
+                            print("setting victimsPercentage: " + str(newConf["exploration_percentage"]))
                         if "route_random_sigma" in newConf:
                             CustomRouter.routeRandomSigma = newConf["route_random_sigma"]
                             print("setting routeRandomSigma: " + str(newConf["route_random_sigma"]))

knobs.json

@@ -1,6 +1,6 @@
 {
-  "victimsPercentageDescription": "the percentage of routes we want to victimize",
-  "victimsPercentage": 0.0,
+  "explorationPercentageDescription": "the percentage of routes we want to use for exploration",
+  "explorationPercentage": 0.0,
   "routeRandomSigmaDescription": "the randomization sigma of edge weigths",
   "routeRandomSigma": 0.0,
   "maxSpeedAndLengthFactorDescription": "how much the length/speed influences the routing",