mirror of
				https://github.com/Ahp06/SUMO_Emissions.git
				synced 2025-11-04 03:59:19 +00:00 
			
		
		
		
	Make polygons generation optional
This commit is contained in:
		@@ -8,6 +8,7 @@ from configurator import configurator
 | 
			
		||||
# Absolute path of the directory the script is in
 | 
			
		||||
SCRIPTDIR = os.path.dirname(__file__)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class TemplateTests(unittest.TestCase):
 | 
			
		||||
    def setUp(self):
 | 
			
		||||
        self.sim_name = 'test_simulation'
 | 
			
		||||
@@ -24,15 +25,20 @@ class TemplateTests(unittest.TestCase):
 | 
			
		||||
        tree = configurator.load_sumoconfig_template(self.sim_name)
 | 
			
		||||
        self.assertEqual(tree.find('input/net-file').get('value'), f'{self.sim_name}.net.xml')
 | 
			
		||||
        self.assertEqual(tree.find('input/route-files').get('value'), f'{self.sim_name}.rou.xml')
 | 
			
		||||
        self.assertEqual(tree.find('input/additional-files').get('value'), f'{self.sim_name}.poly.xml')
 | 
			
		||||
        self.assertEqual(tree.find('report/log').get('value'), f'{self.sim_name}.log')
 | 
			
		||||
 | 
			
		||||
    def test_load_sumoconfig_template_with_polygons(self):
 | 
			
		||||
        tree = configurator.load_sumoconfig_template(self.sim_name, generate_polygons=True)
 | 
			
		||||
        self.assertEqual(tree.find('input/net-file').get('value'), f'{self.sim_name}.net.xml')
 | 
			
		||||
        self.assertEqual(tree.find('input/route-files').get('value'), f'{self.sim_name}.rou.xml')
 | 
			
		||||
        self.assertEqual(tree.find('report/log').get('value'), f'{self.sim_name}.log')
 | 
			
		||||
        self.assertEqual(tree.find('input/additional-files').get('value'), f'{self.sim_name}.poly.xml')
 | 
			
		||||
 | 
			
		||||
    def test_load_sumoconfig_template_with_routefiles(self):
 | 
			
		||||
        routefiles = (f'{self.sim_name}.bus.rou.xml', f'{self.sim_name}.passenger.rou.xml')
 | 
			
		||||
        tree = configurator.load_sumoconfig_template(self.sim_name, routefiles)
 | 
			
		||||
        self.assertEqual(tree.find('input/net-file').get('value'), f'{self.sim_name}.net.xml')
 | 
			
		||||
        self.assertEqual(tree.find('input/route-files').get('value'), ','.join(routefiles))
 | 
			
		||||
        self.assertEqual(tree.find('input/additional-files').get('value'), f'{self.sim_name}.poly.xml')
 | 
			
		||||
        self.assertEqual(tree.find('report/log').get('value'), f'{self.sim_name}.log')
 | 
			
		||||
 | 
			
		||||
    def test_load_polyconvert_template(self):
 | 
			
		||||
@@ -61,7 +67,12 @@ class GenerationTests(unittest.TestCase):
 | 
			
		||||
 | 
			
		||||
    def test_generate_scenario(self):
 | 
			
		||||
        osm_file = os.path.join(SCRIPTDIR, 'sample.osm')
 | 
			
		||||
        configurator.generate_scenario(osm_file, self.sim_path, self.sim_name)
 | 
			
		||||
        configurator.generate_scenario(osm_file, self.sim_path, self.sim_name, generate_polygons=False)
 | 
			
		||||
        self.assert_is_file(os.path.join(self.sim_path, f'{self.sim_name}.net.xml'))
 | 
			
		||||
 | 
			
		||||
    def test_generate_scenario_with_polygons(self):
 | 
			
		||||
        osm_file = os.path.join(SCRIPTDIR, 'sample.osm')
 | 
			
		||||
        configurator.generate_scenario(osm_file, self.sim_path, self.sim_name, generate_polygons=True)
 | 
			
		||||
        self.assert_is_dir(self.sim_path)
 | 
			
		||||
        generated_files = [
 | 
			
		||||
            f'{self.sim_name}.poly.xml',
 | 
			
		||||
@@ -75,7 +86,7 @@ class GenerationTests(unittest.TestCase):
 | 
			
		||||
        osm_file = os.path.join(SCRIPTDIR, 'sample.osm')
 | 
			
		||||
        trips_file = os.path.join(self.sim_path, f'{self.sim_name}.trips.xml')
 | 
			
		||||
        configurator.generate_scenario(osm_file, self.sim_path, self.sim_name)
 | 
			
		||||
        routefiles = configurator.generate_mobility(self.sim_path, self.sim_name)
 | 
			
		||||
        routefiles = configurator.generate_mobility(self.sim_path, self.sim_name, vclasses=('passenger', 'truck'))
 | 
			
		||||
 | 
			
		||||
        self.assert_is_file(trips_file)
 | 
			
		||||
        for f in routefiles:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user