replacing obsolete python2 methods

tests/complex/emissions/evaluateHBEFA3vsPHEM.py

@@ -75,7 +75,7 @@
     else:
         plt.xlim(0, m)
         plt.ylim(0, m)
-    for ec in sorted(phem.iterkeys()):
+    for ec in sorted(phem.keys()):
         if ec in hbefa and hbefa[ec][emission][0] > 0:
             print(ec, phem[ec][emission], hbefa[ec][emission])
             ax1.scatter(phem[ec][emission], hbefa[ec][emission], s=80, c=color[

tests/complex/tutorial/san_pablo_dam/data/analyzeData.py

@@ -71,7 +71,7 @@ def __getitem__(self, key):
 maxLanes = 0
 dt2OneHour = 6.0
 
-for t in dd.iterkeys():
+for t in dd.keys():
     if len(dd[t]) > maxLanes:
         maxLanes = len(dd[t])
 
@@ -83,7 +83,7 @@ def __getitem__(self, key):
 
 f = open('lane-shares.txt', 'w')
 # for t,v in dd.items():
-for t in sorted(dd.iterkeys()):
+for t in sorted(dd.keys()):
     # qTot = math.fsum(dd[t])
     qTot = sum(dd[t].values())
     nrm = 0.0

tools/import/opendrive/signal_POIs_from_xodr.py

@@ -77,7 +77,7 @@ def calculate_lin_m_width(wr_attribs, lin_m):
     wr_attribs hold parameters (sOffset, a,b,c,d)
     lin_m is relative to last lane section offset
     """
-    wr_attribs = {k: float(v) for k, v in wr_attribs.iteritems()}
+    wr_attribs = {k: float(v) for k, v in wr_attribs.items()}
     ds = lin_m - wr_attribs['sOffset']
     pa = np.r_[[wr_attribs[k] for k in 'abcd']]
     va = np.r_[[1., ds, ds * ds, ds * ds * ds]]

tools/output/generateITetrisNetworkMetrics.py

@@ -443,7 +443,7 @@ def getCSVOutput(assignments, path, veh_types, interval):
     while t in assignments:
         for f in files:
             f.write('[' + str(t) + ':' + str(t + interval - 1) + '];')
-        for veh_type in assignments[t].itervalues():
+        for veh_type in assignments[t].values():
             f_mean_travel_time.write(str(veh_type['avgTravelTime']) + ";" + str(veh_type['SDTravelTime']) + ";" +
                                      str(veh_type['quartil25TravelTime']) + ";" + str(veh_type['medianTravelTime']) +
                                      ";" + str(veh_type['quartil75TravelTime']) + ";")

tools/output/statisticsElements.py

@@ -180,7 +180,7 @@ def getSignificanceTestOutput(assignments, tTest, tValueAvg, hValues, outputfile
         foutSGtest.write(
             'The significances of the performance averages among the used assignment models ' +
             'are examined with the t test.\n')
-        assignlist = list(assignments.itervalues())
+        assignlist = list(assignments.values())
         for num, A in enumerate(assignlist):
             for B in assignlist[num + 1:]:
                 foutSGtest.write('\nmethod:%s' % A.label)

tools/output/tripStatistics.py

@@ -178,7 +178,7 @@ def doKruskalWallisTest(verbose, groups, combivehlist, assignments, label, hValu
     for index in [("traveltime"), ("speed"), ("travellength"), ("waittime")]:
         for veh in combivehlist:
             veh.rank = 0.
-        for method in assignments.itervalues():
+        for method in assignments.values():
             method.sumrank = 0.
 
         samecountlist = []
@@ -247,11 +247,11 @@ def doKruskalWallisTest(verbose, groups, combivehlist, assignments, label, hValu
                 break
 
         for veh in combivehlist:
-            for method in assignments.itervalues():
+            for method in assignments.values():
                 if veh.method == method.label:
                     method.sumrank += veh.rank
 
-        for method in assignments.itervalues():
+        for method in assignments.values():
             subtotal += (method.sumrank**2.) / method.totalVeh
 
         for elem in samecountlist:
@@ -336,15 +336,15 @@ def doKruskalWallisTest(verbose, groups, combivehlist, assignments, label, hValu
 # begin the significance test for the observations with a normal distribution
 if options.ttest:
     print('begin the t test!')
-    for A in assignments.itervalues():
+    for A in assignments.values():
         tValueAvg[A] = {}
-    doTTestForAvg(options.verbose, tValueAvg, list(assignments.itervalues()))
+    doTTestForAvg(options.verbose, tValueAvg, list(assignments.values()))
     print('The t test is done!')
 if options.kwtest:
     # The Kruskal-Wallis test is applied for the data, not drawn from a
     # normally distributed population.
     groups = 2
-    values = list(allvehicles.iteritems())
+    values = list(allvehicles.items())
     for num, A in enumerate(values):
         for B in values[num + 1:]:
             combilabel = ''

tools/output/vehroute2amitranOD.py

@@ -63,19 +63,19 @@ def convert(vehRoutes, routeOut, odOut, interval):
         routes.write("</routes>\n")
     with open(odOut, 'w') as od:
         od.write("<demand>\n")
-        for ac, odList in actorConfig.iteritems():
+        for ac, odList in actorConfig.items():
             od.write('    <actorConfig id="%s">\n' % ac)
             for idx, odMap in enumerate(odList):
                 if odMap:
                     od.write('        <timeSlice startTime="%s" duration="%s">\n' % (
                         idx * interval * 1000, interval * 1000))
-                    for (orig, dest), routeMap in odMap.iteritems():
+                    for (orig, dest), routeMap in odMap.items():
                         total = 0
-                        for amount, _ in routeMap.itervalues():
+                        for amount, _ in routeMap.values():
                             total += amount
                         od.write('            <odPair origin="%s" destination="%s" amount="%s">\n' % (
                             orig, dest, total))
-                        for idx, (amount, ttSum) in routeMap.iteritems():
+                        for idx, (amount, ttSum) in routeMap.items():
                             od.write(('                <routeCost routeId="%s" amount="%s" ' +
                                       'averageTraveltime="%s"/>\n') % (idx, amount, int(1000. * ttSum / amount)))
                             total += amount

tools/purgatory/Assignment.py

@@ -257,7 +257,7 @@ def main():
                     linkMap = net._fullEdges
                 else:
                     linkMap = net._edges
-                for edge in linkMap.itervalues():
+                for edge in linkMap.values():
                     edge.getActualTravelTime(options, False)
                     if options.dijkstra == 'boost':
                         edge.boost.weight = edge.helpacttime

tools/purgatory/assign.py

@@ -332,7 +332,7 @@ def doLohseStopCheck(net, options, stable, iter, maxIter, foutlog):
     # Check if the convergence reaches.
     if iter > 1:
         counts = 0
-        for edge in net._edges.itervalues():
+        for edge in net._edges.values():
             stop = edge.stopCheck(options)
             if stop:
                 counts += 1

tools/purgatory/dijkstra.py

@@ -79,7 +79,7 @@ def __setitem__(self, key, val):
         dict.__setitem__(self, key, val)
         heap = self.__heap
         if len(heap) > 2 * len(self):
-            self.__heap = [(v, k) for k, v in self.iteritems()]
+            self.__heap = [(v, k) for k, v in self.items()]
             self.__heap.sort()  # builtin sort likely faster than O(n) heapify
         else:
             newPair = (val, key)

tools/purgatory/network.py

@@ -112,7 +112,7 @@ def getfullEdgeCounts(self):
 
     def reduce(self):
         visited = set()
-        for link in self._edges.itervalues():
+        for link in self._edges.values():
             if link.target in visited:
                 continue
             sourceNodes = set([link.target])
@@ -165,7 +165,7 @@ def createBoostGraph(self):
             vertex.boost.partner = vertex
         self._boostGraph.add_vertex_property('distance')
         self._boostGraph.add_vertex_property('predecessor')
-        for edge in self._fullEdges.itervalues():
+        for edge in self._fullEdges.values():
             edge.boost = self._boostGraph.add_edge(
                 edge.source.boost, edge.target.boost)
             edge.boost.weight = edge.actualtime
@@ -317,7 +317,7 @@ def printNet(self, foutnet):
         foutnet.write(
             'Name\t Kind\t FrNode\t ToNode\t length\t MaxSpeed\t Lanes\t CR-Curve\t EstCap.\t Free-Flow TT\t' +
             'ratio\t Connection\n')
-        for edgeName, edgeObj in self._edges.iteritems():
+        for edgeName, edgeObj in self._edges.items():
             foutnet.write('%s\t %s\t %s\t %s\t %s\t %s\t %s\t %s\t %s\t %s\t %s\t %d\n'
                           % (edgeName, edgeObj.kind, edgeObj.source, edgeObj.target, edgeObj.length,
                              edgeObj.maxspeed, edgeObj.numberlane, edgeObj.CRcurve, edgeObj.estcapacity,

tools/sumolib/miscutils.py

@@ -169,7 +169,7 @@ def __setitem__(self, key, val):
         dict.__setitem__(self, key, val)
         heap = self.__heap
         if len(heap) > 2 * len(self):
-            self.__heap = [(v, k) for k, v in self.iteritems()]
+            self.__heap = [(v, k) for k, v in self.items()]
             self.__heap.sort()  # builtin sort likely faster than O(n) heapify
         else:
             newPair = (val, key)

tools/sumolib/output/dump.py

@@ -44,7 +44,7 @@ def startElement(self, name, attrs):
         if name == 'interval':
             self._beginTime = float(attrs['begin'])
             self._intervalBegins.append(self._beginTime)
-            for a in self._attrsToCollect.itervalues():
+            for a in self._attrsToCollect.values():
                 self._values[a].append(collections.defaultdict(int))
         if name == 'edge' or name == 'lane':
             id = attrs['id']