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

Timestamp:

10/16/2017 04:38:16 PM (9 years ago)

Author:

jdalbey

Message:

Station.java Enhance DOTCOLOR enum to have volume and occupancy fields. Minor changes to error messages in other files.

File:

• trunk/src/atmsdriver/ConsoleDriver.java (modified) (2 diffs)

trunk/src/atmsdriver/ConsoleDriver.java

@@ -409 +409 @@
     
     /**
-     * Enum for highway status dot colors.
+     * Enum for highway status dot colors. Each color has associated volume
+     * and occupancy constants.
      *
-     * @author John A. Torres
+     * @author John A. Torres, jdalbey
      * @version 10/11/2017
      */
     public static enum DOTCOLOR {
 
-        RED,
-        YELLOW,
-        GREEN;
+        RED(10,10),
+        YELLOW(5,5),
+        GREEN(0,0);
         
         // All the first letters of the values, in order.
         private static String allLetters = "RYG";
         
+        private int vol;  /* volume */
+        private int occ;  /* occupancy */      
+        
+        private DOTCOLOR(int v, int o)
+        {
+            vol = v;
+            occ = o;
+        }
         /**
          * Return the first letter of this enum.
@@ -432 +441 @@
         }
 
+        public int volume()
+        {
+            return vol;
+        }
+        public int occupancy()
+        {
+            return occ;
+        }
         /**
          * Returns a dot color given its first character.