Changeset 176 in tmcsimulator for trunk/src/atmsdriver

Timestamp:

10/24/2017 02:07:02 PM (9 years ago)

Author:

jtorres

Message:

Highways.java, LoopDetector?.java: updateByDirection() methods now take float occ value. ConsoleDriver?.java: DOTCOLOR enum now contains valid vol and occ values. atmsBatchEvents.txt: updated to fullBatchEvents script.

Location:

trunk/src/atmsdriver

Files:

• ConsoleDriver.java (modified) (3 diffs)
• model/Highways.java (modified) (1 diff)
• model/LoopDetector.java (modified) (2 diffs)

trunk/src/atmsdriver/ConsoleDriver.java

@@ -423 +423 @@
     public static enum DOTCOLOR {
 
-        RED(10,10),
-        YELLOW(30,20), // speed = 26
+        RED(1, 0.06f),
+        YELLOW(3,0.059f), // speed = 26
         GREEN(0,0);
         
@@ -431 +431 @@
         
         private int vol;  /* volume */
-        private int occ;  /* occupancy */      
-        
-        private DOTCOLOR(int v, int o)
+        private float occ;  /* occupancy */      
+        
+        private DOTCOLOR(int v, float o)
         {
             vol = v;
@@ -451 +451 @@
             return vol;
         }
-        public int occupancy()
+        public float occupancy()
         {
             return occ;

trunk/src/atmsdriver/model/Highways.java

@@ -222 +222 @@
             throw new SimulationException(SimulationException.BINDING);
         }
+        updateSequences();
     }
 

trunk/src/atmsdriver/model/LoopDetector.java

@@ -23 +23 @@
     /* dynamic data */
     public int vol;
-    public int occ;
+    public float occ;
     private int spd;
     
@@ -83 +83 @@
      * @param spd speed
      */
-    public void updateLoop(int vol, int occ, int spd)
+    public void updateLoop(int vol, float occ, int spd)
     {
         this.vol = vol;