Changeset 89 in tmcsimulator

Timestamp:

10/10/2017 02:46:14 PM (9 years ago)

Author:

jtorres

Message:

trunk/test/atmsdriver/model/LoadHighwaysTest.java added test to ensure highways are loaded and sorted by postmile. Renamed NetworkTest?.java to HighwaysTest?.java

Location:

trunk

Files:

• src/atmsdriver/model/Highway.java (modified) (1 diff)
• src/atmsdriver/model/Highways.java (modified) (2 diffs)
• src/tmcsim/application.properties (modified) (1 diff)
• test/atmsdriver/model/HighwaysTest.java (moved) (moved from trunk/test/atmsdriver/model/NetworkTest.java) (1 diff)
• test/atmsdriver/model/LoadHighwaysTest.java (added)

trunk/src/atmsdriver/model/Highway.java

@@ -21 +21 @@
         this.stations = stations;
     }
+    
+    public Integer getRouteNumber()
+    {
+        return this.highwayNumber;
+    }
+    
+    public DIRECTION getDirection()
+    {
+        return this.direction;
+    }
+    
+    public ArrayList<Station> getStations()
+    {
+        return this.stations;
+    }
 }

trunk/src/atmsdriver/model/Highways.java

@@ -57 +57 @@
     }
 
+    public ArrayList<Highway> getHighways()
+    {
+        return this.highways;
+    }
     
     private ArrayList<Highway> loadHighways() {
         System.out.println("Loading highways...");
+        // The list of highways to return
         ArrayList<Highway> highways = new ArrayList<Highway>();
         Hashtable<Hashtable<Integer, DIRECTION>, ArrayList<Station>>
@@ -97 +102 @@
             DIRECTION hwyDir = hwyKey.get(hwyNum);
             Collections.sort(highwayTable.get(hwyKey));
-            System.out.println("Adding highway: " + hwyNum + " " + hwyDir.name + " " + hwyStations.size());
+            System.out.println("Adding highway: " + hwyNum + " " + hwyDir.name);
             highways.add(new Highway(hwyNum, 
                     hwyDir, hwyStations));

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Tue, 10 Oct 2017 13:13:29 -0700
+#Tue, 10 Oct 2017 15:53:59 -0700
 
-Application.revision=87
+Application.revision=88
 
 Application.buildnumber=50

trunk/test/atmsdriver/model/HighwaysTest.java

@@ -14 +14 @@
  * @author jdalbey
  */
-public class NetworkTest extends TestCase {
-
-    public NetworkTest(String testName) {
+public class HighwaysTest extends TestCase {
+
+    public HighwaysTest(String testName) {
         super(testName);
     }