Changeset 190 in tmcsimulator for trunk/src/atmsdriver/model/Highways.java

Timestamp:

10/29/2017 10:51:53 PM (9 years ago)

Author:

jtorres

Message:

vds_data/highways_fullmap.txt: removed lane num field, not necessary. ATMSDriver.java: removed System.out statement. FEPLine.java: renamed lineNum member to lineID. Highways.java: added example output for toCondensedFormat(boolean) method in method comments. LoopDetector?.java: removed spd member, not necessary, as we calculate speed form occ and vol. Station.java: conformed to above changes.

File:

• trunk/src/atmsdriver/model/Highways.java (modified) (5 diffs)

trunk/src/atmsdriver/model/Highways.java

@@ -61 +61 @@
         // configure and load highways
         this.highways = configureHighways();
-        
+
         // write to FEP host and port number
         this.FEPHostName = FEPHostName;
@@ -278 +278 @@
 
         int loopID = scline.nextInt();
-        int laneNum = scline.nextInt();
-        String loopLoc = getLoopLoc(line); // NEED GET LOOPLOC
+        String loopLoc = getLoopLoc(line);
         scline.close();
-        return new LoopDetector(loopID, loopLoc, laneNum);
+        return new LoopDetector(loopID, loopLoc);
     }
 
@@ -293 +292 @@
     {
         Scanner sc = new Scanner(line);
-        sc.nextInt();
         sc.nextInt();
 
@@ -343 +341 @@
             
             // Write the highways data over the socket
-            out.println(this.toXML());
+            out.println(this.toCondensedFormat(false));
             
             // close the socket
@@ -369 +367 @@
      * @param MetaDataOnly Whether you want meta data, or a full dump for FEPSim
      * @return String, highways data in condensed format
+     * 
+     * Example toCondensedFormat(MetaDataOnly = false) output:
+     * 
+     * 43                   // "number of lines"
+     * 32 0 13              // "line id" "count num" "number of stations"
+     * 1210831 1 5 S 0.9 8  // "station id" "drop num" "route num"...
+     *                      //      ..."direction" "postmile" "number of loops"
+     * 1210832  0.0 0       // "loop id" "occ" "vol"
+     * 1210833  0.0 0       // ..
+     * 1210834  0.0 0       // ..
+     * 1210835  0.0 0       // ..
+     * 1210836  0.0 0       // ..
+     * 1210837  0.0 0       // ..
+     * 1210838  0.0 0       // ..
+     * 1210839  0.0 0       // ..
+     * ...
+     * 
+     * Example toCondensedFormat(MetaDataOnly = true) output:
+     * 
+     * 43                           // "number of lines"
+     * 32 0 13                      // "line id" "count num" "number of stations"
+     * 1210831 1 5 S 0.9 8 CALAFIA  // "station id" "drop num" "route num"...
+     *                              //      ..."direction" "postmile"...
+     *                              //      ..."number of loops" "string location"
+     * 1210832 ML_1                 // "loop id" "loop location"
+     * 1210833 ML_2                 // "            "
+     * 1210834 ML_3                 // "            "
+     * 1210835 ML_4                 // "            "
+     * 1210836 PASSAGE              // "            "
+     * 1210837 DEMAND               // "            "
+     * 1210838 QUEUE                // "            "
+     * 1210839 RAMP_OFF             // "            "
+     * ...
      */
     public String toCondensedFormat(boolean MetaDataOnly)