updated Melbourne implementation config get properties commands

Author: carlhiggs

use-cases/melbourne/src/main/java/uk/cam/mrc/phm/MitoMEL.java

@@ -28,14 +28,14 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import static uk.cam.mrc.phm.util.MelbourneImplementationConfig.getMelbournePropertiesFile;
+import static uk.cam.mrc.phm.util.MelbourneImplementationConfig.getMelbourneProperties;
 
 public class MitoMEL {
 
     private static final Logger logger = LogManager.getLogger(MitoMEL.class);
 
     public static void main(String[] args) {
-        java.util.Properties mitoMelbourneProperties = getMelbournePropertiesFile(args[0]);
+        java.util.Properties mitoMelbourneProperties = getMelbourneProperties();
         String scenarioName = mitoMelbourneProperties.getProperty(Properties.SCENARIO_NAME);
         String scenarioYear = mitoMelbourneProperties.getProperty(Properties.SCENARIO_YEAR);
         String outputSubDirectory = "scenOutput/" + scenarioName + "/" + scenarioYear;

use-cases/melbourne/src/main/java/uk/cam/mrc/phm/util/MelbourneImplementationConfig.java

@@ -3,13 +3,16 @@
 import de.tum.bgu.msm.data.jobTypes.JobTypeFactory;
 import de.tum.bgu.msm.util.ImplementationConfig;
 import uk.cam.mrc.phm.jobTypes.MelbourneJobTypeFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
 
 public class MelbourneImplementationConfig implements ImplementationConfig {
 
+    private static final Logger logger = LogManager.getLogger(MelbourneImplementationConfig.class);
     private final static MelbourneImplementationConfig instance = new MelbourneImplementationConfig();
 
     private MelbourneImplementationConfig() {}