Changeset 191 in tmcsimulator

Timestamp:

10/30/2017 01:35:05 PM (9 years ago)

Author:

jdalbey

Message:

Highways.java: Added toString() method. Station.java: Added getColorByDirection method. Added testToString to HighwaysTest?.

Location:

trunk

Files:

• src/atmsdriver/model/Highways.java (modified) (3 diffs)
• src/atmsdriver/model/Station.java (modified) (1 diff)
• test/atmsdriver/model/HighwaysTest.java (modified) (1 diff)

trunk/src/atmsdriver/model/Highways.java

@@ -198 +198 @@
         {
             Scanner sc = new Scanner(new File(highwaysMapFileName));
+            // first line of file contains number of FEP Lines
             String firstLine = sc.nextLine();
-
             Scanner linesc = new Scanner(firstLine);
             int numLines = linesc.nextInt();
             linesc.close();
-
+            // FOR each FEP Line
             for (int i = 0; i < numLines; i++)
             {
@@ -227 +227 @@
         String line = sc.nextLine();
         Scanner scline = new Scanner(line);
-
+        // Get the attribute of this FEP Line
         int lineNum = scline.nextInt();
         int count = scline.nextInt();
         int numStations = scline.nextInt();
         ArrayList<Station> stations = new ArrayList<>();
+        // Read all the stations for thie FEP Line
         for (int i = 0; i < numStations; i++)
         {
@@ -473 +474 @@
     }
 
+    /** Return a string representation of the Highways */
+    public String toString()
+    {
+        StringBuilder result = new StringBuilder();
+        for (Highway hwy: highways)
+        {
+            result.append(""+String.format("%3s ",hwy.routeNumber));
+            for (Station stat: hwy.stations)
+            {
+                result.append(stat.getColorByDirection(stat.direction));
+            }
+            result.append("\n");
+        }
+        return result.toString();
+    }
     /**
      * XML tags used in writeToXML()

trunk/src/atmsdriver/model/Station.java

@@ -195 +195 @@
     
     /**
+     * Return the color for the lanes in a given direction.
+     * @param direction
+     * @return character representing color of lanes in given direction
+     * '@' = red,  '+' = yellow, '-' = green
+     */
+    public char getColorByDirection(DIRECTION direction)
+    {
+        /* For now just use the color of the first lane. 
+         * TODO: Average the color in all the lanes for the given direction */
+
+        String laneDir = "OS";
+        if(direction.equals(this.direction))
+        {
+            laneDir = "ML";
+        }
+        // Examine all the lanes in a given direction
+        for(LoopDetector loop : loops)
+        {
+            if(loop.loopLocation.startsWith(laneDir))
+            {
+                // Return color according to loop volume
+                if (loop.vol == 1) return '@';
+                if (loop.vol == 3) return '+';
+            }
+        }
+        // Default case
+        return '-';
+                
+    }
+    
+    /**
      * Output for updateByDirection. Logs the update to the console.
      * 

trunk/test/atmsdriver/model/HighwaysTest.java

@@ -43 +43 @@
 
     /**
-     * Test of toXML method, of class Network.
+     * Test of toString method
+     */
+    public void testToString() {
+        System.out.println("toString");
+        Highways highways = new Highways(
+                "config/vds_data/highways_fullmap.txt",
+                "localhost", 8080);
+        highways.getHighwayByRouteNumber(5).stations.get(0).loops.get(0).vol = 1;
+        String result = highways.toString();
+        System.out.println(result);
+        assertEquals(expString, result);
+    }
+    String expString = 
+ "241 ------------------------------------------------------------\n"
++"  5 @-------------------------------------------------------------------------------------------------------------------------------------------\n"
++"405 --------------------------------------------------------------------------------\n"
++"133 ----------------\n"
++"261 -----------------\n"
++" 22 ----------------------------------\n"
++" 55 ------------------------------------------\n"
++" 73 -----------------------------------------------------\n"
++" 57 ------------------------------------------\n"
++" 91 --------------------------------------------------------------\n"
++"605 ---\n";
+
+    /**
+     * Test of toXML method
      */
     public void testToXML() {
         System.out.println("toXML");
         Highways highways = new Highways(
-                "config/vds_data/highwaysMeta.txt",
+                "config/vds_data/highways_fullmap.txt",
                 "localhost", 8080);
         String result = highways.toXML();