Changeset 474 in tmcsimulator for trunk/src/tmcsim/highwaymodel/TrafficEventsAnimator.java

Timestamp:

08/21/2019 02:09:50 PM (7 years ago)

Author:

jdalbey

Message:

TrafficEventsAnimator? updated for revised highway model.

File:

• trunk/src/tmcsim/highwaymodel/TrafficEventsAnimator.java (modified) (4 diffs)

trunk/src/tmcsim/highwaymodel/TrafficEventsAnimator.java

@@ -45 +45 @@
     private final LinkedList<TrafficEvent> eventQueue;
     /**
-     * Map of incidents to events
-     */
-    private Map<String, List<TrafficEvent>> incidents;
-    /**
      * Highway history
      */
@@ -64 +60 @@
 
         // Initialize the highway model
-        incidents = new HashMap<String, List<TrafficEvent>>();
         highways = new Highways(
-                "config/vds_data/highways_fullmap.txt");
+                "config/vds_data/postmile_coordinates.txt");
         final String CONFIG_FILE_NAME = "traffic_model_config.properties";
         String propertiesFile = "config" + System.getProperty("file.separator") 
-                 + CONFIG_FILE_NAME;
+                 + "traffic_model_config" + System.getProperty("file.separator")  + CONFIG_FILE_NAME;
         Properties props = TrafficModelManager.loadProperties(propertiesFile);
         events_file = props.getProperty("Events_File");
@@ -86 +81 @@
         eventQueue = TrafficModelManager.readBatchFile(fileScanner);
     }
-    /** Load the traffic events into a history buffer */
+    /** Load the traffic events into a history buffer.  This  */
     public void load()
     {
@@ -100 +95 @@
             highways.applyColorToHighwayStretch(nextEvent.routeNumber, nextEvent.dir,
                     nextEvent.postmile, nextEvent.range, nextEvent.color);
+            // get the highwys as a string and add to the history list
             history.add(highways.toString()+"\n"+nextEvent.eventTime);
             // Remove this event from the queue, we're done with it.