Changeset 190 in tmcsimulator for trunk/src/atmsdriver/model/Station.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/Station.java (modified) (4 diffs)

trunk/src/atmsdriver/model/Station.java

@@ -22 +22 @@
 
     /* Static Station meta data */
-    final public int lineNum;
+    final public int lineID;
     final public int ldsID; // double check
     final public int drop;
@@ -36 +36 @@
 
     /* Constructor */
-    public Station(int lineNum, int ldsID, int drop,
+    public Station(int lineID, int ldsID, int drop,
             String location, List<LoopDetector> loops, int hwy,
             DIRECTION direction, double postmile)
     {
-        this.lineNum = lineNum;
+        this.lineID = lineID;
         this.ldsID = ldsID;
         this.drop = drop;
@@ -186 +186 @@
             {
                 // UPDATE LOOP WITH VALUES
-                int speed = 0;
-                loop.updateLoop(dotColor.volume(), dotColor.occupancy(), speed);
+                loop.updateLoop(dotColor.volume(), dotColor.occupancy());
             }
         }
@@ -253 +252 @@
 
         Element lineNumElement = theDoc.createElement(XML_TAGS.LINE_NUM.tag);
-        lineNumElement.appendChild(theDoc.createTextNode(String.valueOf(this.lineNum)));
+        lineNumElement.appendChild(theDoc.createTextNode(String.valueOf(this.lineID)));
         stationElement.appendChild(lineNumElement);