From e11276c1e57293f95ed0058699f42871e8b71ce0 Mon Sep 17 00:00:00 2001
From: carlos <ca2010es@gmail.com>
Date: Wed, 20 Jul 2016 14:18:14 +0200
Subject: [PATCH] python 3 migration
---
CONTRIBUTING.md | 4 ++--
Utest/Validation/1test_1D/run_validation_1.py | 2 +-
Utest/Validation/2test_2D/run_validation_2.py | 2 +-
Utest/Validation/3test_UO/run_validation_3.py | 2 +-
Utest/Validation/6test_KO/run_validation_6.py | 2 +-
.../juelich_tests/test_1/runtest_juelich_1.py | 2 +-
.../test_12/runtest_juelich_12.py | 2 +-
.../test_14/runtest_juelich_14.py | 2 +-
.../test_15/runtest_juelich_15.py | 2 +-
.../juelich_tests/test_2/runtest_juelich_2.py | 2 +-
.../juelich_tests/test_3/runtest_juelich_3.py | 2 +-
.../juelich_tests/test_4/runtest_juelich_4.py | 2 +-
.../juelich_tests/test_5/runtest_juelich_5.py | 2 +-
.../juelich_tests/test_6/runtest_juelich_6.py | 2 +-
.../test_7.1/runtest_juelich_7_1.py | 2 +-
.../test_7.2/runtest_juelich_7_2.py | 2 +-
.../test_7/r_untest_juelich_7.py | 2 +-
.../juelich_tests/test_8/runtest_juelich_8.py | 2 +-
.../juelich_tests/test_9/runtest_juelich_9.py | 2 +-
Utest/makeini.py | 18 ++++++++---------
Utest/rimea_tests/test_1/runtest_rimea_1.py | 2 +-
Utest/rimea_tests/test_10/runtest_rimea_10.py | 2 +-
Utest/rimea_tests/test_11/runtest_rimea_11.py | 2 +-
Utest/rimea_tests/test_12/runtest_rimea_12.py | 2 +-
Utest/rimea_tests/test_13/runtest_rimea_13.py | 2 +-
Utest/rimea_tests/test_14/runtest_rimea_14.py | 2 +-
Utest/rimea_tests/test_2/runtest_rimea_2.py | 2 +-
Utest/rimea_tests/test_3/runtest_rimea_3.py | 2 +-
Utest/rimea_tests/test_5/runtest_rimea_5.py | 2 +-
Utest/rimea_tests/test_6/runtest_rimea_6.py | 2 +-
Utest/rimea_tests/test_7/runtest_rimea_7.py | 2 +-
Utest/rimea_tests/test_8/runtest_rimea_8.py | 2 +-
Utest/rimea_tests/test_9/runtest_rimea_9.py | 2 +-
cmake_modules/CodeCoverage.cmake | 2 +-
inputfiles/Bottleneck/makeBotlenecks.py | 2 +-
.../Bottleneck/makeBottleneckInifile.py | 2 +-
inputfiles/Bottleneck/run_flow.py | 4 ++--
scripts/plot_neighbors.py | 8 ++++----
scripts/vizUnity_geometry.py | 20 +++++++++----------
39 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 54861935..3a9d2fae 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -291,7 +291,7 @@ To write additional tests, create a directory under *Utest/*.
- run the script `makeini.py` with the obligatory option `-f`: Using the
aforementioned example the call is:
```bash
- python makeini.py -f test_case1/inifile.xml
+ python3 makeini.py -f test_case1/inifile.xml
```
The Script is going to create two directories:
@@ -305,7 +305,7 @@ The Script is going to create two directories:
Your script has to start with the following lines:
```python
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
from sys import *
diff --git a/Utest/Validation/1test_1D/run_validation_1.py b/Utest/Validation/1test_1D/run_validation_1.py
index 49e214ef..35d964f4 100644
--- a/Utest/Validation/1test_1D/run_validation_1.py
+++ b/Utest/Validation/1test_1D/run_validation_1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/Validation/2test_2D/run_validation_2.py b/Utest/Validation/2test_2D/run_validation_2.py
index 67892db0..918b881e 100644
--- a/Utest/Validation/2test_2D/run_validation_2.py
+++ b/Utest/Validation/2test_2D/run_validation_2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/Validation/3test_UO/run_validation_3.py b/Utest/Validation/3test_UO/run_validation_3.py
index 39015fc9..3bc2b7c4 100644
--- a/Utest/Validation/3test_UO/run_validation_3.py
+++ b/Utest/Validation/3test_UO/run_validation_3.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/Validation/6test_KO/run_validation_6.py b/Utest/Validation/6test_KO/run_validation_6.py
index 8c391a90..17e11e2b 100644
--- a/Utest/Validation/6test_KO/run_validation_6.py
+++ b/Utest/Validation/6test_KO/run_validation_6.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/juelich_tests/test_1/runtest_juelich_1.py b/Utest/juelich_tests/test_1/runtest_juelich_1.py
index 26e54ba4..5a7edd51 100644
--- a/Utest/juelich_tests/test_1/runtest_juelich_1.py
+++ b/Utest/juelich_tests/test_1/runtest_juelich_1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
utestdir = os.path.abspath(os.path.dirname(os.path.dirname(sys.path[0])))
diff --git a/Utest/juelich_tests/test_12/runtest_juelich_12.py b/Utest/juelich_tests/test_12/runtest_juelich_12.py
index 919701d6..90456515 100755
--- a/Utest/juelich_tests/test_12/runtest_juelich_12.py
+++ b/Utest/juelich_tests/test_12/runtest_juelich_12.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
utestdir = os.path.abspath(os.path.dirname(os.path.dirname(sys.path[0])))
diff --git a/Utest/juelich_tests/test_14/runtest_juelich_14.py b/Utest/juelich_tests/test_14/runtest_juelich_14.py
index d8e6badd..d524b0e9 100755
--- a/Utest/juelich_tests/test_14/runtest_juelich_14.py
+++ b/Utest/juelich_tests/test_14/runtest_juelich_14.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
utestdir = os.path.abspath(os.path.dirname(os.path.dirname(sys.path[0])))
diff --git a/Utest/juelich_tests/test_15/runtest_juelich_15.py b/Utest/juelich_tests/test_15/runtest_juelich_15.py
index 5e1a6cba..3998c862 100755
--- a/Utest/juelich_tests/test_15/runtest_juelich_15.py
+++ b/Utest/juelich_tests/test_15/runtest_juelich_15.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
diff --git a/Utest/juelich_tests/test_2/runtest_juelich_2.py b/Utest/juelich_tests/test_2/runtest_juelich_2.py
index 5c9d02c1..7ec2f2b0 100755
--- a/Utest/juelich_tests/test_2/runtest_juelich_2.py
+++ b/Utest/juelich_tests/test_2/runtest_juelich_2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
utestdir = os.path.abspath(os.path.dirname(os.path.dirname(sys.path[0])))
diff --git a/Utest/juelich_tests/test_3/runtest_juelich_3.py b/Utest/juelich_tests/test_3/runtest_juelich_3.py
index eabd99e1..a6c0727b 100755
--- a/Utest/juelich_tests/test_3/runtest_juelich_3.py
+++ b/Utest/juelich_tests/test_3/runtest_juelich_3.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
utestdir = os.path.abspath(os.path.dirname(os.path.dirname(sys.path[0])))
diff --git a/Utest/juelich_tests/test_4/runtest_juelich_4.py b/Utest/juelich_tests/test_4/runtest_juelich_4.py
index c575c900..fade0b33 100755
--- a/Utest/juelich_tests/test_4/runtest_juelich_4.py
+++ b/Utest/juelich_tests/test_4/runtest_juelich_4.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
utestdir = os.path.abspath(os.path.dirname(os.path.dirname(sys.path[0])))
diff --git a/Utest/juelich_tests/test_5/runtest_juelich_5.py b/Utest/juelich_tests/test_5/runtest_juelich_5.py
index f0868759..7ee4e30f 100755
--- a/Utest/juelich_tests/test_5/runtest_juelich_5.py
+++ b/Utest/juelich_tests/test_5/runtest_juelich_5.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
utestdir = os.path.abspath(os.path.dirname(os.path.dirname(sys.path[0])))
diff --git a/Utest/juelich_tests/test_6/runtest_juelich_6.py b/Utest/juelich_tests/test_6/runtest_juelich_6.py
index e4742d63..f5726299 100755
--- a/Utest/juelich_tests/test_6/runtest_juelich_6.py
+++ b/Utest/juelich_tests/test_6/runtest_juelich_6.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
utestdir = os.path.abspath(os.path.dirname(os.path.dirname(sys.path[0])))
diff --git a/Utest/juelich_tests/test_7.1/runtest_juelich_7_1.py b/Utest/juelich_tests/test_7.1/runtest_juelich_7_1.py
index 5e3fc3b2..323b2074 100755
--- a/Utest/juelich_tests/test_7.1/runtest_juelich_7_1.py
+++ b/Utest/juelich_tests/test_7.1/runtest_juelich_7_1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
- 100 peds distributed in a room with 2 exits:
diff --git a/Utest/juelich_tests/test_7.2/runtest_juelich_7_2.py b/Utest/juelich_tests/test_7.2/runtest_juelich_7_2.py
index 140c3000..5fc0c769 100755
--- a/Utest/juelich_tests/test_7.2/runtest_juelich_7_2.py
+++ b/Utest/juelich_tests/test_7.2/runtest_juelich_7_2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
- 100 peds distributed in a room with 2 exits:
diff --git a/Utest/juelich_tests/test_7/r_untest_juelich_7.py b/Utest/juelich_tests/test_7/r_untest_juelich_7.py
index 5e6fd811..20ee69cf 100755
--- a/Utest/juelich_tests/test_7/r_untest_juelich_7.py
+++ b/Utest/juelich_tests/test_7/r_untest_juelich_7.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
- 6 peds distributed in a room with 2 exits:
diff --git a/Utest/juelich_tests/test_8/runtest_juelich_8.py b/Utest/juelich_tests/test_8/runtest_juelich_8.py
index c656308f..0dad1980 100755
--- a/Utest/juelich_tests/test_8/runtest_juelich_8.py
+++ b/Utest/juelich_tests/test_8/runtest_juelich_8.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import os
import sys
utestdir = os.path.abspath(os.path.dirname(os.path.dirname(sys.path[0])))
diff --git a/Utest/juelich_tests/test_9/runtest_juelich_9.py b/Utest/juelich_tests/test_9/runtest_juelich_9.py
index c8227d8c..bdfbc3ca 100644
--- a/Utest/juelich_tests/test_9/runtest_juelich_9.py
+++ b/Utest/juelich_tests/test_9/runtest_juelich_9.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/makeini.py b/Utest/makeini.py
index f7c7fb90..6857ba4a 100644
--- a/Utest/makeini.py
+++ b/Utest/makeini.py
@@ -1,11 +1,11 @@
-# help: python makeini.py -h
+# help: python3 makeini.py -h
import os, sys, glob
from shutil import copy2, rmtree, move
import logging, types, argparse
import errno, time
from numpy import *
-from itertools import product, izip
+from itertools import product
try:
import xml.etree.cElementTree as ET
except ImportError:
@@ -112,7 +112,7 @@ def get_attribute(node):
text = ''
values = []
- for node_attrib in node.attrib.keys():
+ for node_attrib in list(node.attrib.keys()):
if node_attrib in attributes:
text = node.attrib[node_attrib]
if text:
@@ -146,7 +146,7 @@ def get_product(root):
d = get_tag(node)
if isinstance(d, list) or isinstance(d, ndarray):
# in case some tags have multiple values
- if not input_tags.has_key(tag) and len(d) > 1:
+ if tag not in input_tags and len(d) > 1:
# ignore lists with one element (equiv to scalars)
# if tag in tags:
input_tags[tag] = d
@@ -160,7 +160,7 @@ def get_product(root):
else:
continue
- result_prod = [dict(izip(input_tags, x)) for x in product(*input_tags.itervalues())]
+ result_prod = [dict(zip(input_tags, x)) for x in product(*iter(input_tags.values()))]
# print "result", result_prod
# raw_input()
return result_prod
@@ -168,7 +168,7 @@ def get_product(root):
def make_filename(directory, d):
name = "%s/inifiles/ini"%directory
traj = "../trajectories/traj" #%directory
- for key, value in d.iteritems():
+ for key, value in d.items():
if key == "geometry":
value = os.path.basename(value)
# if key == "num_threads":
@@ -193,7 +193,7 @@ def update_attrib_value(root, attr_tag, value):
# raw_input()
if attr_tag == "location": # e.g. location
for r in root.iter():
- if r.attrib.has_key(attr_tag):
+ if attr_tag in r.attrib:
r.attrib[attr_tag] = str(value)
return
@@ -201,7 +201,7 @@ def update_attrib_value(root, attr_tag, value):
cor_tag = attr_tag.split("-")[0]
for r in root.iter(cor_tag):
- if r.attrib.has_key(attr):
+ if attr in r.attrib:
r.attrib[attr] = str(value)
# =======================================================
def make_file(masterfile, tree, result):
@@ -219,7 +219,7 @@ def make_file(masterfile, tree, result):
if not os.path.isfile(newfile):
logging.error("make_file: could not create file %s"%newfile)
sys.exit(FAILURE)
- for tag, value in item.iteritems():
+ for tag, value in item.items():
# print "tag: ", tag, "value:", value
# raw_input()
if tag in attributes_tags:
diff --git a/Utest/rimea_tests/test_1/runtest_rimea_1.py b/Utest/rimea_tests/test_1/runtest_rimea_1.py
index 01449dbe..1543f110 100644
--- a/Utest/rimea_tests/test_1/runtest_rimea_1.py
+++ b/Utest/rimea_tests/test_1/runtest_rimea_1.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/rimea_tests/test_10/runtest_rimea_10.py b/Utest/rimea_tests/test_10/runtest_rimea_10.py
index cdd85c50..638ac93b 100644
--- a/Utest/rimea_tests/test_10/runtest_rimea_10.py
+++ b/Utest/rimea_tests/test_10/runtest_rimea_10.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/rimea_tests/test_11/runtest_rimea_11.py b/Utest/rimea_tests/test_11/runtest_rimea_11.py
index 8dedc2e8..2527bb0a 100644
--- a/Utest/rimea_tests/test_11/runtest_rimea_11.py
+++ b/Utest/rimea_tests/test_11/runtest_rimea_11.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/rimea_tests/test_12/runtest_rimea_12.py b/Utest/rimea_tests/test_12/runtest_rimea_12.py
index 9e4d9129..24b76d01 100644
--- a/Utest/rimea_tests/test_12/runtest_rimea_12.py
+++ b/Utest/rimea_tests/test_12/runtest_rimea_12.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/rimea_tests/test_13/runtest_rimea_13.py b/Utest/rimea_tests/test_13/runtest_rimea_13.py
index e6d57a23..33fb5195 100644
--- a/Utest/rimea_tests/test_13/runtest_rimea_13.py
+++ b/Utest/rimea_tests/test_13/runtest_rimea_13.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/rimea_tests/test_14/runtest_rimea_14.py b/Utest/rimea_tests/test_14/runtest_rimea_14.py
index c2b3541b..ad11f2e9 100644
--- a/Utest/rimea_tests/test_14/runtest_rimea_14.py
+++ b/Utest/rimea_tests/test_14/runtest_rimea_14.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/rimea_tests/test_2/runtest_rimea_2.py b/Utest/rimea_tests/test_2/runtest_rimea_2.py
index 91238228..16f3fcf2 100644
--- a/Utest/rimea_tests/test_2/runtest_rimea_2.py
+++ b/Utest/rimea_tests/test_2/runtest_rimea_2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test Description
================
diff --git a/Utest/rimea_tests/test_3/runtest_rimea_3.py b/Utest/rimea_tests/test_3/runtest_rimea_3.py
index 681214d3..e61d2a66 100644
--- a/Utest/rimea_tests/test_3/runtest_rimea_3.py
+++ b/Utest/rimea_tests/test_3/runtest_rimea_3.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test Description
================
diff --git a/Utest/rimea_tests/test_5/runtest_rimea_5.py b/Utest/rimea_tests/test_5/runtest_rimea_5.py
index b2d371ba..4183ff10 100644
--- a/Utest/rimea_tests/test_5/runtest_rimea_5.py
+++ b/Utest/rimea_tests/test_5/runtest_rimea_5.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/rimea_tests/test_6/runtest_rimea_6.py b/Utest/rimea_tests/test_6/runtest_rimea_6.py
index 64f75cd6..af33eeb8 100644
--- a/Utest/rimea_tests/test_6/runtest_rimea_6.py
+++ b/Utest/rimea_tests/test_6/runtest_rimea_6.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/rimea_tests/test_7/runtest_rimea_7.py b/Utest/rimea_tests/test_7/runtest_rimea_7.py
index 86e04cf5..b7b7ca27 100644
--- a/Utest/rimea_tests/test_7/runtest_rimea_7.py
+++ b/Utest/rimea_tests/test_7/runtest_rimea_7.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/rimea_tests/test_8/runtest_rimea_8.py b/Utest/rimea_tests/test_8/runtest_rimea_8.py
index d9a4c263..95de81b0 100755
--- a/Utest/rimea_tests/test_8/runtest_rimea_8.py
+++ b/Utest/rimea_tests/test_8/runtest_rimea_8.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/Utest/rimea_tests/test_9/runtest_rimea_9.py b/Utest/rimea_tests/test_9/runtest_rimea_9.py
index 3dcaf6cd..1f60fb5a 100644
--- a/Utest/rimea_tests/test_9/runtest_rimea_9.py
+++ b/Utest/rimea_tests/test_9/runtest_rimea_9.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
Test description
================
diff --git a/cmake_modules/CodeCoverage.cmake b/cmake_modules/CodeCoverage.cmake
index aaf3fa42..16c7e6f6 100644
--- a/cmake_modules/CodeCoverage.cmake
+++ b/cmake_modules/CodeCoverage.cmake
@@ -166,7 +166,7 @@ ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE
FUNCTION(SETUP_TARGET_FOR_COVERAGE_COBERTURA _targetname _testrunner _outputname)
IF(NOT PYTHON_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Python not found! Aborting...")
+ MESSAGE(FATAL_ERROR "Python 3 not found! Aborting...")
ENDIF() # NOT PYTHON_EXECUTABLE
IF(NOT GCOVR_PATH)
diff --git a/inputfiles/Bottleneck/makeBotlenecks.py b/inputfiles/Bottleneck/makeBotlenecks.py
index 430a9690..799a9713 100644
--- a/inputfiles/Bottleneck/makeBotlenecks.py
+++ b/inputfiles/Bottleneck/makeBotlenecks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
import re
UP = 103
diff --git a/inputfiles/Bottleneck/makeBottleneckInifile.py b/inputfiles/Bottleneck/makeBottleneckInifile.py
index 8bd7a86c..52742bb4 100644
--- a/inputfiles/Bottleneck/makeBottleneckInifile.py
+++ b/inputfiles/Bottleneck/makeBottleneckInifile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
# make some new ini-files based on the file <ini-Bottleneck.xml>
# so first make changes in <ini-Bottleneck.xml> and then spread them with this script to the world
diff --git a/inputfiles/Bottleneck/run_flow.py b/inputfiles/Bottleneck/run_flow.py
index 3200624f..b94ac7db 100755
--- a/inputfiles/Bottleneck/run_flow.py
+++ b/inputfiles/Bottleneck/run_flow.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
import numpy as np
from xml.dom import minidom
import os, argparse, logging, time
@@ -100,7 +100,7 @@ if __name__ == "__main__":
widths = [0.8, 0.9, 1.0, 1.1, 1.2, 1.4, 1.6, 1.8, 2.0, 2.3, 2.5]
flows = []
if MAKE_INI:
- sh("python makeBottleneckInifile.py")
+ sh("python3 makeBottleneckInifile.py")
for w in widths:
#------------------------------------------------------------------------------
diff --git a/scripts/plot_neighbors.py b/scripts/plot_neighbors.py
index 08e75761..0bcff1c8 100644
--- a/scripts/plot_neighbors.py
+++ b/scripts/plot_neighbors.py
@@ -8,11 +8,11 @@ import os, time
from pylab import Rectangle
if len(argv)<=2:
- print "usage: %s, filename geometryfile"%argv[0]
+ print("usage: %s, filename geometryfile"%argv[0])
exit()
-from itertools import product, izip
+from itertools import product
try:
import xml.etree.cElementTree as ET
except ImportError:
@@ -138,7 +138,7 @@ def plotFrame(i, t, data, geometry):
plt.title("t=%.3f"%t)
fig.savefig("figs_bot/%.4d.png"%i)
plt.clf()
- print "---> figs_bot/%.4d.png"%i
+ print("---> figs_bot/%.4d.png"%i)
if __name__ == "__main__":
@@ -157,7 +157,7 @@ if __name__ == "__main__":
i += 1
if Movie:
cmd = "\"mf://figs_bot/*.png\" -mf w=800:h=600:fps=25:type=png -ovc lavc -lavcopts vcodec=mpeg4 -oac copy -o output.avi"
- print "Mencoder ---- "
+ print("Mencoder ---- ")
os.system("mencoder %s" %cmd)
MPlayer= "mplayer output.avi"
os.system("%s" %MPlayer)
diff --git a/scripts/vizUnity_geometry.py b/scripts/vizUnity_geometry.py
index 51d9d7cc..e9a78df6 100644
--- a/scripts/vizUnity_geometry.py
+++ b/scripts/vizUnity_geometry.py
@@ -1,4 +1,4 @@
-from itertools import product, izip
+from itertools import product
try:
import xml.etree.cElementTree as ET
except ImportError:
@@ -16,10 +16,10 @@ logging.basicConfig(filename=logfile, level=logging.INFO, format='%(asctime)s -
g = open("geometry.txt", "w")
def usage():
- print "usage: python %s geometry_file trajectory_file"%sys.argv[0]
- print "This will create two files:\
- \n \t- Trajectories ---> b090_combined.txt \n \t- and geometry ---> geometry.txt"
- print "mv geometry.txt b090_combined.txt to the location where SumoVizUnity leaves"
+ print("usage: python3 %s geometry_file trajectory_file"%sys.argv[0])
+ print("This will create two files:\
+ \n \t- Trajectories ---> b090_combined.txt \n \t- and geometry ---> geometry.txt")
+ print("mv geometry.txt b090_combined.txt to the location where SumoVizUnity leaves")
def parse_trajectories(filename):
@@ -70,11 +70,11 @@ def get_polygon(poly):
return X, Y
def write_polygon(X, Y, Type, name, height):
- print >>g, "Polygon",
+ print("Polygon", end=' ', file=g)
for (x, y) in zip(X, Y):
- print >>g, "%.1f %.1f"%(float(x), float(y)),
+ print("%.1f %.1f"%(float(x), float(y)), end=' ', file=g)
- print >>g, "%s %s %.2f"%(name, Type, height)
+ print("%s %s %.2f"%(name, Type, height), file=g)
def setMinMax(X, Y, minX, maxX, minY, maxY):
@@ -123,8 +123,8 @@ def parse_geometry(filename):
# some trees
dx = 5
dy = 5
- print >>g, "Polygon %.1f %.1f t1 tree 1.0"%(minX-dx, minY-dy)
- print >>g, "Polygon %.1f %.1f t3 tree 1.0"%(maxX+dx, maxY+dy)
+ print("Polygon %.1f %.1f t1 tree 1.0"%(minX-dx, minY-dy), file=g)
+ print("Polygon %.1f %.1f t3 tree 1.0"%(maxX+dx, maxY+dy), file=g)
if __name__ == "__main__":
if len(sys.argv) <= 2:
--
GitLab