Fixing tests (paths) from restructure

agentsoz · Jan 16, 2018 · 8ee3d73 · 8ee3d73
1 parent 6197435
commit 8ee3d73
Show file tree

Hide file tree

Showing 54 changed files with 12 additions and 12 deletions.
diff --git a/examples/bushfire/scenarios/.gitignore b/examples/bushfire/scenarios/.gitignore
@@ -0,0 +1,3 @@
+jill.out
+jill.log
+scenario.log
diff --git a/...radford-newstead-fire-crossing/.gitignore → ...ord-newstead-fire-crossing-400/.gitignore b/...radford-newstead-fire-crossing/.gitignore → ...ord-newstead-fire-crossing-400/.gitignore
diff --git a/...sing/bradford-newstead-fire-crossing.json → ...-400/bradford-newstead-fire-crossing.json b/...sing/bradford-newstead-fire-crossing.json → ...-400/bradford-newstead-fire-crossing.json
diff --git a/...ford-newstead-fire-crossing/geography.xsd → ...-newstead-fire-crossing-400/geography.xsd b/...ford-newstead-fire-crossing/geography.xsd → ...-newstead-fire-crossing-400/geography.xsd
diff --git a/.../bradford-newstead-fire-crossing/main.xsd → ...dford-newstead-fire-crossing-400/main.xsd b/.../bradford-newstead-fire-crossing/main.xsd → ...dford-newstead-fire-crossing-400/main.xsd
diff --git a/...newstead-fire-crossing/scenario_fire.json → ...tead-fire-crossing-400/scenario_fire.json b/...newstead-fire-crossing/scenario_fire.json → ...tead-fire-crossing-400/scenario_fire.json
diff --git a/...tead-fire-crossing/scenario_geography.xml → ...-fire-crossing-400/scenario_geography.xml b/...tead-fire-crossing/scenario_geography.xml → ...-fire-crossing-400/scenario_geography.xml
diff --git a/...-newstead-fire-crossing/scenario_main.xml → ...stead-fire-crossing-400/scenario_main.xml b/...-newstead-fire-crossing/scenario_main.xml → ...stead-fire-crossing-400/scenario_main.xml
diff --git a/...ad-fire-crossing/scenario_matsim_main.xml → ...ire-crossing-400/scenario_matsim_main.xml b/...ad-fire-crossing/scenario_matsim_main.xml → ...ire-crossing-400/scenario_matsim_main.xml
diff --git a/...e-crossing/scenario_matsim_network.xml.gz → ...ossing-400/scenario_matsim_network.xml.gz b/...e-crossing/scenario_matsim_network.xml.gz → ...ossing-400/scenario_matsim_network.xml.gz
diff --git a/...scenario_matsim_network_change_events.xml → ...scenario_matsim_network_change_events.xml b/...scenario_matsim_network_change_events.xml → ...scenario_matsim_network_change_events.xml
diff --git a/...d-fire-crossing/scenario_matsim_plans.xml → ...re-crossing-400/scenario_matsim_plans.xml b/...d-fire-crossing/scenario_matsim_plans.xml → ...re-crossing-400/scenario_matsim_plans.xml
diff --git a/...ander-shire/campbells-creek-01/.gitignore → ...xander-shire/campbells-creek-1/.gitignore b/...ander-shire/campbells-creek-01/.gitignore → ...xander-shire/campbells-creek-1/.gitignore
diff --git a/...eek-01/2017-11-15-campbells-creek-01.json → ...reek-1/2017-11-15-campbells-creek-01.json b/...eek-01/2017-11-15-campbells-creek-01.json → ...reek-1/2017-11-15-campbells-creek-01.json
diff --git a/...er-shire/campbells-creek-01/geography.xsd → ...der-shire/campbells-creek-1/geography.xsd b/...er-shire/campbells-creek-01/geography.xsd → ...der-shire/campbells-creek-1/geography.xsd
diff --git a/...exander-shire/campbells-creek-01/main.xsd → ...lexander-shire/campbells-creek-1/main.xsd b/...exander-shire/campbells-creek-01/main.xsd → ...lexander-shire/campbells-creek-1/main.xsd
diff --git a/...ire/campbells-creek-01/scenario_fire.json → ...hire/campbells-creek-1/scenario_fire.json b/...ire/campbells-creek-01/scenario_fire.json → ...hire/campbells-creek-1/scenario_fire.json
diff --git a/...campbells-creek-01/scenario_geography.xml → .../campbells-creek-1/scenario_geography.xml b/...campbells-creek-01/scenario_geography.xml → .../campbells-creek-1/scenario_geography.xml
diff --git a/...hire/campbells-creek-01/scenario_main.xml → ...shire/campbells-creek-1/scenario_main.xml b/...hire/campbells-creek-01/scenario_main.xml → ...shire/campbells-creek-1/scenario_main.xml
diff --git a/...mpbells-creek-01/scenario_matsim_main.xml → ...ampbells-creek-1/scenario_matsim_main.xml b/...mpbells-creek-01/scenario_matsim_main.xml → ...ampbells-creek-1/scenario_matsim_main.xml
diff --git a/...s-creek-01/scenario_matsim_network.xml.gz → ...ls-creek-1/scenario_matsim_network.xml.gz b/...s-creek-01/scenario_matsim_network.xml.gz → ...ls-creek-1/scenario_matsim_network.xml.gz
diff --git a/...scenario_matsim_network_change_events.xml → ...scenario_matsim_network_change_events.xml b/...scenario_matsim_network_change_events.xml → ...scenario_matsim_network_change_events.xml
diff --git a/...pbells-creek-01/scenario_matsim_plans.xml → ...mpbells-creek-1/scenario_matsim_plans.xml b/...pbells-creek-01/scenario_matsim_plans.xml → ...mpbells-creek-1/scenario_matsim_plans.xml
diff --git a/...lexander-shire/campbells-creek/.gitignore → ...ander-shire/campbells-creek-50/.gitignore b/...lexander-shire/campbells-creek/.gitignore → ...ander-shire/campbells-creek-50/.gitignore
diff --git a/...hire/campbells-creek/campbells-creek.json → ...e/campbells-creek-50/campbells-creek.json b/...hire/campbells-creek/campbells-creek.json → ...e/campbells-creek-50/campbells-creek.json
diff --git a/...ander-shire/campbells-creek/geography.xsd → ...er-shire/campbells-creek-50/geography.xsd b/...ander-shire/campbells-creek/geography.xsd → ...er-shire/campbells-creek-50/geography.xsd
diff --git a/...-alexander-shire/campbells-creek/main.xsd → ...exander-shire/campbells-creek-50/main.xsd b/...-alexander-shire/campbells-creek/main.xsd → ...exander-shire/campbells-creek-50/main.xsd
diff --git a/...-shire/campbells-creek/scenario_fire.json → ...ire/campbells-creek-50/scenario_fire.json b/...-shire/campbells-creek/scenario_fire.json → ...ire/campbells-creek-50/scenario_fire.json
diff --git a/...re/campbells-creek/scenario_geography.xml → ...campbells-creek-50/scenario_geography.xml b/...re/campbells-creek/scenario_geography.xml → ...campbells-creek-50/scenario_geography.xml
diff --git a/...r-shire/campbells-creek/scenario_main.xml → ...hire/campbells-creek-50/scenario_main.xml b/...r-shire/campbells-creek/scenario_main.xml → ...hire/campbells-creek-50/scenario_main.xml
diff --git a/.../campbells-creek/scenario_matsim_main.xml → ...mpbells-creek-50/scenario_matsim_main.xml b/.../campbells-creek/scenario_matsim_main.xml → ...mpbells-creek-50/scenario_matsim_main.xml
diff --git a/...ells-creek/scenario_matsim_network.xml.gz → ...s-creek-50/scenario_matsim_network.xml.gz b/...ells-creek/scenario_matsim_network.xml.gz → ...s-creek-50/scenario_matsim_network.xml.gz
diff --git a/...scenario_matsim_network_change_events.xml → ...scenario_matsim_network_change_events.xml b/...scenario_matsim_network_change_events.xml → ...scenario_matsim_network_change_events.xml
diff --git a/...campbells-creek/scenario_matsim_plans.xml → ...pbells-creek-50/scenario_matsim_plans.xml b/...campbells-creek/scenario_matsim_plans.xml → ...pbells-creek-50/scenario_matsim_plans.xml
diff --git a/...unt-alexander-shire/maldon600/maldon.json → ...nt-alexander-shire/maldon-600/maldon.json b/...unt-alexander-shire/maldon600/maldon.json → ...nt-alexander-shire/maldon-600/maldon.json
diff --git a/...xander-shire/maldon600/scenario_fire.json → ...ander-shire/maldon-600/scenario_fire.json b/...xander-shire/maldon600/scenario_fire.json → ...ander-shire/maldon-600/scenario_fire.json
diff --git a/...er-shire/maldon600/scenario_geography.xml → ...r-shire/maldon-600/scenario_geography.xml b/...er-shire/maldon600/scenario_geography.xml → ...r-shire/maldon-600/scenario_geography.xml
diff --git a/...exander-shire/maldon600/scenario_main.xml → ...xander-shire/maldon-600/scenario_main.xml b/...exander-shire/maldon600/scenario_main.xml → ...xander-shire/maldon-600/scenario_main.xml
@@ -41,7 +41,7 @@ Specifies the top level MATSim configuration file for this scenario
     bushfire root directory, e.g., ./sample_data/maldon.xml
 ============================================================================-->
 <matsimfile>
-scenarios/mount-alexander-shire/maldon600/scenario_matsim_main.xml
+scenarios/mount-alexander-shire/maldon-600/scenario_matsim_main.xml
 </matsimfile>
 
 <!--===========================================================================
@@ -60,7 +60,7 @@ Specifies the timestamped fire progression fire model file
 For an example of the fire input file see ./sample_data/maldon_fire.json
 ============================================================================-->
 <firefile>
-  <name>scenarios/mount-alexander-shire/maldon600/scenario_fire.json</name>
+  <name>scenarios/mount-alexander-shire/maldon-600/scenario_fire.json</name>
   <coordinates>latlong</coordinates>
   <format>geojson</format>
 </firefile>
@@ -78,7 +78,7 @@ Specifies the geography file for this scenario
 For an example of the geography file see ./sample_data/maldon_geography.json
 ============================================================================-->
 <geographyfile>
-  <name>scenarios/mount-alexander-shire/maldon600/scenario_geography.xml</name>
+  <name>scenarios/mount-alexander-shire/maldon-600/scenario_geography.xml</name>
 </geographyfile>
 
 <!--===========================================================================

diff --git a/...-shire/maldon600/scenario_matsim_main.xml → ...shire/maldon-600/scenario_matsim_main.xml b/...-shire/maldon600/scenario_matsim_main.xml → ...shire/maldon-600/scenario_matsim_main.xml
@@ -31,7 +31,7 @@
 	</module>
 
 	<module name="network">
-		<param name="inputNetworkFile" value="../scenario_matsim_network.xml.gz" />
+		<param name="inputNetworkFile" value="../mount_alexander_shire_network.xml.gz" />
 		<param name= "timeVariantNetwork" value= "true" />
 		<param name= "inputChangeEventsFile" value= "scenario_matsim_network_change_events.xml.gz" />
 	</module>

diff --git a/...nario_matsim_network_change_events.xml.gz → ...nario_matsim_network_change_events.xml.gz b/...nario_matsim_network_change_events.xml.gz → ...nario_matsim_network_change_events.xml.gz
diff --git a/...shire/maldon600/scenario_matsim_plans.xml → ...hire/maldon-600/scenario_matsim_plans.xml b/...shire/maldon600/scenario_matsim_plans.xml → ...hire/maldon-600/scenario_matsim_plans.xml
diff --git a/examples/bushfire/scenarios/mount-alexander-shire/maldon600/.gitignore b/examples/bushfire/scenarios/mount-alexander-shire/maldon600/.gitignore
diff --git a/...s/mount-alexander-shire/sutton/.gitignore → ...nt-alexander-shire/sutton-6000/.gitignore b/...s/mount-alexander-shire/sutton/.gitignore → ...nt-alexander-shire/sutton-6000/.gitignore
diff --git a/...ount-alexander-shire/sutton/geography.xsd → ...alexander-shire/sutton-6000/geography.xsd b/...ount-alexander-shire/sutton/geography.xsd → ...alexander-shire/sutton-6000/geography.xsd
diff --git a/...ios/mount-alexander-shire/sutton/main.xsd → ...ount-alexander-shire/sutton-6000/main.xsd b/...ios/mount-alexander-shire/sutton/main.xsd → ...ount-alexander-shire/sutton-6000/main.xsd
diff --git a/...alexander-shire/sutton/scenario_fire.json → ...nder-shire/sutton-6000/scenario_fire.json b/...alexander-shire/sutton/scenario_fire.json → ...nder-shire/sutton-6000/scenario_fire.json
diff --git a/...ander-shire/sutton/scenario_geography.xml → ...-shire/sutton-6000/scenario_geography.xml b/...ander-shire/sutton/scenario_geography.xml → ...-shire/sutton-6000/scenario_geography.xml
diff --git a/...-alexander-shire/sutton/scenario_main.xml → ...ander-shire/sutton-6000/scenario_main.xml b/...-alexander-shire/sutton/scenario_main.xml → ...ander-shire/sutton-6000/scenario_main.xml
diff --git a/...der-shire/sutton/scenario_matsim_main.xml → ...hire/sutton-6000/scenario_matsim_main.xml b/...der-shire/sutton/scenario_matsim_main.xml → ...hire/sutton-6000/scenario_matsim_main.xml
diff --git a/...ire/sutton/scenario_matsim_network.xml.gz → ...utton-6000/scenario_matsim_network.xml.gz b/...ire/sutton/scenario_matsim_network.xml.gz → ...utton-6000/scenario_matsim_network.xml.gz
diff --git a/...scenario_matsim_network_change_events.xml → ...scenario_matsim_network_change_events.xml b/...scenario_matsim_network_change_events.xml → ...scenario_matsim_network_change_events.xml
diff --git a/...er-shire/sutton/scenario_matsim_plans.xml → ...ire/sutton-6000/scenario_matsim_plans.xml b/...er-shire/sutton/scenario_matsim_plans.xml → ...ire/sutton-6000/scenario_matsim_plans.xml
diff --git a/.../mount-alexander-shire/sutton/sutton.json → ...t-alexander-shire/sutton-6000/sutton.json b/.../mount-alexander-shire/sutton/sutton.json → ...t-alexander-shire/sutton-6000/sutton.json
diff --git a/examples/bushfire/src/test/java/io/github/agentsoz/ees/MainMaldon600Test.java b/examples/bushfire/src/test/java/io/github/agentsoz/ees/MainMaldon600Test.java
@@ -36,18 +36,18 @@ public void testMaldon600() {
 --jillconfig "--config={agents:[{classname:Resident, args:null, count:600}],logLevel: WARN,logFile: \"/var/www/data/user-data/2017-10-23-ds-maldon/scenario/jill.log\",programOutputFile: \"/var/www/data/user-data/2017-10-23-ds-maldon/scenario/jill.out\"}"
 		 */
 		String [] args = {
-				"--config",  "scenarios/mount-alexander-shire/maldon600/scenario_main.xml",
-				"--logfile", "scenarios/mount-alexander-shire/maldon600/scenario.log",
+				"--config",  "scenarios/mount-alexander-shire/maldon-600/scenario_main.xml",
+				"--logfile", "scenarios/mount-alexander-shire/maldon-600/scenario.log",
 				"--loglevel", "INFO",
 				//				"--plan-selection-policy", "FIRST", // ensures it is deterministic, as default is RANDOM
 				"--seed", "12345",
-				"--safeline-output-file-pattern", "scenarios/mount-alexander-shire/maldon600/safeline.%d%.out",
+				"--safeline-output-file-pattern", "scenarios/mount-alexander-shire/maldon-600/safeline.%d%.out",
 				"--matsim-output-directory", utils.getOutputDirectory(),
 				"--jillconfig", "--config={"+
 						"agents:[{classname:io.github.agentsoz.ees.agents.Resident, args:null, count:600}],"+
 						"logLevel: WARN,"+
-						"logFile: \"scenarios/mount-alexander-shire/maldon600/jill.log\","+
-						"programOutputFile: \"scenarios/mount-alexander-shire/maldon600/jill.out\","+
+						"logFile: \"scenarios/mount-alexander-shire/maldon-600/jill.log\","+
+						"programOutputFile: \"scenarios/mount-alexander-shire/maldon-600/jill.out\","+
 						"randomSeed: 12345"+ // jill random seed
 						//"numThreads: 1"+ // run jill in single-threaded mode so logs are deterministic
 						"}"