Changeset 220 in tmcsimulator

Timestamp:

11/03/2017 02:55:08 PM (8 years ago)

Author:

jdalbey

Message:

TrafficModelManager?.java: Modify readBatchFile() to ignore blank lines in events file. Add unit test for this feature.

Location:

trunk

Files:

• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/cadsimulator/managers/TrafficModelManager.java (modified) (1 diff)
• test/tmcsim/cadsimulator/managers/TrafficModelManagerTest.java (modified) (2 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Fri, 03 Nov 2017 00:16:13 -0700
+#Fri, 03 Nov 2017 16:03:39 -0700
 
-Application.revision=217
+Application.revision=218
 
 Application.buildnumber=69

trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java

@@ -290 +290 @@
     {
         LinkedList<TrafficEvent> eventList = new LinkedList<TrafficEvent>();
-            while (scan.hasNext())
-            {
-                // Read a line and add it to the event queue
-                String line = scan.nextLine().trim();
-                if (line.charAt(0) != '#')
-                {
-                    TrafficEvent evt;
-                    try
-                    {
-                        evt = new TrafficEvent(line);
-                        eventList.add(evt);
-                    }
-                    catch (ParseException ex)
-                    {
-                        Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
-                        System.out.println("Wrong format data in batch event file: " + line + " \nskipping.");
-                        System.out.println("Skipping badly formatted event.");
-                    }
-                }
-            }
+        while (scan.hasNext())
+        {
+            // Read a line and add it to the event queue
+            String line = scan.nextLine().trim();
+            // Ignore blank lines and comments
+            if (line.length() > 0 && line.charAt(0) != '#')
+            {
+                TrafficEvent evt;
+                try
+                {
+                    evt = new TrafficEvent(line);
+                    eventList.add(evt);
+                }
+                catch (ParseException ex)
+                {
+                    Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
+                    System.out.println("Wrong format data in batch event file: " + line + " \nskipping.");
+                    System.out.println("Skipping badly formatted event.");
+                }
+            }
+        }
         System.out.println("Events file read, " + eventList.size() + " events queued.");
         // Put the events in chronological order

trunk/test/tmcsim/cadsimulator/managers/TrafficModelManagerTest.java

@@ -35 +35 @@
     }
 
-    /**
-     * Test of readBatchFile method, of class TrafficModelManager.
-     */
     public void testReadBatchFile() throws SimulationException, ParseException
     {
@@ -55 +52 @@
         assertEquals(expResult, result);
     }
-    
+    /**
+     * Test of readBatchFile method, of class TrafficModelManager.
+     */
+    public void testReadBatchFile2() throws SimulationException, ParseException
+    {
+        System.out.println("readBatchFile blank lines test");
+        String alpha = "    ";
+        String bravo = "187 00:00:37  55 S 6.88 0.2 R";
+        String dataIn = alpha + "\n" + bravo + "\n";
+        Scanner scan = new Scanner(dataIn);
+        
+        LinkedList<TrafficEvent> result = TrafficModelManager.readBatchFile(scan);
+        assertEquals(1,result.size());
+    }
+        
     public void testCreateIncidentMap() throws ParseException
     {