Changeset 184 in tmcsimulator for trunk/src/atmsdriver/model/LoopDetector.java

Timestamp:

10/28/2017 05:24:02 PM (9 years ago)

Author:

jtorres

Message:

highways.java: converted to immutable, removed use of FEPLineLoader and added loadLines(), loadLine(), loadStation(), and loadLoop() methods. Renamed loadHighways() to configureHighways(), renamed writeHighwaysMeta() to getHighwaysMeta() which now returns a String containing metadata instead of opening a file and writing to it, which is more flexible. FEPLineLoader.java: deleted, no longer need it. FEPLine.java: converted to immutable, removed unnecessary member variables and adjusted all methods accordingly. Station.java: MLTotVol() and OppTotVol?() are now being updated at end of updateByDirection(). ATMSDriver.java: Now using one config file: highways_fullmap.txt, as opposed to the older lds.txt and loop.txt files. config/vds_data: added highways_fullmap.txt. config/atms_driver_config.properties, atms_driver_config_local.properties: updated config to reflect use of highways_fullmap.txt instead of old loop.txt and lds.txt configuration. ATMSBatchDriver.java: conformed highways initialization in constructor to reflect use of highways_fullmap.txt

File:

• trunk/src/atmsdriver/model/LoopDetector.java (modified) (4 diffs)

trunk/src/atmsdriver/model/LoopDetector.java

@@ -6 +6 @@
 import org.w3c.dom.Element;
 
-/** A LoopDetector represents a single detector for a single lane in a network.
+/** 
+ *  A LoopDetector represents a single detector for a single lane in a network.
  * 
  *  A LoopDetector contains static meta data, and three dynamic attributes: vol,
@@ -26 +27 @@
     private int spd;
     
+    /**
+     * Constructs a LoopDetector from loopID, loopLocation, and laneNum
+     * 
+     * @param loopID
+     * @param loopLocation
+     * @param laneNum 
+     */
     public LoopDetector(int loopID, String loopLocation, int laneNum)
     {
@@ -39 +47 @@
     }
     
+    /**
+     * XML tags used for toXML() method.
+     */
     private static enum XML_TAGS
     {
@@ -89 +100 @@
         this.spd = spd;
     }
-    
+
+    /**
+     * Returns the LoopDetector data in XMLFormat
+     * 
+     * @param currElem The current XML <LoopDetector> element
+     */
     public void toXML(Element currElem)
     {