Changeset 422 in tmcsimulator for trunk/src/atmsdriver/trafficeventseditor

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.

Location:

trunk/src/atmsdriver/trafficeventseditor

Files:

• TimeFrames.java (modified) (3 diffs)
• TrafficEventsEditor.java (modified) (1 diff)
• TrafficLaneEvent.java (modified) (1 diff)

trunk/src/atmsdriver/trafficeventseditor/TimeFrames.java

@@ -1 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+
 package atmsdriver.trafficeventseditor;
 
-import atmsdriver.model.Highway;
-import atmsdriver.model.Highways;
-import atmsdriver.model.LoopDetector;
-import atmsdriver.model.LoopDetector.DOTCOLOR;
-import atmsdriver.model.Station;
+import tmcsim.highwaymodel.Highway;
+import tmcsim.highwaymodel.Highways;
+import tmcsim.highwaymodel.LoopDetector;
+import tmcsim.highwaymodel.LoopDetector.DOTCOLOR;
+import tmcsim.highwaymodel.Station;
 import java.util.ArrayList;
 import java.util.List;
@@ -35 +31 @@
     {
         frames = new ArrayList<>();
-        highways = new Highways("./config/vds_data/highways_fullmap.txt", 
-                "192.168.251.46", 8080);
+        highways = new Highways("./config/vds_data/postmile_coordinates.txt");
     }
     
@@ -194 +189 @@
     void writeToFEP()
     {
-        try
-        {
-            highways.writeToFEP();
-        } 
-        catch (SimulationException ex)
-        {
-            System.out.println("writeToFEP() failed");
-        }
+            highways.toJson();
     }
 

trunk/src/atmsdriver/trafficeventseditor/TrafficEventsEditor.java

@@ -1 +1 @@
 package atmsdriver.trafficeventseditor;
 
-import atmsdriver.model.Highway;
-import atmsdriver.model.LoopDetector;
-import atmsdriver.model.LoopDetector.DOTCOLOR;
-import atmsdriver.model.Station;
+import tmcsim.highwaymodel.Highway;
+import tmcsim.highwaymodel.LoopDetector;
+import tmcsim.highwaymodel.LoopDetector.DOTCOLOR;
+import tmcsim.highwaymodel.Station;
 import timeselector.*;
 import java.io.File;

trunk/src/atmsdriver/trafficeventseditor/TrafficLaneEvent.java

@@ -1 +1 @@
 package atmsdriver.trafficeventseditor;
 
-import atmsdriver.model.LoopDetector;
-import atmsdriver.model.LoopDetector.DOTCOLOR;
-import atmsdriver.model.Station;
+import tmcsim.highwaymodel.LoopDetector;
+import tmcsim.highwaymodel.LoopDetector.DOTCOLOR;
+import tmcsim.highwaymodel.Station;
 
 /**