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

trunk/src/atmsdriver/model/LoopDetector.java

@@ -20 +20 @@
     final public int loopID;
     final public String loopLocation;
-    final public int laneNum;
     
     /* dynamic data */
     public int vol;
     public float occ;
-    private int spd;
     
     /**
@@ -34 +32 @@
      * @param laneNum 
      */
-    public LoopDetector(int loopID, String loopLocation, int laneNum)
+    public LoopDetector(int loopID, String loopLocation)
     {
         /* Set static data */
         this.loopID = loopID;
         this.loopLocation = loopLocation;
-        this.laneNum = laneNum;
         
         /* Init dynamic data */
         this.vol = 0;
-        this.spd = 0;
         this.occ = 0;
     }
@@ -54 +50 @@
         LOOP_ID("Loop_ID"),
         LOOP_LOCATION("Loop_Location"),
-        LANE_NUM("Lane_Num"),
         VOL("Vol"),
-        SPD("Spd"),
         OCC("Occ"),
         LOOP("Loop");
@@ -88 +82 @@
         build.append(Integer.toString(this.loopID));
         build.append(" ");
-        build.append(Integer.toString(this.laneNum));
-        build.append(" ");
         if(!MetaDataOnly)
         {
@@ -96 +88 @@
             build.append(" ");
             build.append(this.vol);
-            build.append(" ");
-            build.append(this.spd);
         }
         else
@@ -113 +103 @@
      * @param spd speed
      */
-    public void updateLoop(int vol, float occ, int spd)
+    public void updateLoop(int vol, float occ)
     {
         this.vol = vol;
         this.occ = occ;
-        this.spd = spd;
     }
 
@@ -140 +129 @@
         loopElement.appendChild(loopLocElement);
         
-        Element laneNumElement = theDoc.createElement(XML_TAGS.LANE_NUM.tag);
-        laneNumElement.appendChild(theDoc.createTextNode(String.valueOf(this.laneNum)));
-        loopElement.appendChild(laneNumElement);
-        
         Element volElement = theDoc.createElement(XML_TAGS.VOL.tag);
         volElement.appendChild(theDoc.createTextNode(String.valueOf(this.vol)));
@@ -151 +136 @@
         occElement.appendChild(theDoc.createTextNode(String.valueOf(this.occ)));
         loopElement.appendChild(occElement);
-        
-        Element spdElement = theDoc.createElement(XML_TAGS.SPD.tag);
-        spdElement.appendChild(theDoc.createTextNode(String.valueOf(this.spd)));
-        loopElement.appendChild(spdElement);
     }