Changeset 234 in tmcsimulator for trunk/src/atmsdriver/model

Timestamp:

11/24/2017 01:30:38 PM (8 years ago)

Author:

jtorres

Message:

config/vds_data/highways_fullmap.txt: added loopLocationID. LoopDetector?.java: added loopLocationID field. Highways.java: reading in loopLocationID

Location:

trunk/src/atmsdriver/model

Files:

• Highways.java (modified) (1 diff)
• LoopDetector.java (modified) (2 diffs)
• Station.java (modified) (1 diff)

trunk/src/atmsdriver/model/Highways.java

@@ -283 +283 @@
 
         int loopID = scline.nextInt();
-        String loopLoc = getLoopLoc(line);
+        String loopLocID = scline.next();
+        String loopLoc = scline.next();
         scline.close();
-        return new LoopDetector(loopID, loopLoc);
+        return new LoopDetector(loopID, loopLocID, loopLoc);
     }
 

trunk/src/atmsdriver/model/LoopDetector.java

@@ -20 +20 @@
     final public int loopID;
     final public String loopLocation;
+    final public String loopLocationID;
     
     /* dynamic data */
@@ -32 +33 @@
      * @param laneNum 
      */
-    public LoopDetector(int loopID, String loopLocation)
+    public LoopDetector(int loopID, String loopLocationID, String loopLocation)
     {
         /* Set static data */
         this.loopID = loopID;
         this.loopLocation = loopLocation;
-        
+        this.loopLocationID = loopLocationID;
         /* Init dynamic data */
         this.vol = 0;

trunk/src/atmsdriver/model/Station.java

@@ -196 +196 @@
         this.OppTotVol = getOPPTotVol();
     }
-
+    
     /**
      * Return the color for the lanes in a given direction.