Changeset 345 in tmcsimulator for trunk

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

Files:

• paramics_communicator.log (modified) (1 diff)
• paramics_status.xml (modified) (1 diff)
• src/atmsdriver/model/Highways.java (modified) (2 diffs)
• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/cadsimulator/managers/TrafficModelManager.java (modified) (3 diffs)
• src/tmcsim/utilities/BuildHighwayFile.java (modified) (2 diffs)
• test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java (modified) (3 diffs)
• test/tmcsim/utilities/BuildHighwayFileTest.java (modified) (1 diff)
• webapps/highway_status.json (modified) (4 diffs)

trunk/paramics_communicator.log

@@ -3 +3 @@
 <log>
 <record>
-  <date>2017-11-06T14:55:23</date>
-  <millis>1510008923085</millis>
+  <date>2019-03-24T11:14:51</date>
+  <millis>1553451291453</millis>
   <sequence>1</sequence>
   <logger>tmcsim.parmicsLog</logger>

trunk/paramics_status.xml

@@ -1 @@
-<Paramics>
-   <Network_Status>LOADING</Network_Status>
-   <Network_ID>1</Network_ID>
-</Paramics>

trunk/src/atmsdriver/model/Highways.java

@@ -181 +181 @@
 
         // postmiles increase from s to n and w to e
-        // if the direction is south or west
+        // handle increasing postmile directinons (north or east)
         if (direction.equals(Station.DIRECTION.NORTH) || direction.equals(Station.DIRECTION.EAST))
         {
@@ -201 +201 @@
                 }
             }
-        } // if the direction is north or east 
+        } 
+        // handle decreasing postmile directions (south or west) 
         else
         {

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);
     }

trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

@@ -75 +75 @@
         fullExpect = fullExpect.replaceAll("\n", ",");
 //        System.out.println(fullExpect);
-//        System.out.println(result.substring(result.length() - fullExpect.length(), result.length()));
+        System.out.println(result.substring(result.length() - fullExpect.length(), result.length()));
 //        String diff = StringUtils.difference(fullExpect, result);
         boolean match = result.endsWith(fullExpect);
@@ -276 +276 @@
             +"Events_File = config/vds_data/atmsBatchEvents.txt\n"
             +"FEPSim_IP_addr = localhost\n"
-            +"Output_Destination = Console\n";
+            +"Output_Destination = Console\n"
+            +"Json_Path = /tmp/highway_status.json\n";
     static final String paramicsData = "ParamicsCommHost = 127.0.0.1\n"
             + "ParamicsCommPort       = 4450\n"
@@ -303 +304 @@
         cf.delete();
         writedata("config.txt", configData);
+        File tf = new File ("tconfig.txt");
+        tf.delete();
         writedata("tconfig.txt", trafficMgrData);
         writedata("pconfig.txt", paramicsData);

trunk/test/tmcsim/utilities/BuildHighwayFileTest.java

@@ -29 +29 @@
     }
 
-    public void testCreateVDSlookup()
+    /** Just a smoke test to see if it creates the output file */
+    public void testCheckFileCreated()
     {
         System.out.println("createVDSlookup");
-        BuildHighwayFile instance = new BuildHighwayFile();
-        instance.createLanelookup();
+        BuildHighwayFile app = new BuildHighwayFile();
+        app.createLDSdict();
+        app.createVDSdict();
+        app.createLanelookup();
+        app.createHighwayFile();
+        app.showLeftoverVDS();
+
         String filename = BuildHighwayFile.dirpath +BuildHighwayFile.loopFileName;
         File f = new File(filename);

trunk/webapps/highway_status.json

@@ -2358 +2358 @@
        },
    "properties": 
-       {"street": "MACARTHU1", "color": "red", "perpx": "-0.710326", "perpy": "0.703873"}
+       {"street": "MACARTHU1", "color": "lime", "perpx": "-0.710326", "perpy": "0.703873"}
 },  
 {
@@ -2369 +2369 @@
        },
    "properties": 
-       {"street": "MACARTHU1", "color": "red", "perpx": "0.740557", "perpy": "-0.671994"}
+       {"street": "MACARTHU1", "color": "lime", "perpx": "0.740557", "perpy": "-0.671994"}
 },  
 {
@@ -2380 +2380 @@
        },
    "properties": 
-       {"street": "MACARTHU2", "color": "yellow", "perpx": "-0.710326", "perpy": "0.703873"}
+       {"street": "MACARTHU2", "color": "lime", "perpx": "-0.710326", "perpy": "0.703873"}
 },  
 {
@@ -2391 +2391 @@
        },
    "properties": 
-       {"street": "MACARTHU2", "color": "yellow", "perpx": "0", "perpy": "0"}
+       {"street": "MACARTHU2", "color": "lime", "perpx": "0", "perpy": "0"}
 },  
 {