cleaned python code

eclipse-sumo · Jun 26, 2018 · 45d606f · 45d606f
1 parent 3942cad
commit 45d606f
Show file tree

Hide file tree

Showing 38 changed files with 147 additions and 140 deletions.
diff --git a/tests/complex/scenario_generation/demand_models/runner.py b/tests/complex/scenario_generation/demand_models/runner.py
@@ -31,7 +31,7 @@
 for s in demand.streams:
     vehicles1.extend(s.toVehicles(0, 86400))
 
-#demand.build(0, 3600, 3600, "net.net.xml", "linear.rou.xml")
+# demand.build(0, 3600, 3600, "net.net.xml", "linear.rou.xml")
 
 demand = Demand()
 demand.addStream(Stream(None, 0, 39600, 400, "from", "to", "passenger"))
@@ -41,15 +41,15 @@
 vehicles2 = []
 for s in demand.streams:
     vehicles2.extend(s.toVehicles(0, 86400))
-#demand.build(0, 3600, 3600, "net.net.xml", "linear.rou.xml")
+# demand.build(0, 3600, 3600, "net.net.xml", "linear.rou.xml")
 
 vehicles3 = []  # [600, 0, .000025, 14400]
 demand = Demand()
 demand.addStream(Stream(None, None, None, WaveComposition(
     800, [[400, 0, .000025, 14400], [200, 0, .00001, 14400]]), "from", "to", "passenger"))
 for s in demand.streams:
     vehicles3.extend(s.toVehicles(0, 86400))
-#demand.build(0, 3600, "net.net.xml", "linear.rou.xml")
+# demand.build(0, 3600, "net.net.xml", "linear.rou.xml")
 
 STEP = 300
 d1 = [0] * (86400 / STEP)

diff --git a/tests/complex/simpla/config/test.py b/tests/complex/simpla/config/test.py
@@ -55,7 +55,7 @@ def setUp(self):
                 <vTypeMap original="origVTypeID" leader="leaderVTypeID" follower="followerVTypeID" catchup="catchupVTypeID" catchupFollower="catchupFollowerVTypeID" />
             """
         self.cfg_body1 =\
-            """        
+            """
                 <controlRate value="0" />
                 <vehicleSelectors>empty</vehicleSelectors>
                 <maxPlatoonGap value="-1" />

diff --git a/tests/complex/tutorial/city_mobil/agentManager.py b/tests/complex/tutorial/city_mobil/agentManager.py
@@ -163,7 +163,7 @@ def __init__(self):
         self.cyberCars = []
 
     def personArrived(self, personID, edge, target):
-        if not personID in self.agents:
+        if personID not in self.agents:
             person = PersonAgent(personID)
             self.agents[personID] = person
             person.startRequest(edge.replace("footmain", "cyber"),

diff --git a/tests/complex/tutorial/city_mobil/simpleManager.py b/tests/complex/tutorial/city_mobil/simpleManager.py
@@ -27,7 +27,7 @@ def __init__(self):
         self.personsWaitingAt = {}
 
     def personArrived(self, personID, edge, target):
-        if not edge in self.personsWaitingAt:
+        if edge not in self.personsWaitingAt:
             self.personsWaitingAt[edge] = []
         self.personsWaitingAt[edge].append((personID, target))
 

diff --git a/tests/complex/tutorial/city_mobil/vehicleControl.py b/tests/complex/tutorial/city_mobil/vehicleControl.py
@@ -124,7 +124,7 @@ def getPosition(vehicleID):
 
 
 def stopAt(vehicleID, edge, pos=None):
-    if pos == None:
+    if pos is None:
         pos = STOP_POS
         if edge.endswith("out") or edge.endswith("in"):
             pos = 90.
@@ -154,7 +154,7 @@ def _rerouteCar(vehicleID):
         for idx in range(SLOTS_PER_ROW):
             for dir in ["l", "r"]:
                 slotEdge = "slot%s-%s%s" % (rowIdx, idx, dir)
-                if not slotEdge in occupancy:
+                if slotEdge not in occupancy:
                     occupancy[slotEdge] = vehicleID
                     stopAt(vehicleID, slotEdge, SLOT_LENGTH - 5.)
                     return
@@ -188,7 +188,7 @@ def _checkInitialPositions(vehicleID, edge, pos):
         elif "foot" in edge:
             traci.vehicle.setStop(vehicleID, "-" + edge)
             parkEdge = edge.replace("foot", "slot")
-            if not parkEdge in persons:
+            if parkEdge not in persons:
                 persons[parkEdge] = []
             persons[parkEdge].append(vehicleID)
             vehicleStatus[vehicleID].parking = True

diff --git a/tests/netedit/additionalElements/access/delete/test.sikuli/test.py b/tests/netedit/additionalElements/access/delete/test.sikuli/test.py
@@ -60,7 +60,7 @@
 # go to inspect mode
 netedit.deleteMode()
 
-#delete busStop
+# delete busStop
 netedit.leftClick(match, 420, 295)
 
 # undo

diff --git a/tests/netedit/additionalElements/access/inspect/test.sikuli/test.py b/tests/netedit/additionalElements/access/inspect/test.sikuli/test.py
@@ -98,5 +98,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
-
diff --git a/tests/netedit/additionalElements/access/inspect_selection/test.sikuli/test.py b/tests/netedit/additionalElements/access/inspect_selection/test.sikuli/test.py
@@ -60,4 +60,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/additionalElements/access/move/test.sikuli/test.py b/tests/netedit/additionalElements/access/move/test.sikuli/test.py
@@ -50,7 +50,7 @@
 # move Acces 1
 netedit.moveElement(match, -147, 163, 100, 163)
 
-#move Acces 2
+# move Acces 2
 netedit.moveElement(match, 100, 163, -100, 163)
 
 # Check undo redo

diff --git a/tests/netedit/additionalElements/calibrator/create/test.sikuli/test.py b/tests/netedit/additionalElements/calibrator/create/test.sikuli/test.py
@@ -88,13 +88,13 @@
 # create calibrator with a valid parameter in other lane
 netedit.leftClick(match, 200, 230)
 
-# change output with an invalid value 
+# change output with an invalid value
 netedit.modifyAdditionalDefaultValue(5, "%%%%###!!!")
 
 # create calibrator with a valid parameter in other lane
 netedit.leftClick(match, 200, 230)
 
-# change output with an valid value 
+# change output with an valid value
 netedit.modifyAdditionalDefaultValue(5, "myOwnOutput")
 
 # create calibrator with a valid parameter in other lane

diff --git a/tests/netedit/additionalElements/e2detector/create/test.sikuli/test.py b/tests/netedit/additionalElements/e2detector/create/test.sikuli/test.py
@@ -67,7 +67,7 @@
 # set valid filename
 netedit.modifyAdditionalDefaultValue(4, "myOwnFilename.txt")
 
-#create E2 with valid filename
+# create E2 with valid filename
 netedit.leftClick(match, 400, 250)
 
 # Change cont

diff --git a/tests/netedit/additionalElements/lanecalibrator/create/test.sikuli/test.py b/tests/netedit/additionalElements/lanecalibrator/create/test.sikuli/test.py
@@ -88,13 +88,13 @@
 # create calibrator with a valid parameter in other lane
 netedit.leftClick(match, 200, 230)
 
-# change output with an invalid value 
+# change output with an invalid value
 netedit.modifyAdditionalDefaultValue(5, "%%%%###!!!")
 
 # create calibrator with a valid parameter in other lane
 netedit.leftClick(match, 200, 230)
 
-# change output with an valid value 
+# change output with an valid value
 netedit.modifyAdditionalDefaultValue(5, "myOwnOutput")
 
 # create calibrator with a valid parameter in other lane

diff --git a/tests/netedit/additionalElements/parkingarea/inspect/test.sikuli/test.py b/tests/netedit/additionalElements/parkingarea/inspect/test.sikuli/test.py
@@ -164,4 +164,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-"""
diff --git a/tests/netedit/additionalElements/parkingspace/delete/test.sikuli/test.py b/tests/netedit/additionalElements/parkingspace/delete/test.sikuli/test.py
@@ -81,4 +81,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/additionalElements/parkingspace/inspect_selection/test.sikuli/test.py b/tests/netedit/additionalElements/parkingspace/inspect_selection/test.sikuli/test.py
@@ -103,4 +103,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/additionalElements/parkingspace/lock_unlock/test.sikuli/test.py b/tests/netedit/additionalElements/parkingspace/lock_unlock/test.sikuli/test.py
@@ -91,4 +91,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/additionalElements/parkingspace/move/test.sikuli/test.py b/tests/netedit/additionalElements/parkingspace/move/test.sikuli/test.py
@@ -70,4 +70,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess)
-
diff --git a/tests/netedit/basic/open_configuration/test.sikuli/test.py b/tests/netedit/basic/open_configuration/test.sikuli/test.py
@@ -23,7 +23,7 @@
 import neteditTestFunctions as netedit  # noqa
 
 # Open netedit without search the pink square reference
-neteditProcess, match= netedit.setupAndStart(neteditTestRoot, ['--configuration-file', 'input_net.netccfg'])
+neteditProcess, match = netedit.setupAndStart(neteditTestRoot, ['--configuration-file', 'input_net.netccfg'])
 
 # save loaded network as (for texttest comparing)
 netedit.saveNetwork()

diff --git a/tests/netedit/bugs/processing/ticket3994/test.sikuli/test.py b/tests/netedit/bugs/processing/ticket3994/test.sikuli/test.py
@@ -32,7 +32,7 @@
 netedit.selectMode()
 
 # select node 1
-netedit.leftClick(match, 315, 220) 
+netedit.leftClick(match, 315, 220)
 
 # select node 2
 netedit.leftClick(match, 415, 220)

diff --git a/tests/netedit/bugs/ticket3900/test.sikuli/test.py b/tests/netedit/bugs/ticket3900/test.sikuli/test.py
@@ -30,4 +30,3 @@
 
 # quit netedit
 netedit.quit(neteditProcess, True, True, True, False)
-
diff --git a/tests/netedit/netElements/edges/inspectB/test.sikuli/test.py b/tests/netedit/netElements/edges/inspectB/test.sikuli/test.py
@@ -62,7 +62,8 @@
 netedit.modifyAttribute(10, "")
 
 # Change parameter 10 with a valid value (empty)
-netedit.modifyAttribute(10, "emergency authority army vip passenger hov bus coach tram rail_urban rail rail_electric motorcycle moped pedestrian custom1")
+netedit.modifyAttribute(
+    10, "emergency authority army vip passenger hov bus coach tram rail_urban rail rail_electric motorcycle moped pedestrian custom1")
 
 # Change parameter 11 with an non valid value (dummy)
 netedit.modifyAttribute(11, "dummyShape")