Changeset 84 in tmcsimulator for trunk/src/atmsdriver/NetworkLoader.java

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.

File:

• trunk/src/atmsdriver/NetworkLoader.java (modified) (7 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;