Changeset 84 in tmcsimulator for trunk/src/atmsdriver/model

Timestamp:

10/06/2017 11:44:52 PM (9 years ago)

Author:

jtorres

Message:

FEPSimulator.cpp: FEPSimulator socket server is now receiving full messages, no more partial messages over the TCP socket. General housekeeping on FEPSim.cpp, NetworkReader?.cpp, ATMSDriver.java, NetworkLoader?.java.

Location:

trunk/src/atmsdriver/model

Files:

• FEPLine.java (modified) (3 diffs)
• Station.java (moved) (moved from trunk/src/atmsdriver/model/LoopDetectorStation.java) (3 diffs)

trunk/src/atmsdriver/model/FEPLine.java

@@ -19 +19 @@
     /* Static FEPLine meta data */
     final private int lineNum;
-    final private List<LoopDetectorStation> stations;
+    final private List<Station> stations;
     final private int count;
     // NOT SURE IF NEXT IS FINAL
@@ -28 +28 @@
     final private long scheduleSeq;
     
-    public FEPLine(int lineNum, List<LoopDetectorStation> stations, int count,
+    public FEPLine(int lineNum, List<Station> stations, int count,
             int schedule, int lineInfo, long systemKey, long globalSeq,
             long scheduleSeq)
@@ -79 +79 @@
         Element stationsElement = theDoc.createElement(XML_TAGS.STATIONS.tag);
         lineElement.appendChild(stationsElement);
-        for(LoopDetectorStation station : stations)
+        for(Station station : stations)
         {
             station.toXML(stationsElement);

trunk/src/atmsdriver/model/Station.java

@@ -5 +5 @@
 import org.w3c.dom.Element;
 
-/** A LoopDetectorStation is a simulation of a station in a traffic network.
+/** A Station is a simulation of a station in a traffic network.
  *  
- *  A LoopDetectorStation (LDS) contains static meta data about the station, and
- *  two dynamic attributes, MLTotVol and OppTotVol. 
- * 
- *  A single LDS contains multiple LoopDetectors, which
- *  contain data for a single lane on one direction of the freeway. A LDS
- *  is specific to a single freeway, direction, and postmile.
+ *  A Station (LDS) contains static meta data about the station, and
+  two dynamic attributes, MLTotVol and OppTotVol. 
+ 
+  A single LDS contains multiple LoopDetectors, which
+  contain data for a single lane on one direction of the freeway. A LDS
+  is specific to a single freeway, direction, and postmile.
  *
  * @author John A. Torres
  * @version 9/10/2017
  */
-public class LoopDetectorStation {
-    /* Static LoopDetectorStation meta data */
+public class Station implements Comparable {
+    /* Static Station meta data */
     final private int lineNum;
     final private int ldsID; // double check
@@ -28 +28 @@
     final private DIRECTION direction;
     
-    /* Dynamic LoopDetectorStation data */
+    /* Dynamic Station data */
     private int MLTotVol;
     private int OppTotVol;
     
     /* Constructor */
-    public LoopDetectorStation(int lineNum, int ldsID, int drop,
+    public Station(int lineNum, int ldsID, int drop,
             String location, List<LoopDetector> loops, int fwy, 
             DIRECTION direction, double postmile)
@@ -48 +48 @@
         this.MLTotVol = 0;
         this.OppTotVol = 0;
+    }
+
+    @Override
+    public int compareTo(Object o) {
+        
     }