Changeset 422 in tmcsimulator for trunk/src/atmsdriver/ConsoleTrafficDriver.java

Timestamp:

06/23/2019 10:27:35 AM (7 years ago)

Author:

jdalbey

Message:

Remove ATMS functionality. Reworked and simplified the Highway model to use only VDS data from PeMS. Updated all unit tests.

File:

• trunk/src/atmsdriver/ConsoleTrafficDriver.java (modified) (3 diffs)

trunk/src/atmsdriver/ConsoleTrafficDriver.java

@@ -1 +1 @@
 package atmsdriver;
 
-import atmsdriver.model.Highways;
-import atmsdriver.model.Station.DIRECTION;
-import atmsdriver.model.Highway;
-import atmsdriver.model.Station;
-import atmsdriver.model.LoopDetector.DOTCOLOR;
+import tmcsim.highwaymodel.Highways;
+import tmcsim.highwaymodel.Station.DIRECTION;
+import tmcsim.highwaymodel.Highway;
+import tmcsim.highwaymodel.Station;
+import tmcsim.highwaymodel.LoopDetector.DOTCOLOR;
 import java.io.FileInputStream;
 import java.util.ArrayList;
@@ -49 +49 @@
                 // Create the Highway Model
                 Highways highways = new Highways(
-                    "config/vds_data/highways_fullmap.txt",
-                    ConsoleDriverProperties.getProperty(
-                        "FEPWriterHost"),
-                    Integer.parseInt(ConsoleDriverProperties.getProperty(
-                        "FEPWriterPort")));
+                    "config/vds_data/highways_fullmap.txt");
 
                 // Construct the console driver using the highways model
@@ -139 +135 @@
             {
                 // Send highway model to FEP for transmit to ATMS
-                try {
-                    highways.writeToFEP();
-                } catch (SimulationException ex) {
-                    System.out.println("Skipping writeToFEP...");
-                }
+                highways.toJson();
                 System.out.println("Add another entry or Quit? (A/Q)");
                 choice = sc.next().toUpperCase().trim().charAt(0);