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

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

File:

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

trunk/src/atmsdriver/ConsoleTrafficDriver.java

@@ -8 +8 @@
 import java.io.FileInputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
@@ -48 +47 @@
                 // Create the Highway Model
                 Highways highways = new Highways(
-                    "config/vds_data/lds.txt",
-                    "config/vds_data/loop.txt",
-                    "config/vds_data/highwaysMeta.txt",
+                    "config/vds_data/highways_fullmap.txt",
                     ConsoleDriverProperties.getProperty(
                         "FEPWriterHost"),