Changeset 407 in tmcsimulator for trunk/src/tmcsim

Timestamp:

05/16/2019 01:02:37 PM (7 years ago)

Author:

jdalbey

Message:

Fix for #155 to make simulation time filename configurable.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• cadsimulator/CADServer.java (modified) (2 diffs)
• cadsimulator/Coordinator.java (modified) (4 diffs)
• cadsimulator/managers/TrafficModelManager.java (modified) (2 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Thu, 25 Apr 2019 16:57:59 -0700
+#Thu, 16 May 2019 14:30:48 -0700
 
-Application.revision=397
+Application.revision=406
 
-Application.buildnumber=137
+Application.buildnumber=138

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -129 +129 @@
          * Class name of desired user interface.
          */
-        USER_INTERFACE("UserInterface");
+        USER_INTERFACE("UserInterface"),
+        /**
+         *  Filepath to which is written the simulation time.
+         */
+        ELAPSED_TIME_FILE("ElapsedTimeFile");
+        
         public String name;
 
@@ -240 +245 @@
             theModel = new CADSimulatorState();
             theModel.addObserver(theViewer);
-
-            theCoordinator = new Coordinator(theModel);
+            /** Load the simulation time filename from properties */
+            String simTimeFilename =
+                    cadServerProperties.getProperty(
+                    CAD_PROPERTIES.ELAPSED_TIME_FILE.name);
+            if (simTimeFilename == null)
+            {
+                cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor",
+                        propertiesFile + " missing property for " + CAD_PROPERTIES.ELAPSED_TIME_FILE.name);
+                throw new SimulationException(SimulationException.PROPERTY_MISSING_ERROR);
+            }
+            theCoordinator = new Coordinator(theModel, simTimeFilename);
 
             startRegistry(Integer.parseInt(

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -31 +31 @@
 import tmcsim.cadsimulator.managers.ParamicsSimulationManager;
 import tmcsim.cadsimulator.managers.SimulationClockManager;
+import tmcsim.cadsimulator.managers.TrafficModelManager;
+import static tmcsim.cadsimulator.managers.TrafficModelManager.loadProperties;
 import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.client.cadclientgui.CardfileReader;
@@ -96 +98 @@
      * The name of the file where the simulation clock time is written
      */
-    public static final String kSimClockFilename = "webapps" + 
+    private String kSimClockFilename = "webapps" + 
             System.getProperty("file.separator") + "dynamicdata" + 
-            System.getProperty("file.separator") + "sim_elapsedtime.json";
+            System.getProperty("file.separator") + "sim_elapsedtime.json";        
     /**
      * Error logger.
@@ -119 +121 @@
     private static CardfileData cardfileData;
     private CADSimulatorState cadModel;
-
+    
     /**
      * Constructor. Call UnicastRemoteObject constructor and call
@@ -126 +128 @@
      * @throws RemoteException
      */
-    public Coordinator(CADSimulatorState model) throws RemoteException
+    public Coordinator(CADSimulatorState model, String simTimeFilename) throws RemoteException
     {
         super();
         cadModel = model;
+        kSimClockFilename = simTimeFilename;
         clientList = new LinkedList<CADClientInterface>();
         cadData = new CADData();

trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java

@@ -64 +64 @@
         EVENTS_FILE("Events_File"),
         OUTPUT_DEST("Output_Destination"),
-        JSON_PATH("Json_Path");
+        HIGHWAY_STATUS_FILE("Highway_Status_File");
         
         public String name;
@@ -123 +123 @@
         {
             props = loadProperties(propertiesFile);
-            jsonPath = props.getProperty(PROPERTIES.JSON_PATH.name);
+            jsonPath = props.getProperty(PROPERTIES.HIGHWAY_STATUS_FILE.name);
             //logger.logp(Level.INFO, "Traffic Manager", "Constructor", 
             //        "Highway network json output: " + jsonPath);