Changeset 186 in tmcsimulator for trunk/test/atmsdriver

Timestamp:

10/28/2017 06:48:11 PM (9 years ago)

Author:

jtorres

Message:

Highways.java, FEPLine.java, LoopDetector?.java, Station.java: reconfigured the getHighwaysMeta() function to a toCondensedFormat(boolean MetaDataOnly?) method. By specifying MetaDataOnly? as true, you get the same output as the previous getHighwaysMeta() function. By specifying MetaDataOnly? as false, you get the new condensed format needed to send to the FEPSim over the socket. This allows us to use the same function to get a meta data dump, as well as get the highways data format needed for FEPSim socket. HighwaysParser?.cpp: removed the old tinyxml code, set up skeleton for new parser. NetworkReader?.h: deleted, and added HighwaysParser?.h. LoadSadDotsTest?.java and StationTest?.java: configured to use new toCondensedFormat method instead of getHighwaysMeta.

Location:

trunk/test/atmsdriver/model

Files:

• LoadSadDotsTest.java (modified) (2 diffs)
• StationTest.java (modified) (1 diff)

trunk/test/atmsdriver/model/LoadSadDotsTest.java

@@ -61 +61 @@
         ArrayList<Station> stations = fiftyfiveN.stations;
         Station sad = stations.get(0);
-        System.out.println(""+sad.getStationMeta());
+        System.out.println(""+sad.toCondensedFormat(true));
         assertEquals(22, sad.loops.size());
 
@@ -69 +69 @@
         stations = fourohfiveS.stations;
         Station happy = stations.get(0);
-        System.out.println(""+happy.getStationMeta());
+        System.out.println(""+happy.toCondensedFormat(true));
         assertEquals(9, happy.loops.size());
     }

trunk/test/atmsdriver/model/StationTest.java

@@ -50 +50 @@
         System.out.println("getStationMeta");
         String expResult = "2 3 4 N 1.0 0 A\n";
-        String result = alpha.getStationMeta();
+        String result = alpha.toCondensedFormat(true);
         assertEquals(expResult, result);
     }