Changeset 258 in tmcsimulator

Timestamp:

02/11/2019 03:36:49 PM (7 years ago)

Author:

jdalbey

Message:

TrafficModelManager?: update to read json output destination from properties file.

Location:

trunk/src

Files:

• atmsdriver/model/Highways.java (modified) (1 diff)
• tmcsim/application.properties (modified) (1 diff)
• tmcsim/cadsimulator/managers/TrafficModelManager.java (modified) (4 diffs)

trunk/src/atmsdriver/model/Highways.java

@@ -347 +347 @@
             
             // Print the number of bytes the highways data message contains
-            System.out.println("BYTES: " + this.toCondensedFormat(false).toCharArray().length + 1);
+            System.out.println("Highways sending " + this.toCondensedFormat(false).toCharArray().length + 1 + "bytes to FEPSIM.");
             
             // Write the highways data over the socket

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Mon, 11 Feb 2019 11:45:31 -0800
+#Mon, 11 Feb 2019 16:19:24 -0800
 
-Application.revision=255
+Application.revision=257
 
-Application.buildnumber=92
+Application.buildnumber=94

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

@@ -63 +63 @@
         FEPSIM_IP_ADDR("FEPSim_IP_addr"),
         EVENTS_FILE("Events_File"),
-        OUTPUT_DEST("Output_Destination");
+        OUTPUT_DEST("Output_Destination"),
+        JSON_PATH("Json_Path");
         
         public String name;
@@ -102 +103 @@
      */
     private String currentClock = "";
-      
+    
+    /**
+     * Path for writing highway data to Json file.
+     */
+    private String jsonPath;
+    
     /**
      * Constructor. Loads the Properties file and initializes the
@@ -117 +123 @@
         {
             props = loadProperties(propertiesFile);
+            jsonPath = props.getProperty(PROPERTIES.JSON_PATH.name);
+            logger.logp(Level.INFO, "Traffic Managr", "Constructor", 
+                    "Highway network json output: " + jsonPath);
             // Initialize the highway model
             incidents = new HashMap<String, List<TrafficEvent>>();
@@ -455 +464 @@
                 {
                     // currently writes to local file
-                    out = new PrintWriter("highways.json");
+                    out = new PrintWriter(jsonPath);
                     out.print(geojson);
                     out.close();