Changeset 176 in tmcsimulator for trunk/src/atmsdriver/ConsoleDriver.java

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.

File:

• trunk/src/atmsdriver/ConsoleDriver.java (modified) (3 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;