Changeset 186 in tmcsimulator for trunk/src/atmsdriver/model/Station.java

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.

File:

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

trunk/src/atmsdriver/model/Station.java

@@ -88 +88 @@
         return oppTotVol;
     }
-
-    /**
-     * Returns the station metadata in condensed form. This is just a quick
-     * script function to make a proper highway metadata configuration file, so
-     * that we can read the network faster.
-     *
-     * @return station metadata
-     */
-    public String getStationMeta()
+    
+    /** Returns a string of highways data. If MetaDataOnly is true, you get a full
+     *  dump of the highways meta data, which does not include dynamic loop values,
+     *  and does include the string location names. If MetaDataOnly is false,
+     *  dynamic loop values are included, and unnecessary information like string
+     *  location values are included.
+     * 
+     *  The FEPSimulator takes in the toCondensedFormat() output, with a MetaDataOnly
+     *  value of false, over the socket.
+     * 
+     *  The MetaDataOnly flag should be used to get a full dump of the highways
+     *  information. This was used to get the highways_fullmap.txt output.
+     * 
+     * @param MetaDataOnly Whether you want meta data, or a full dump for FEPSim
+     * @return String, highways data in condensed format
+     */
+    public String toCondensedFormat(boolean MetaDataOnly)
     {
         StringBuilder build = new StringBuilder();
@@ -111 +119 @@
         build.append(Integer.toString(loops.size()));
         build.append(" ");
-        build.append(this.location);
+        if(MetaDataOnly)
+        {
+            build.append(this.location);
+        }
         build.append("\n");
         for (LoopDetector loop : loops)
         {
-            build.append(loop.getLoopMeta());
+            build.append(loop.toCondensedFormat(MetaDataOnly));
         }
         return build.toString();