Changeset 87 in tmcsimulator for trunk/test/atmsdriver/model/NetworkTest.java

Timestamp:

10/10/2017 01:09:50 AM (9 years ago)

Author:

jtorres

Message:

merged branches/trunk into regular tmcsim/trunk. Changed Network.java to Highways.java. Highways.java: added writeToFEP(), updateSequences(), loadHighways(), and writeHighwaysMeta(). writeToFEP() is a socket client that communicates with FEPSimulator socket server. updateSequences() updates global and schedule sequences per the existing UCI plugin code and may not be necessary. loadHighways() loads the ArrayList? of Highways used in highways class, in sorted order. Stations are now implementing comparable to sort by postmile. writeHighwaysMeta() is an attempt at writing the highways meta data in condensed form, because loading time in NetworkLoader? is super long. We will eventually get rid of NetworkLoader? and do it within the Highways class for good OOP practice. There are new properties in atms_driver_properties.properties in config to support all these changes. Highway.java: new class, represents a highway which is a sorted ArrayList? of stations. This is a good checkpoint, for persistent green dots and all is working within the triangle. There is much commented out code in Highways.java which does not quite work. This commented code is an attempt at writing the condensed form highway meta data to improve loading times as described above.

Location:

trunk/test/atmsdriver

Files:

• . (added)
• model (added)
• model/NetworkTest.java (copied) (copied from branches/trunk/test/atmsdriver/model/NetworkTest.java) (1 diff)

trunk/test/atmsdriver/model/NetworkTest.java

@@ -47 +47 @@
     public void testToXML() {
         System.out.println("toXML");
-        Network network = new Network(
-                new File("test/atmsdriver/model/ldssample.txt"),
-                new File("config/vds_data/loop.txt"),
-                "localhost",8080);
-        String result = network.toXML();
+        Highways highways = new Highways(
+                "test/atmsdriver/model/ldssample.txt",
+                "config/vds_data/loop.txt",
+                "config/vds_data/highwaysMeta.txt",
+                "localhost", 8080);
+        String result = highways.toXML();
         assertEquals(expResult, result);
     }