Changeset 184 in tmcsimulator for trunk/src/tmcsim

Timestamp:

10/28/2017 05:24:02 PM (9 years ago)

Author:

jtorres

Message:

highways.java: converted to immutable, removed use of FEPLineLoader and added loadLines(), loadLine(), loadStation(), and loadLoop() methods. Renamed loadHighways() to configureHighways(), renamed writeHighwaysMeta() to getHighwaysMeta() which now returns a String containing metadata instead of opening a file and writing to it, which is more flexible. FEPLineLoader.java: deleted, no longer need it. FEPLine.java: converted to immutable, removed unnecessary member variables and adjusted all methods accordingly. Station.java: MLTotVol() and OppTotVol?() are now being updated at end of updateByDirection(). ATMSDriver.java: Now using one config file: highways_fullmap.txt, as opposed to the older lds.txt and loop.txt files. config/vds_data: added highways_fullmap.txt. config/atms_driver_config.properties, atms_driver_config_local.properties: updated config to reflect use of highways_fullmap.txt instead of old loop.txt and lds.txt configuration. ATMSBatchDriver.java: conformed highways initialization in constructor to reflect use of highways_fullmap.txt

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• client/ATMSBatchDriver.java (modified) (1 diff)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Tue, 24 Oct 2017 14:59:28 -0700
+#Sat, 28 Oct 2017 18:33:59 -0700
 
-Application.revision=174
+Application.revision=183
 
-Application.buildnumber=57
+Application.buildnumber=62

trunk/src/tmcsim/client/ATMSBatchDriver.java

@@ -143 +143 @@
         incidents = new HashMap<String, List<TrafficEvent>>();
         highways = new Highways(
-                "config/vds_data/lds.txt",
-                "config/vds_data/loop.txt",
-                "config/vds_data/highwaysMeta.txt",
+                "config/vds_data/highways_fullmap.txt",
                 //        "192.168.251.46", 8080);  //IP address of FEP Sim Linux VM
                 "localhost", 8080);