Changeset 140 in tmcsimulator for trunk

Timestamp:

10/18/2017 10:34:17 AM (9 years ago)

Author:

jdalbey

Message:

ATMSBatchDriver: Added comments to events file and changed range to decimal.

File:

• trunk/src/tmcsim/client/ATMSBatchDriver.java (modified) (4 diffs)

trunk/src/tmcsim/client/ATMSBatchDriver.java

@@ -145 +145 @@
         "config/vds_data/loop.txt",
         "config/vds_data/highwaysMeta.txt",
-        "localhost", 8080);
+        "192.168.251.46", 8080);  //IP address of FEP Sim Linux VM
+//        "localhost", 8080);
         // Create console driver but don't start run() method
         console = new ConsoleDriver(highways);
@@ -217 +218 @@
                         Station.DIRECTION dir = Station.DIRECTION.toDirection(lineScan.next());
                         double postmile = lineScan.nextDouble();
-                        int range = lineScan.nextInt();
+                        double range = lineScan.nextDouble();
                         ConsoleDriver.DOTCOLOR dotcolor = ConsoleDriver.DOTCOLOR.toDotColor(lineScan.next());
                         // apply colorization to highways
@@ -255 +256 @@
                 // Read a line and add it to the event queue
                 String line = scan.nextLine();
-                eventQueue.add(line);
-                // Parse the incident from the line
-                Scanner lineScan = new Scanner(line);
-                String incident = lineScan.next();
-                // Add the line to the list for the corresponding incident
-                List evtList;
-                if (incidents.containsKey(incident))
-                {
-                    evtList = incidents.get(incident);
-                }
-                else
-                {
-                    evtList = new ArrayList<String>();
-                }               
-                evtList.add(line);
-                // and put it back in the map
-                incidents.put(incident, evtList);
+                if (line.charAt(0) != '#')
+                {
+                    eventQueue.add(line);
+                    // Parse the incident from the line
+                    Scanner lineScan = new Scanner(line);
+                    String incident = lineScan.next();
+                    // Add the line to the list for the corresponding incident
+                    List evtList;
+                    if (incidents.containsKey(incident))
+                    {
+                        evtList = incidents.get(incident);
+                    }
+                    else
+                    {
+                        evtList = new ArrayList<String>();
+                    }               
+                    evtList.add(line);
+                    // and put it back in the map
+                    incidents.put(incident, evtList);
+                }
             }
         } catch (FileNotFoundException ex) {
@@ -307 +311 @@
                 Station.DIRECTION dir = Station.DIRECTION.toDirection(lineScan.next());
                 double postmile = lineScan.nextDouble();
-                int range = lineScan.nextInt();
+                double range = lineScan.nextDouble();
                 // apply colorization to highways, forcing to green, indicating cleared
                 console.applyColorToHighwayStretch(routeNumber, dir, postmile, range, ConsoleDriver.DOTCOLOR.GREEN);