73 Selecting specific Input folder (and/or Euromod Policy Schedule) per-run via config file

config/default.yml

@@ -59,4 +59,9 @@ collector_args:
 #    persistBenefitUnits: false
 #    persistHouseholds: false
 #    dataDumpStartTime: 0L
-#    dataDumpTimePeriod: 1.0
+#    dataDumpTimePeriod: 1.0
+
+parameter_args:
+#  input_directory: input
+#  input_directory_initial_populations: input/InitialPopulations
+#  euromod_output_directory: input/EUROMODoutput

src/main/java/simpaths/data/startingpop/DataParser.java

@@ -421,7 +421,7 @@ public static void databaseFromCSV(Country country, boolean showGui) {
 		Connection conn = null;
 		try {
 			Class.forName("org.h2.Driver");
-			conn = DriverManager.getConnection("jdbc:h2:file:./input" + File.separator + "input;TRACE_LEVEL_FILE=0;TRACE_LEVEL_SYSTEM_OUT=0;AUTO_SERVER=TRUE", "sa", "");
+			conn = DriverManager.getConnection("jdbc:h2:file:" + Parameters.getInputDirectory() + "input;TRACE_LEVEL_FILE=0;TRACE_LEVEL_SYSTEM_OUT=0;AUTO_SERVER=TRUE", "sa", "");
 
 			Parameters.setPopulationInitialisationInputFileName("population_initial_" + country.toString());
 

src/main/java/simpaths/experiment/SimPathsMultiRun.java

@@ -13,6 +13,7 @@
 import simpaths.data.Parameters;
 import simpaths.data.XLSXfileWriter;
 import simpaths.model.SimPathsModel;
+import microsim.data.db.Experiment;
 import microsim.data.MultiKeyCoefficientMap;
 import microsim.data.excel.ExcelAssistant;
 import microsim.engine.MultiRun;
@@ -73,21 +74,26 @@ public static void main(String[] args) {
 			// if parseYamlConfig returns false (indicating bad filename passed), exit main
 			return;
 		}
-		
+
 		if (parameterArgs != null)
 			updateParameters(parameterArgs);
-
-
 		// set default values for country and start year
-		MultiKeyCoefficientMap lastDatabaseCountryAndYear = ExcelAssistant.loadCoefficientMap("input" + File.separator + Parameters.DatabaseCountryYearFilename + ".xlsx", "Data", 1, 1);
-		if (lastDatabaseCountryAndYear.keySet().stream().anyMatch(key -> key.toString().equals("MultiKey[IT]"))) {
-			countryString = "Italy";
-		} else {
+		MultiKeyCoefficientMap lastDatabaseCountryAndYear = ExcelAssistant.loadCoefficientMap(Parameters.getInputDirectory() + File.separator + Parameters.DatabaseCountryYearFilename + ".xlsx", "Data", 1, 1);
+		try {
+			if (lastDatabaseCountryAndYear.keySet().stream().anyMatch(key -> key.toString().equals("MultiKey[IT]"))) {
+				countryString = "Italy";
+			} else {
+				countryString = "United Kingdom";
+			}
+			String valueYear = lastDatabaseCountryAndYear.getValue(country.toString()).toString();
+			startYear = Integer.parseInt(valueYear);
+		} catch (NullPointerException e) {
+			System.out.println("No last database country and year found.");
 			countryString = "United Kingdom";
+			startYear = 2019;
 		}
+
 		country = Country.getCountryFromNameString(countryString);
-		String valueYear = lastDatabaseCountryAndYear.getValue(country.toString()).toString();
-		startYear = Integer.parseInt(valueYear);
 
 		if (innovationArgs!=null)
 			updateLocalParameters(innovationArgs);
@@ -402,6 +408,20 @@ public static void updateParameters(Map<String, Object> parameter_args) {
 			Object value = entry.getValue();
 
 			switch (key) {
+				case "working_directory":
+					Parameters.setWorkingDirectory(value.toString());
+					setExperimentFolders(value.toString(), true);
+					break;
+				case "input_directory":
+					Parameters.setInputDirectory(value.toString());
+					setExperimentFolders();
+					break;
+				case "input_directory_initial_populations":
+					Parameters.setInputDirectoryInitialPopulations(value.toString());
+					break;
+				case "euromod_output_directory":
+					Parameters.setEuromodOutputDirectory(value.toString());
+					break;
 				default:
 					try {
 						Field field = Parameters.class.getDeclaredField(key);
@@ -428,6 +448,37 @@ public static void updateParameters(Map<String, Object> parameter_args) {
 
 	}
 
+	public static void setExperimentFolders() {
+
+		try {
+			Field inputDir = Experiment.class.getDeclaredField("inputFolder");
+			inputDir.setAccessible(true);
+			inputDir.set(Experiment.class, Parameters.getInputDirectory());
+			inputDir.setAccessible(false);
+		} catch (NoSuchFieldException | IllegalAccessException e) {
+			e.printStackTrace();
+		}
+
+	}
+	public static void setExperimentFolders(String root_dir, boolean working_dir) {
+
+		try {
+			Field inputDir = Experiment.class.getDeclaredField("inputFolder");
+			inputDir.setAccessible(true);
+			inputDir.set(null, root_dir + File.separator + "input");
+			inputDir.setAccessible(false);
+			if (working_dir) {
+				Field outputDir = Experiment.class.getDeclaredField("outputRootFolder");
+				outputDir.setAccessible(true);
+				outputDir.set(null, root_dir + File.separator + "output");
+				outputDir.setAccessible(false);
+			}
+		} catch (NoSuchFieldException | IllegalAccessException e) {
+			e.printStackTrace();
+		}
+
+	}
+
 	private static Object convertToType(Object value, Class<?> targetType) {
 		// Convert the YAML value to the target type
 		if (int.class.equals(targetType)) {
@@ -453,7 +504,7 @@ public void buildExperiment(SimulationEngine engine) {
 
 		SimPathsModel model = new SimPathsModel(Country.getCountryFromNameString(countryString), startYear);
 		if (persist_population) model.setPersistPopulation(true);
-		if (persist_root) model.setPersistDatabasePath("./input/input");
+		if (persist_root) model.setPersistDatabasePath(Parameters.getInputDirectory() + "input");
 		updateLocalParameters(model);
 		if (modelArgs != null)
 			updateParameters(model, modelArgs);

src/main/java/simpaths/experiment/SimPathsStart.java

@@ -84,7 +84,7 @@ public static void main(String[] args) {
 		}
 
 		//Adjust the country and year to the value read from Excel, which is updated when the database is rebuilt. Otherwise it will set the country and year to the last one used to build the database
-		MultiKeyCoefficientMap lastDatabaseCountryAndYear = ExcelAssistant.loadCoefficientMap("input" + File.separator + Parameters.DatabaseCountryYearFilename + ".xlsx", "Data", 1, 1);
+		MultiKeyCoefficientMap lastDatabaseCountryAndYear = ExcelAssistant.loadCoefficientMap(Parameters.getInputDirectory() + Parameters.DatabaseCountryYearFilename + ".xlsx", "Data", 1, 1);
 		if (lastDatabaseCountryAndYear.keySet().stream().anyMatch(key -> key.toString().equals("MultiKey[IT]"))) {
 			country = Country.IT;
 		} else {
@@ -245,8 +245,8 @@ private static void runGUIlessSetup(int option) throws FileNotFoundException {
 
 		// Create EUROMODPolicySchedule input from files
 		if (!rewritePolicySchedule &&
-				!new File("input" + File.separator + Parameters.EUROMODpolicyScheduleFilename + ".xlsx").exists()) {
-			throw new FileNotFoundException("Policy Schedule file '"+ File.separator + "input" + File.separator +
+				!new File(Parameters.getInputDirectory() + Parameters.EUROMODpolicyScheduleFilename + ".xlsx").exists()) {
+			throw new FileNotFoundException("Policy Schedule file '"+ File.separator + Parameters.getInputDirectory() +
 					Parameters.EUROMODpolicyScheduleFilename + ".xlsx` doesn't exist. " +
 					"Provide excel file or use `--rewrite-policy-schedule` to re-construct from available policy files.");
 		};
@@ -378,7 +378,7 @@ private static void runGUIdialog() {
 			// call to select policies
 
 			// load previously stored values for policy description and initiation year
-			MultiKeyCoefficientMap previousEUROMODfileInfo = ExcelAssistant.loadCoefficientMap("input" + File.separator + Parameters.EUROMODpolicyScheduleFilename + ".xlsx", country.toString(), 1, 3);
+			MultiKeyCoefficientMap previousEUROMODfileInfo = ExcelAssistant.loadCoefficientMap(Parameters.getInputDirectory() + Parameters.EUROMODpolicyScheduleFilename + ".xlsx", country.toString(), 1, 3);
 			Collection<File> euromodOutputTextFiles = FileUtils.listFiles(new File(Parameters.getEuromodOutputDirectory()), new String[]{"txt"}, false);
 			Iterator<File> fIter = euromodOutputTextFiles.iterator();
 			while (fIter.hasNext()) {

src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java

@@ -63,7 +63,7 @@ public static void databaseFromCSV(Country country, int startYear, boolean isVis
         Connection conn = null;
         try {
             Class.forName("org.h2.Driver");
-            conn = DriverManager.getConnection("jdbc:h2:file:./input" + File.separator + "input;TRACE_LEVEL_FILE=0;TRACE_LEVEL_SYSTEM_OUT=0;AUTO_SERVER=TRUE", "sa", "");
+            conn = DriverManager.getConnection("jdbc:h2:file:" + Parameters.getInputDirectory() + "input;TRACE_LEVEL_FILE=0;TRACE_LEVEL_SYSTEM_OUT=0;AUTO_SERVER=TRUE", "sa", "");
 
             createTaxDonorTables(conn, country, startYear);
             updateDefaultDonorTables(conn, country);
@@ -606,8 +606,10 @@ public static void populateDonorTaxUnitTables(Country country, boolean showGui)
         // establish session for database link
         EntityTransaction txn = null;
         try {
-
-            EntityManager em = Persistence.createEntityManagerFactory("tax-database").createEntityManager();
+            // access database and obtain donor pool
+            Map propertyMap = new HashMap();
+            propertyMap.put("hibernate.connection.url", "jdbc:h2:file:" + Parameters.getInputDirectory() + "input" + ";TRACE_LEVEL_FILE=0;TRACE_LEVEL_SYSTEM_OUT=0;AUTO_SERVER=TRUE");
+            EntityManager em = Persistence.createEntityManagerFactory("tax-database", propertyMap).createEntityManager();
             txn = em.getTransaction();
             txn.begin();
 

src/test/java/simpaths/model/PersonTest.java

@@ -27,6 +27,8 @@ class WithLawrenceParameters {
             @BeforeEach
             public void setupLawrenceCoefficients() {
 
+                Parameters.setInputDirectory("src/test/java/simpaths/testinput");
+
                 Parameters.eq5dConversionParameters = "lawrence";
                 Parameters.loadEQ5DParameters("UK", 8);
 
@@ -70,6 +72,8 @@ class WithFranksParameters {
             @BeforeEach
             public void setupFranksCoefficients() {
 
+                Parameters.setInputDirectory("src/test/java/simpaths/testinput");
+
                 Parameters.eq5dConversionParameters = "franks";
                 Parameters.loadEQ5DParameters("UK", 8);