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

Timestamp:

10/30/2017 02:50:59 PM (9 years ago)

Author:

jdalbey

Message:

TrafficModelEventDriver?: Clean up code and comments. Highways.java improve formatting of toString output.

File:

• trunk/src/atmsdriver/model/Highways.java (modified) (1 diff)

trunk/src/atmsdriver/model/Highways.java

@@ -480 +480 @@
         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");
-        }
+            for (DIRECTION dir: DIRECTION.values())
+            {
+                StringBuilder lineout = new StringBuilder();
+                lineout.append(""+String.format("%3s ",hwy.routeNumber)+dir.getLetter()+' ');
+                for (Station stat: hwy.stations)
+                {
+                    if (stat.direction == dir)
+                    {
+                        //lineout.append("" + dir.getLetter() + stat.postmile);
+                        lineout.append(stat.getColorByDirection(stat.direction));
+                        //lineout.append("  ");
+                    }
+                }
+                if (lineout.length() > 6)
+                {
+                    result.append(lineout + "\n");
+                }
+            }
+        }
+        result.append("\n");
         return result.toString();
     }