Changeset 180 in tmcsimulator for trunk/src/tmcsim

Timestamp:

10/27/2017 01:38:13 PM (9 years ago)

Author:

jdalbey

Message:

ATMSDriver.java Refactored for cleaner design. DotColor? enum moved to LoopDetector? class. ConsoleDriver? renamed ConsoleTrafficDriver? (and associated project configurations updated), build.xml package-jars target updated, ConsoleTrafficDriver? logic improved to allow more user control, runtraffic.bash script created for automating traffic display tests.

File:

• trunk/src/tmcsim/client/ATMSBatchDriver.java (modified) (5 diffs)

trunk/src/tmcsim/client/ATMSBatchDriver.java

@@ -2 +2 @@
 
 import atmsdriver.ATMSDriver;
-import atmsdriver.ConsoleDriver;
+import atmsdriver.ConsoleTrafficDriver;
 import atmsdriver.ExchangeInfo;
 import atmsdriver.model.Highways;
 import atmsdriver.model.Station;
+import atmsdriver.model.LoopDetector.DOTCOLOR;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -121 +122 @@
     private Map<String, List<String>> incidents;
     
-    /** Instance of ConsoleDriver that contains the highway model */
-    private ConsoleDriver console;
+    /** Instance of ConsoleTrafficDriver that contains the highway model */
+    private ConsoleTrafficDriver console;
     
     /** GUI for this driver */
@@ -147 +148 @@
         "config/vds_data/loop.txt",
         "config/vds_data/highwaysMeta.txt",
-        "192.168.251.46", 8080);  //IP address of FEP Sim Linux VM
-//       "localhost", 8080);
-        // Create console driver but don't start run() method
-        console = new ConsoleDriver(highways);
+//        "192.168.251.46", 8080);  //IP address of FEP Sim Linux VM
+       "localhost", 8080);
         
         connect(cadClientProp.getProperty(PROPERTIES.CAD_SIM_HOST.name).trim(),
@@ -227 +226 @@
                         double postmile = lineScan.nextDouble();
                         double range = lineScan.nextDouble();
-                        ConsoleDriver.DOTCOLOR dotcolor = ConsoleDriver.DOTCOLOR.toDotColor(lineScan.next());
+                        DOTCOLOR dotcolor = DOTCOLOR.toDotColor(lineScan.next());
                         // apply colorization to highways
-                        console.applyColorToHighwayStretch(routeNumber, dir, postmile, range, dotcolor);
+                        highways.applyColorToHighwayStretch(routeNumber, dir, postmile, range, dotcolor);
                         // Remove this event from the queue, we're done with it.
                         eventQueue.remove();
@@ -322 +321 @@
                 double range = lineScan.nextDouble();
                 // apply colorization to highways, forcing to green, indicating cleared
-                console.applyColorToHighwayStretch(routeNumber, dir, postmile, range, ConsoleDriver.DOTCOLOR.GREEN);
+                highways.applyColorToHighwayStretch(routeNumber, dir, postmile, range, DOTCOLOR.GREEN);
             }
             catch (InputMismatchException ex)