Skip to content

GitLab

JPScore
JPScore
Commit 2e01c9dd authored by Mohcine Chraibi's avatar Mohcine Chraibi
Browse files
Options

Start implementing Rimea 

1. Use the JPSRunTest class
2. Silence some PyLint errors
3. Add some information according PEP8
parent 1e51d4c8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4576 additions and 5068 deletions
Utest/JPSRunTest.py
View file @ 2e01c9dd
# coding:utf-8
"""
Class for benchmarking of jpscore
See template_test/How_to_make_new_test.txt
"""
import fnmatch import fnmatch
import glob import glob
import logging import logging
...@@ -9,14 +15,19 @@ import sys ...@@ -9,14 +15,19 @@ import sys
__author__ = 'Oliver Schmidts' __author__ = 'Oliver Schmidts'
__email__ = 'dev@jupedsim.org'
__credits__ = ['Oliver Schmidts', 'Mohcine Chraibi']
__copyright__ = '<2009-2015> Forschungszentrum Jülich GmbH. All rights reserved.'
__license__ = 'GNU Lesser General Public License'
__version__ = '0.1'
__status__ = 'Production'
class JPSRunTestDriver(object): class JPSRunTestDriver(object):
def __init__(self, testnumber, argv0, testdir): def __init__(self, testnumber, argv0, testdir):
self.SUCCESS = 0 self.SUCCESS = 0
self.FAILURE = 1 self.FAILURE = 1
# check if testnumber is an int # check if testnumber is digit
assert isinstance(testnumber, float) or isinstance(testnumber, int) assert isinstance(testnumber, float) or isinstance(testnumber, int)
# only allow path and strings as path directory name # only allow path and strings as path directory name
assert path.exists(argv0) assert path.exists(argv0)
...@@ -27,8 +38,7 @@ class JPSRunTestDriver(object): ...@@ -27,8 +38,7 @@ class JPSRunTestDriver(object):
self.logfile = os.path.join(testdir, self.logfile) self.logfile = os.path.join(testdir, self.logfile)
# touch file if not already there # touch file if not already there
f = open(self.logfile, 'a') open(self.logfile, 'a').close()
f.close()
logging.basicConfig(filename=self.logfile, level=logging.DEBUG, logging.basicConfig(filename=self.logfile, level=logging.DEBUG,
format='%(asctime)s - %(levelname)s - %(message)s') format='%(asctime)s - %(levelname)s - %(message)s')
self.HOME = path.expanduser("~") self.HOME = path.expanduser("~")
...@@ -47,11 +57,11 @@ class JPSRunTestDriver(object): ...@@ -47,11 +57,11 @@ class JPSRunTestDriver(object):
def __configure(self): def __configure(self):
if self.CWD != self.DIR: if self.CWD != self.DIR:
logging.info("working dir is %s. Change to %s" % (os.getcwd(), self.DIR)) logging.info("working dir is %s. Change to %s", os.getcwd(), self.DIR)
os.chdir(self.DIR) os.chdir(self.DIR)
logging.info("change directory to ..") logging.info("change directory to ..")
os.chdir("..") os.chdir("..")
logging.info("call makeini.py with -f %s" % self.FILE) logging.info("call makeini.py with -f %s", self.FILE)
subprocess.call(["python", "makeini.py", "-f", "%s" % self.FILE]) subprocess.call(["python", "makeini.py", "-f", "%s" % self.FILE])
os.chdir(self.DIR) os.chdir(self.DIR)
# -------- get directory of the code TRUNK # -------- get directory of the code TRUNK
...@@ -60,17 +70,17 @@ class JPSRunTestDriver(object): ...@@ -60,17 +70,17 @@ class JPSRunTestDriver(object):
os.chdir(self.DIR) os.chdir(self.DIR)
lib_path = os.path.abspath(os.path.join(self.trunk, "Utest")) lib_path = os.path.abspath(os.path.join(self.trunk, "Utest"))
sys.path.append(lib_path) sys.path.append(lib_path)
logging.info("change directory back to %s" % self.DIR) logging.info("change directory back to %s", self.DIR)
# initialise the inputfiles for jpscore # initialise the inputfiles for jpscore
self.geofile = os.path.join(self.DIR, "geometry.xml") self.geofile = os.path.join(self.DIR, "geometry.xml")
self.inifiles = glob.glob(os.path.join("inifiles", "*.xml")) self.inifiles = glob.glob(os.path.join("inifiles", "*.xml"))
if not path.exists(self.geofile): if not path.exists(self.geofile):
logging.critical("geofile <%s> does not exist" % self.geofile) logging.critical("geofile <%s> does not exist", self.geofile)
exit(self.FAILURE) exit(self.FAILURE)
for inifile in self.inifiles: for inifile in self.inifiles:
if not path.exists(inifile): if not path.exists(inifile):
logging.critical("inifile <%s> does not exist" % inifile) logging.critical("inifile <%s> does not exist", inifile)
exit(self.FAILURE) exit(self.FAILURE)
return return
...@@ -84,11 +94,12 @@ class JPSRunTestDriver(object): ...@@ -84,11 +94,12 @@ class JPSRunTestDriver(object):
for filename in fnmatch.filter(filenames, 'jpscore.exe'): for filename in fnmatch.filter(filenames, 'jpscore.exe'):
matches.append(os.path.join(root, filename)) matches.append(os.path.join(root, filename))
if len(matches) == 0: if len(matches) == 0:
logging.critical("executable <%s> or jpscore.exe does not exist yet." % executable) logging.critical("executable <%s> or jpscore.exe does not exist yet.", executable)
exit(self.FAILURE) exit(self.FAILURE)
elif len(matches) > 1: elif len(matches) > 1:
matches = ((os.stat(file_path), file_path) for file_path in matches) matches = ((os.stat(file_path), file_path) for file_path in matches)
matches = ((stat[ST_MTIME], file_path) for stat, file_path in matches if S_ISREG(stat[ST_MODE])) matches = ((stat[ST_MTIME], file_path)
for stat, file_path in matches if S_ISREG(stat[ST_MODE]))
matches = sorted(matches) matches = sorted(matches)
executable = matches[0] executable = matches[0]
# end fix for windows # end fix for windows
...@@ -97,13 +108,14 @@ class JPSRunTestDriver(object): ...@@ -97,13 +108,14 @@ class JPSRunTestDriver(object):
def __execute_test(self, executable, inifile, testfunction, *args): def __execute_test(self, executable, inifile, testfunction, *args):
cmd = "%s --inifile=%s"%(executable, inifile) cmd = "%s --inifile=%s"%(executable, inifile)
logging.info('start simulating with exe=<%s>' % cmd) logging.info('start simulating with exe=<%s>', cmd)
subprocess.call([executable, "--inifile=%s" % inifile]) subprocess.call([executable, "--inifile=%s" % inifile])
logging.info('end simulation ...\n--------------\n') logging.info('end simulation ...\n--------------\n')
trajfile = os.path.join("trajectories", "traj" + inifile.split("ini")[2]) trajfile = os.path.join("trajectories", "traj" + inifile.split("ini")[2])
logging.info('trajfile = <%s>' % trajfile) logging.info('trajfile = <%s>', trajfile)
if not path.exists(trajfile): if not path.exists(trajfile):
logging.critical("trajfile <%s> does not exist" % trajfile) logging.critical("trajfile <%s> does not exist", trajfile)
exit(self.FAILURE) exit(self.FAILURE)
testfunction(inifile, trajfile, *args) testfunction(inifile, trajfile, *args)
return return
\ No newline at end of file
inputfiles/rimea_testcases/Test_1/RiMEATest1_geo.xml
View file @ 2e01c9dd
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<geometry version="0.5" caption="second life" unit="m" <geometry version="0.5" caption="second life" unit="m"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../xsd/jps_geometry.xsd"> xsi:noNamespaceSchemaLocation="xsd.jupedsim.org/jps_geometry.xsd">
<rooms> <rooms>
<room id="0" caption="hall"> <room id="0" caption="hall">
<subroom id="0" closed="0" class="subroom"> <subroom id="0" closed="0" class="subroom">
<polygon caption="wall"> <polygon caption="wall">
<vertex px="40.0" py="2.0" /> <vertex px="40.0" py="2.0" />
<vertex px="-2.0" py="2.0" /> <vertex px="-2.0" py="2.0" />
<vertex px="-2.0" py="0.0" /> <vertex px="-2.0" py="0.0" />
<vertex px="40.0" py="0.0" /> <vertex px="40.0" py="0.0" />
</polygon> </polygon>
</subroom> </subroom>
</room> </room>
</rooms> </rooms>
<transitions> <transitions>
<!-- exits like crossings but between rooms or to outside (room with index <!-- exits like crossings but between rooms or to outside (room with index
= -1) --> = -1) -->
<transition id="0" caption="main exit" type="emergency" <transition id="0" caption="main exit" type="emergency"
room1_id="0" subroom1_id="0" room2_id="-1" subroom2_id="-1"> room1_id="0" subroom1_id="0" room2_id="-1" subroom2_id="-1">
<vertex px="40.0" py="0.0" /> <vertex px="40.0" py="0.0" />
<vertex px="40.0" py="2.0" /> <vertex px="40.0" py="2.0" />
</transition> </transition>
</transitions> </transitions>
</geometry> </geometry>
inputfiles/rimea_testcases/Test_1/RiMEATest1_ini.xml
View file @ 2e01c9dd
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<JuPedSim project="JPS-Project" version="0.5" <JuPedSim project="JPS-Project" version="0.5"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd"> xsi:noNamespaceSchemaLocation="xsd.jupedsim.org/jps_ini_core.xsd">
<!-- seed used for initialising random generator --> <!-- seed used for initialising random generator -->
<seed>1254</seed> <seed>1254</seed>
...@@ -15,7 +15,7 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd"> ...@@ -15,7 +15,7 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<!--<socket hostname="127.0.0.1" port="8989"/> --> <!--<socket hostname="127.0.0.1" port="8989"/> -->
</trajectories> </trajectories>
<!-- where to store the logs --> <!-- where to store the logs -->
<!--<logfile>log.txt</logfile> --> <logfile>RiMEATest1_log.txt</logfile>
<!-- traffic information: e.g closed doors --> <!-- traffic information: e.g closed doors -->
...@@ -26,15 +26,14 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd"> ...@@ -26,15 +26,14 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
</routing> </routing>
<!--persons information and distribution --> <!--persons information and distribution -->
<agents operational_model_id="1"> <agents operational_model_id="2"> <!-- use Gompertz -->
<agents_distribution> <agents_distribution>
<group group_id="0" agent_parameter_id="1" room_id="0" subroom_id="0" number="1" goal_id="-1" router_id="1" start_x="0" start_y="1" /> <group group_id="0" agent_parameter_id="1" room_id="0" subroom_id="0" number="1" goal_id="-1" router_id="1" start_x="0" start_y="1" />
</agents_distribution> </agents_distribution>
</agents> </agents>
<!-- These parameters may be overwritten --> <!-- These parameters may be overwritten -->
<!-- These parameters may be overwritten --> <operational_models>
<operational_models>
<model operational_model_id="1" description="gcfm"> <model operational_model_id="1" description="gcfm">
<model_parameters> <model_parameters>
<solver>euler</solver> <solver>euler</solver>
...@@ -65,7 +64,7 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd"> ...@@ -65,7 +64,7 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<model operational_model_id="2" description="gompertz"> <model operational_model_id="2" description="gompertz">
<model_parameters> <model_parameters>
<solver>euler</solver> <solver>euler</solver>
<stepsize>0.01</stepsize> <stepsize>0.001</stepsize>
<exit_crossing_strategy>3</exit_crossing_strategy> <exit_crossing_strategy>3</exit_crossing_strategy>
<linkedcells enabled="true" cell_size="2.2" /> <linkedcells enabled="true" cell_size="2.2" />
<force_ped nu="3" b="0.25" c="3.0"/> <force_ped nu="3" b="0.25" c="3.0"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment