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

Timestamp:

11/02/2017 01:42:45 PM (9 years ago)

Author:

jtorres

Message:

branches/FEPSimulator/tests/HighwaysParserTest.cpp: Unit test for HighwaysParser?.cpp. HighwaysTest?.java: now passing toXML(), added test for toCondensedFormat() method. LoadHighwaysTest?.java: passing. LoadSadDotsTest?.java: conformed to changes, not passing. Highway.java/Highways.java: converted class attributes to List instead of ArrayList?. Highways.java: corrected toCondensedFormat() method comments and added comments throughout file.

Location:

trunk/src/atmsdriver/model

Files:

• Highway.java (modified) (2 diffs)
• Highways.java (modified) (7 diffs)

trunk/src/atmsdriver/model/Highway.java

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
@@ -15 +16 @@
     public final Integer routeNumber;
     /** The ordered list of stations (lane detector stations) on this highway */
-    public final ArrayList<Station> stations;
+    public final List<Station> stations;
 
     /** Construct a highway 

trunk/src/atmsdriver/model/Highways.java

@@ -12 +12 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
@@ -52 +53 @@
     final private int FEPPortNum;
     
-    final private ArrayList<FEPLine> lines;
-    final public ArrayList<Highway> highways;
+    final private List<FEPLine> lines;
+    final public List<Highway> highways;
 
     public Highways(String highwaysMapFileName, String FEPHostName, int FEPPortNum)
@@ -227 +228 @@
         String line = sc.nextLine();
         Scanner scline = new Scanner(line);
-        // Get the attribute of this FEP Line
+        // Get the attributes of this FEP Line
         int lineNum = scline.nextInt();
         int count = scline.nextInt();
         int numStations = scline.nextInt();
+        
+        // initialze stations array
         ArrayList<Station> stations = new ArrayList<>();
         // Read all the stations for thie FEP Line
@@ -251 +254 @@
         String line = sc.nextLine();
         Scanner scline = new Scanner(line);
+        
         int ldsID = scline.nextInt();
         int drop = scline.nextInt();
@@ -371 +375 @@
      * Example toCondensedFormat(MetaDataOnly = false) output:
      * 
-     * 43                   // "number of lines"
-     * 32 0 13              // "line id" "count num" "number of stations"
-     * 1210831 1 5 S 0.9 8  // "station id" "drop num" "route num"...
-     *                      //      ..."direction" "postmile" "number of loops"
-     * 1210832  0.0 0       // "loop id" "occ" "vol"
-     * 1210833  0.0 0       // ..
-     * 1210834  0.0 0       // ..
-     * 1210835  0.0 0       // ..
-     * 1210836  0.0 0       // ..
-     * 1210837  0.0 0       // ..
-     * 1210838  0.0 0       // ..
-     * 1210839  0.0 0       // ..
+     * 43                       // "number of lines"
+     * 32 0 13                  // "line id" "count num" "number of stations"
+     * 1210831 1 5 S 0.9 8      // "station id" "drop num" "route num"...
+     *                          //      ..."direction" "postmile" "number of loops"
+     * 1210832  0.0 0  ML_1     // "loop id" "occ" "vol"
+     * 1210833  0.0 0  ML_2     // ..
+     * 1210834  0.0 0  ML_3     // ..
+     * 1210835  0.0 0  ML_4     // ..
+     * 1210836  0.0 0  PASSAGE  // ..
+     * 1210837  0.0 0  DEMAND   // ..
+     * 1210838  0.0 0  QUEUE    // ..
+     * 1210839  0.0 0  RAMP_OFF // ..
      * ...
      * 
@@ -404 +408 @@
     public String toCondensedFormat(boolean MetaDataOnly)
     {
+        // first line: number of FEPLines
         StringBuilder build = new StringBuilder();
         build.append(lines.size());
         build.append("\n");
+        // append each fep line to the string
         for(FEPLine line : lines)
         {
             build.append(line.toCondensedFormat(MetaDataOnly));
         }
+        // return the full condensed format string
         return build.toString();
     }
@@ -458 +465 @@
      * 
      * @param routeNum
-     * @return Highway with specified route number
+     * @return Highway with specified route number, or null if no highway with
+     *          the specified route num
      */
     public Highway getHighwayByRouteNumber(Integer routeNum)
     {
         Highway returnHwy = null;
+        // search through highways and check routeNums
         for (Highway hwy : highways)
         {