Changeset 109 in tmcsimulator for trunk/src/atmsdriver

Timestamp:

10/12/2017 12:23:11 PM (9 years ago)

Author:

jdalbey

Message:

ATMSDriverClient.java Enhanced to call ConsoleDriver? methods to update highway colors. Removed redundant code in Station..java.

File:

• trunk/src/atmsdriver/model/Station.java (modified) (1 diff)

trunk/src/atmsdriver/model/Station.java

@@ -121 +121 @@
     }
 
-    public void updateByDirection(DIRECTION direction, DOTCOLOR dotColor) {
+    /** Determine which lane fields to update based on given direction
+     * and update all the loop detectors with the given color.
+     * @param direction desired highway direction
+     * @param dotColor desired dot color
+     */
+    public void updateByDirection(DIRECTION direction, DOTCOLOR dotColor) 
+    {
+        String laneDir = "OPP";
         if(direction.equals(this.direction))
         {
-            updateML(dotColor);
-        }
-        else
-        {
-            updateOPP(dotColor);
-        }
-    }
-    
-    private void updateML(DOTCOLOR dotcolor)
-    {
-        outputUpdateMessage(dotcolor, "ML");
+            laneDir = "ML";
+        }
+        outputUpdateMessage(dotColor, laneDir);
         
         for(LoopDetector loop : loops)
         {
-            if(loop.loopLocation.startsWith("ML"))
+            if(loop.loopLocation.startsWith(laneDir))
             {
                 // 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 = 0;
+                int occ = 0;
+                int speed = 0;
+                loop.updateLoop(volume, occ, speed);
             }
         }
     }
-    
-    private void updateOPP(DOTCOLOR dotcolor)
-    {
-        outputUpdateMessage(dotcolor, "OPP");
-        for(LoopDetector loop : loops)
-        {
-            if(loop.loopLocation.startsWith("OP"))
-            {
-                // UPDATE LOOP WITH VALUES
-            }
-        }
-    }
-    
+   
     private void outputUpdateMessage(DOTCOLOR dotcolor, String OPP_ML)
     {