Changeset 127 in tmcsimulator

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.

Location:

trunk/src

Files:

• atmsdriver/ConsoleDriver.java (modified) (2 diffs)
• atmsdriver/model/Highways.java (modified) (2 diffs)
• atmsdriver/model/Station.java (modified) (1 diff)
• tmcsim/application.properties (modified) (1 diff)
• tmcsim/client/ATMSBatchDriver.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.

trunk/src/atmsdriver/model/Highways.java

@@ -211 +211 @@
     public void writeToFEP() {
         try {
-            Socket sock = new Socket(/*FEPHostName*/ "192.168.251.130", 8080);
+            Socket sock = new Socket(FEPHostName /*"192.168.251.130"*/, 8080);
             PrintWriter out = new PrintWriter(sock.getOutputStream(), true);
             out.println(this.toXML());
@@ -217 +217 @@
         } catch (IOException ex) {
             Logger.getLogger(Highways.class.getName()).log(Level.SEVERE, null, ex);
+            System.out.println("Highway Model failed writing to FEPSim.");
         }
     }

trunk/src/atmsdriver/model/Station.java

@@ -166 +166 @@
             {
                 // UPDATE LOOP WITH VALUES
-                // TODO: Perhaps enhance DOTCOLOR enum to include constants for
-                // vol and occ along with each color.  Then the updateLoop call
-                // below could be update(dotColor.volume, dotColor.occ, speed)
-                int volume = 10;
-                int occ = 10;
                 int speed = 0;
-                loop.updateLoop(volume, occ, speed);
+                loop.updateLoop(dotColor.volume(), dotColor.occupancy(), speed);
             }
         }

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sun, 15 Oct 2017 17:38:51 -0700
+#Mon, 16 Oct 2017 17:41:29 -0700
 
-Application.revision=123
+Application.revision=125
 
 Application.buildnumber=53

trunk/src/tmcsim/client/ATMSBatchDriver.java

@@ -60 +60 @@
     public void refresh() throws RemoteException
     {
-        throw new UnsupportedOperationException("Not supported yet.");
+        System.out.println("ATMSBatchDriver.refresh() was invoked.");
     }
 
@@ -214 +214 @@
         timer.start();
 
-        // Start the FEP thread (to update ATMS every 30 sec)
+        // Start the FEP thread (to update ATMS every 30 sec). (See class def below)
         new WriteToFEPThread().run();