Changeset 345 in tmcsimulator for trunk/src/tmcsim

Timestamp:

03/24/2019 09:48:29 AM (7 years ago)

Author:

jdalbey

Message:

minor changes to output messages to get unit tests to pass. All passing now.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• cadsimulator/managers/TrafficModelManager.java (modified) (3 diffs)
• utilities/BuildHighwayFile.java (modified) (2 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sat, 23 Mar 2019 19:09:36 -0700
+#Sun, 24 Mar 2019 11:13:40 -0700
 
-Application.revision=342
+Application.revision=344
 
-Application.buildnumber=108
+Application.buildnumber=110

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

@@ -124 +124 @@
             props = loadProperties(propertiesFile);
             jsonPath = props.getProperty(PROPERTIES.JSON_PATH.name);
-            logger.logp(Level.INFO, "Traffic Managr", "Constructor", 
-                    "Highway network json output: " + jsonPath);
+            //logger.logp(Level.INFO, "Traffic Manager", "Constructor", 
+            //        "Highway network json output: " + jsonPath);
             // Initialize the highway model
             incidents = new HashMap<String, List<TrafficEvent>>();
@@ -422 +422 @@
                  // Write the highway network status to the Console
                  System.out.println(highways.toString());
-                // Output the highway model 
-                String geojson = highways.toJson();
-                //System.out.println(geojson); // diagnostic
-                PrintWriter out;
-                try
-                {
-                    out = new PrintWriter("highways.json");
-                    out.print(geojson);
-                    out.close();
-                }
-                catch (FileNotFoundException ex)
-                {
-                    Logger.getLogger(GoogleMapAnimator.class.getName()).log(Level.SEVERE, null, ex);
-                }
-                // Wait for Google Map to process the data we just sent
-                try
-                {
-                    Thread.sleep(5000);
+                // Pause the thread
+                try
+                {
+                    Thread.sleep(10000);
                 }
                 catch (InterruptedException ie)
@@ -478 +464 @@
                 try
                 {
-                    Thread.sleep(30000);
+                    Thread.sleep(10000);
                 }
                 catch (InterruptedException ie)

trunk/src/tmcsim/utilities/BuildHighwayFile.java

@@ -281 +281 @@
      * in loop file.
      */
-    private void showLeftoverVDS()
+    public void showLeftoverVDS()
     {
         Set<String> vdsItems = vdsDict.keySet(); // get all the VDS ids
@@ -303 +303 @@
         app.createLanelookup();
         app.createHighwayFile();
-        app.showLeftoverVDS();
         System.out.println("Build complete, output file: "+highwayFile);
     }