Changeset 84 in tmcsimulator for trunk/src

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

Files:

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

trunk/src/atmsdriver/NetworkLoader.java

@@ -2 +2 @@
 
 import atmsdriver.model.FEPLine;
-import atmsdriver.model.LoopDetectorStation;
+import atmsdriver.model.Station;
 import atmsdriver.model.LoopDetector;
-import atmsdriver.model.LoopDetectorStation.DIRECTION;
+import atmsdriver.model.Station.DIRECTION;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -17 +17 @@
  * 
  *  The public method getFEPLines() method can be used to get all the FEPLines 
- *  within a network. All other methods are private and are used to construct
- *  the FEPLines.
- * 
- *  The "LDSFile" contains LoopDetectorStation and FEPLine information.
- *  ex.
- *   < Insert file here >
+  within a network. All other methods are private and are used to construct
+  the FEPLines.
+ 
+  The "LDSFile" contains Station and FEPLine information.
+  ex.
+   < Insert file here >
  *  The "loopFile" contains individual LoopDetector information.
  *  ex.
@@ -157 +157 @@
                 
                 // Create each Station for the current FEPLine
-                ArrayList<LoopDetectorStation> stns = new ArrayList<>();
+                ArrayList<Station> stns = new ArrayList<>();
                 for(Integer stnNum : stnNums)
                 {
@@ -165 +165 @@
                     
                     // Create the Station and add to list for curr FEPLine
-                    LoopDetectorStation stn =
+                    Station stn =
                             createStation(stnNum, new Scanner(LDSFile), loops);
                     stns.add(stn);
@@ -181 +181 @@
     
     // Creates  line
-    private FEPLine createLine(int lineNum, Scanner scLine, ArrayList<LoopDetectorStation> stns)
+    private FEPLine createLine(int lineNum, Scanner scLine, ArrayList<Station> stns)
     {
         FEPLine line = null;
@@ -239 +239 @@
     
     // creates a Station
-    private LoopDetectorStation createStation(int stnNum, Scanner sc, ArrayList<LoopDetector> detectors)
-    {
-        LoopDetectorStation LDS = null;
+    private Station createStation(int stnNum, Scanner sc, ArrayList<LoopDetector> detectors)
+    {
+        Station LDS = null;
         
         sc.nextLine();
@@ -264 +264 @@
                 double postmile = scLine.nextDouble();
                 String ldsName = getLocation(strLine); /************* DOESNT GRAB WHOLE???? */////
-                LDS = new LoopDetectorStation(lineNum, ldsID, drop, ldsName, detectors, fwy, dir, postmile);
+                LDS = new Station(lineNum, ldsID, drop, ldsName, detectors, fwy, dir, postmile);
                 
                 break;

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) {
+        
     }