Changeset 194 in tmcsimulator for trunk

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.

Location:

trunk

Files:

• src/atmsdriver/model/Highways.java (modified) (1 diff)
• test/atmsdriver/TrafficModelEventDriver.java (modified) (7 diffs)

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();
     }

trunk/test/atmsdriver/TrafficModelEventDriver.java

@@ -1 +1 @@
 package atmsdriver;
 
-import tmcsim.client.*;
 import atmsdriver.model.Highways;
 import atmsdriver.model.TrafficEvent;
-import atmsdriver.model.LoopDetector.DOTCOLOR;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Scanner;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JOptionPane;
 import javax.swing.JWindow;
-import javax.swing.Timer;
-import javax.swing.UIManager;
-import tmcsim.common.SimulationException;
-import tmcsim.interfaces.CADClientInterface;
-import tmcsim.interfaces.CoordinatorInterface;
 
 /**
@@ -39 +26 @@
  * @author jdalbey
  */
-public class TrafficModelEventDriver extends UnicastRemoteObject implements
-        CADClientInterface
+public class TrafficModelEventDriver 
 {
-    private final static SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
     /**
      * Error logger.
      */
-    private static Logger cadClientLogger = Logger.getLogger("tmcsim.client");
-
-    @Override
-    public void refresh() throws RemoteException
-    {
-        System.out.println("ATMSBatchDriver.refresh() was invoked.");
-    }
+    private static Logger logger = Logger.getLogger("trafficmodeleventdriver");
 
     /**
@@ -69 +48 @@
 
     /**
-     * Constructor. Initialize data from parsed properties file. Create a socket
-     * connection to the CADSimulator.
+     * Constructor. Load highways and events.
      *
-     * @param propertiesFile File path (absolute or relative) to the properties
-     * file containing configuration data.
      */
     public TrafficModelEventDriver() throws RemoteException
@@ -86 +62 @@
         // READ THE BATCH FILE OF COMMANDS and put in a queue
         readBatchFile();
-
+    }
+    public void run()
+    {
         // If we have any events left to process
         while (!eventQueue.isEmpty())
         {
-            // Get the time to launch the next event
+            // Get next event
             TrafficEvent nextEvent = eventQueue.peek();
             System.out.println("LAUNCHING EVENT: " + nextEvent.toString());
@@ -99 +77 @@
             // Remove this event from the queue, we're done with it.
             eventQueue.remove();
-
         }
-
     }
 
@@ -158 +134 @@
 
     /**
-     * Format a time in seconds as HH:MM:SS
-     *
-     * @param l
-     * @return
-     */
-    private String formatInterval(final long l)
-    {
-        final long hr = TimeUnit.SECONDS.toHours(l);
-        final long min = TimeUnit.SECONDS.toMinutes(l - TimeUnit.HOURS.toSeconds(hr));
-        final long sec = TimeUnit.SECONDS.toSeconds(l - TimeUnit.HOURS.toSeconds(hr) - TimeUnit.MINUTES.toSeconds(min));
-        return String.format("%02d:%02d:%02d", hr, min, sec);
-    }
-    /**
-     * Construct the CADClient with the properties file path, either from the
-     * command line arguments or default.
+     * local main to launch the app.
      *
      * @param args Command line arguments.
@@ -178 +140 @@
     public static void main(String[] args)
     {
-        if (System.getProperty("CONFIG_DIR") == null)
-        {
-            System.setProperty("CONFIG_DIR", "config");
-        }
-
         try
         {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            new TrafficModelEventDriver();
-
+            TrafficModelEventDriver driver = new TrafficModelEventDriver();
+            driver.run();
         }
         catch (Exception e)
         {
-            cadClientLogger.logp(Level.SEVERE, "SimulationManager", "Main",
+            logger.logp(Level.SEVERE, "Traffic Model Event Driver", "Main",
                     "Error initializing application.");