Changeset 422 in tmcsimulator for trunk/src/tmcsim/highwaymodel/LoopDetector.java

Timestamp:

06/23/2019 10:27:35 AM (7 years ago)

Author:

jdalbey

Message:

Remove ATMS functionality. Reworked and simplified the Highway model to use only VDS data from PeMS. Updated all unit tests.

Location:

trunk/src/tmcsim/highwaymodel

Files:

• . (added)
• LoopDetector.java (copied) (copied from trunk/src/atmsdriver/model/LoopDetector.java) (9 diffs)

trunk/src/tmcsim/highwaymodel/LoopDetector.java

@@ -1 @@
-package atmsdriver.model;
+package tmcsim.highwaymodel;
 
 import java.util.ArrayList;
@@ -12 +12 @@
  *  occ, and spd.
  *
+ * Lane Type    A string indicating the type of lane. Possible values (and their meaning) are:
+ *
+ *    CD (Coll/Dist)
+ *    CH (Conventional Highway)
+ *    FF (Fwy-Fwy connector)
+ *    FR (Off Ramp)
+ *    HV (HOV)
+ *    ML (Mainline)
+ *    OR (On Ramp)
  * @author John A. Torres
  * @version 09/10/2017
@@ -28 +37 @@
     /**
      * Constructs a LoopDetector from loopID, loopLocation, and laneNum
+     * with initially free flowing traffic.
      * 
      * @param loopID
@@ -44 +54 @@
     }
     
+    /** 
+     * Setter for loop detector dynamic attributes.  Reserved for future use
+     * with "live" highway data.
+     * @param vol volume
+     * @param occ occupancy
+     * @param spd speed not used
+     */
+    public void setAttributes(int vol, float occ)
+    {
+        this.vol = vol;
+        this.occ = occ;
+    }
+    /** Set the attributes of this detector given a color.
+     * @param DOTCOLOR of the attributes to assign. 
+     */
+    public void setAttributes(DOTCOLOR color)
+    {
+        this.vol = color.volume();
+        this.occ = color.occupancy();
+    }
     /**
      * XML tags used for toXML() method.
@@ -100 +130 @@
         return build.toString();
     }
-    
-    /** 
-     * Updates loop detector dynamic attributes.
-     * @param vol volume
-     * @param occ occupancy
-     * @param spd speed
-     */
-    public void updateLoop(int vol, float occ)
-    {
-        this.vol = vol;
-        this.occ = occ;
-    }
 
     /**
@@ -144 +162 @@
     /**
      * Enum for highway status dot colors. Each color has associated volume
-     * and occupancy constants.
+     * and occupancy constants, single character symbol, and hml color name.
      *
      * @author John A. Torres, jdalbey
@@ -151 +169 @@
     public static enum DOTCOLOR {
 
-        RED(1, 0.06f),    // "Stopped" is less than 25mph
-        YELLOW(3,0.059f), // speed = 26
-        GREEN(0,0);
+        RED(1, 0.06f,'@',"red"),    // "Stopped" is less than 25mph
+        YELLOW(3,0.059f,'+',"yellow"), // speed = 26
+        GREEN(0,0,'-',"lime");       // freeflowing
         
         // All the first letters of the values, in order.
@@ -160 +178 @@
         private int vol;  /* volume */
         private float occ;  /* occupancy */      
-        
-        private DOTCOLOR(int v, float o)
+        private char symbol; /* symbolic representation of this color */
+        private String htmlColor; /* html color name */
+        
+        
+        private DOTCOLOR(int v, float o, char symbol, String htmlColor)
         {
             vol = v;
             occ = o;
+            this.symbol = symbol;
+            this.htmlColor = htmlColor;
         }
         /**
@@ -183 +206 @@
             return occ;
         }
+        public char symbol()
+        {
+            return symbol;
+        }
+        public String htmlColor()
+        {
+            return htmlColor;
+        }
         /**
-         * Returns a dot color given its first character.
+         * Returns a DOTCOLOR given its first character.
          *
-         * @param letter the first character of a dot color
-         * @return dot color corresponding to letter
+         * @param letter the first character of a DOTCOLOR
+         * @return DOTCOLOR corresponding to letter
          * @pre letter must be one of allLetters
          */