Index: trunk/src/tmcsim/application.properties =================================================================== --- trunk/src/tmcsim/application.properties (revision 176) +++ trunk/src/tmcsim/application.properties (revision 184) @@ -1,5 +1,5 @@ -#Tue, 24 Oct 2017 14:59:28 -0700 +#Sat, 28 Oct 2017 18:33:59 -0700 -Application.revision=174 +Application.revision=183 -Application.buildnumber=57 +Application.buildnumber=62 Index: trunk/src/tmcsim/client/ATMSBatchDriver.java =================================================================== --- trunk/src/tmcsim/client/ATMSBatchDriver.java (revision 183) +++ trunk/src/tmcsim/client/ATMSBatchDriver.java (revision 184) @@ -143,7 +143,5 @@ incidents = new HashMap>(); highways = new Highways( - "config/vds_data/lds.txt", - "config/vds_data/loop.txt", - "config/vds_data/highwaysMeta.txt", + "config/vds_data/highways_fullmap.txt", // "192.168.251.46", 8080); //IP address of FEP Sim Linux VM "localhost", 8080); Index: trunk/src/atmsdriver/ConsoleTrafficDriver.java =================================================================== --- trunk/src/atmsdriver/ConsoleTrafficDriver.java (revision 180) +++ trunk/src/atmsdriver/ConsoleTrafficDriver.java (revision 184) @@ -8,5 +8,4 @@ import java.io.FileInputStream; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Properties; @@ -48,7 +47,5 @@ // Create the Highway Model Highways highways = new Highways( - "config/vds_data/lds.txt", - "config/vds_data/loop.txt", - "config/vds_data/highwaysMeta.txt", + "config/vds_data/highways_fullmap.txt", ConsoleDriverProperties.getProperty( "FEPWriterHost"), Index: trunk/src/atmsdriver/ATMSDriver.java =================================================================== --- trunk/src/atmsdriver/ATMSDriver.java (revision 180) +++ trunk/src/atmsdriver/ATMSDriver.java (revision 184) @@ -17,5 +17,6 @@ * @version 09/10/2017 */ -public class ATMSDriver implements Runnable { +public class ATMSDriver implements Runnable +{ /** @@ -36,8 +37,7 @@ * @see ATMSDriver */ - private static enum PROPERTIES { - LDS_FILE_NAME("LDSFileName"), - LOOPS_FILE_NAME("LoopsFileName"), - HIGHWAY_META_FILE("HighwayMetaFileName"), + private static enum PROPERTIES + { + HIGHWAYS_MAP_FILE_NAME("HighwaysMapFileName"), EXCHANGE_FILE_NAME("ExchangeFileName"), FEP_WRITER_HOST("FEPWriterHost"), @@ -46,5 +46,6 @@ public String name; - private PROPERTIES(String n) { + private PROPERTIES(String n) + { name = n; } @@ -67,18 +68,23 @@ @Override - public void run() { + public void run() + { // Check for packets and update the simulator - while (true) { + while (true) + { // Flush the input file ExchangeInfo exInfo = exchangeReader.parse(ATMSDriverProperties .getProperty(PROPERTIES.EXCHANGE_FILE_NAME.name)); - try { + try + { highways.writeToFEP(); - } catch (SimulationException ex) { - System.out.println("Skipping writeToFEP..."); + } catch (SimulationException ex) + { + System.out.println("Skipping writeToFEP..."); } // Update if exchangeInfo is recieved - if (exInfo != null) { + if (exInfo != null) + { // TODO: handle this condition Logger.getLogger("ATMSDriver").log(Level.INFO, "exInfo is not null"); @@ -86,7 +92,9 @@ // Wait for FEP Sim to process the data we just sent - try { + try + { Thread.sleep(SLEEP_TIME); - } catch (InterruptedException ie) { + } catch (InterruptedException ie) + { ie.printStackTrace(); } @@ -94,7 +102,9 @@ } - public ATMSDriver(String propertiesFile) { + public ATMSDriver(String propertiesFile) + { // verify properties file - if (!verifyProperties(propertiesFile)) { + if (!verifyProperties(propertiesFile)) + { System.exit(0); } @@ -102,9 +112,5 @@ highways = new Highways( ATMSDriverProperties.getProperty( - PROPERTIES.LDS_FILE_NAME.name), - ATMSDriverProperties.getProperty( - PROPERTIES.LOOPS_FILE_NAME.name), - ATMSDriverProperties.getProperty( - PROPERTIES.HIGHWAY_META_FILE.name), + PROPERTIES.HIGHWAYS_MAP_FILE_NAME.name), ATMSDriverProperties.getProperty(PROPERTIES.FEP_WRITER_HOST.name), Integer.parseInt(ATMSDriverProperties.getProperty( @@ -113,17 +119,20 @@ exchangeReader = new ExchangeReader(); } - + /** * Verifies that the properties file has all necessary properties. - * + * * @param propertiesFile - * @return + * @return */ - private boolean verifyProperties(String propertiesFile) { + private boolean verifyProperties(String propertiesFile) + { // Load the properties file. - try { + try + { ATMSDriverProperties = new Properties(); ATMSDriverProperties.load(new FileInputStream(propertiesFile)); - } catch (Exception e) { + } catch (Exception e) + { ATMSDriverLogger.logp(Level.SEVERE, "ATMSDriver", "Constructor", "Exception in reading properties file.", e); @@ -136,19 +145,24 @@ * Runs the ATMS Driver. */ - public static void main(String[] args) { - try { - if (System.getProperty("ATMSDRIVER_PROPERTIES") != null) { + public static void main(String[] args) + { + try + { + if (System.getProperty("ATMSDRIVER_PROPERTIES") != null) + { // Create and run the ATMSDriver thread ATMSDriver atmsDriver = new ATMSDriver(System.getProperty("ATMSDRIVER_PROPERTIES")); Thread ATMSDriverThread = new Thread(atmsDriver); ATMSDriverThread.start(); - + // run the console driver, pass it the atmsDriver highways model ConsoleTrafficDriver driver = new ConsoleTrafficDriver(atmsDriver.highways); - - } else { + + } else + { throw new Exception("ATMSDRIVER_PROPERTIES system property not defined."); } - } catch (Exception e) { + } catch (Exception e) + { ATMSDriverLogger.logp(Level.SEVERE, "ATMSDriver", "Main", "Error occured initializing application", e); Index: trunk/src/atmsdriver/model/TrafficEvent.java =================================================================== --- trunk/src/atmsdriver/model/TrafficEvent.java (revision 183) +++ trunk/src/atmsdriver/model/TrafficEvent.java (revision 184) @@ -58,4 +58,5 @@ return eventDate.compareTo(o.eventDate); } + @Override public String toString() Index: trunk/src/atmsdriver/model/Station.java =================================================================== --- trunk/src/atmsdriver/model/Station.java (revision 180) +++ trunk/src/atmsdriver/model/Station.java (revision 184) @@ -1,5 +1,4 @@ package atmsdriver.model; -import atmsdriver.ConsoleTrafficDriver; import atmsdriver.model.LoopDetector.DOTCOLOR; import java.util.List; @@ -8,11 +7,11 @@ /** - *A Station (LDS or Loop Detector Station) represents a group of lane detectors + * A Station (LDS or Loop Detector Station) represents a group of lane detectors * across all lanes at a particular point on a highway. A station is * identified by its highway number and postmile. A station has an associated * direction used to establish which direction is Main and which is Opposite. * The MLTotVol and OppTotVol for a station can be dynamically updated. - * A station has other attributes: lineNum, ldsID, drop, and location used - * by the FEP. A station can be compared to other stations by its postmile. + * A station has other attributes: lineNum, ldsID, drop, and location which are + * used by the FEP. A station can be compared to other stations by its postmile. * * @author John A. Torres @@ -54,4 +53,9 @@ } + /** + * Calculates the total ML Volume. + * + * @return total ML volume. + */ private int getMLTotVol() { @@ -67,4 +71,9 @@ } + /** + * Calculates the total OPP Volume + * + * @return total OPP volume. + */ private int getOPPTotVol() { @@ -170,6 +179,15 @@ } } - } - + + this.MLTotVol = getMLTotVol(); + this.OppTotVol = getOPPTotVol(); + } + + /** + * Output for updateByDirection. Logs the update to the console. + * + * @param dotcolor + * @param OPP_ML + */ private void outputUpdateMessage(DOTCOLOR dotcolor, String OPP_ML) { @@ -181,4 +199,7 @@ } + /** + * XML tags used for toXML() method. + */ private static enum XML_TAGS { @@ -203,5 +224,10 @@ } } - + + /** + * Returns the Station data in XMLFormat. + * + * @param currElem The current XML element + */ public void toXML(Element currElem) { @@ -264,5 +290,4 @@ public static enum DIRECTION { - NORTH, SOUTH, Index: trunk/src/atmsdriver/model/FEPLine.java =================================================================== --- trunk/src/atmsdriver/model/FEPLine.java (revision 103) +++ trunk/src/atmsdriver/model/FEPLine.java (revision 184) @@ -1,53 +1,44 @@ package atmsdriver.model; +import java.util.ArrayList; import java.util.List; import org.w3c.dom.Document; import org.w3c.dom.Element; -/** An FEPLine is a simulated line of communication from the FEP to - * LoopDetectorStations in the traffic network. - * - * An FEPLine contains static meta data and a list of LoopDetectorStations. - * A single FEPLine contains multiple LoopDetectorStations. +/** + * An FEPLine is a simulated line of communication from the FEP to + * Stations in the highways network. + * + * An FEPLine contains static line meta data and a list of Stations. A + * single FEPLine contains multiple Stations. * * @author John A. Torres * @version 09/10/2017 - */ -public class FEPLine { + */ +final public class FEPLine +{ /* Static FEPLine meta data */ final public int lineNum; final public List stations; final private int count; - - final private int schedule; - final private int lineInfo; - final private long systemKey; - - // THESE WILL NEED TO BE UPDATED MAYBE, NOT SURE, NOT A PRIORITY. SEE METHOD - // UPDATESEQUENCES() - private long globalSeq; - private long scheduleSeq; - - public FEPLine(int lineNum, List stations, int count, - int schedule, int lineInfo, long systemKey, long globalSeq, - long scheduleSeq) + + /** + * Constructs an FEPLine from given line number, list of stations, and count. + * + * @param lineNum + * @param stations + * @param count + */ + FEPLine(int lineNum, ArrayList stations, int count) { this.lineNum = lineNum; this.stations = stations; this.count = count; - this.schedule = schedule; - this.lineInfo = lineInfo; - this.systemKey = systemKey; - this.globalSeq = globalSeq; - this.scheduleSeq = scheduleSeq; } - // NEED TO CHECK NUMBERS? DO WE EVEN NEED THIS? - public void updateSequences() - { - this.scheduleSeq += 1; - this.globalSeq += 51; - } - + /** + * Returns the FEPLine meta data in string format + * @return FEPLine metadata + */ public String getLineMeta() { @@ -59,5 +50,5 @@ build.append(Integer.toString(this.stations.size())); build.append("\n"); - for(Station station : stations) + for (Station station : stations) { build.append(station.getStationMeta()); @@ -66,42 +57,27 @@ } + /** + * Returns the FEPLine data in XMLFormat + * + * @param currElem The current XML element + */ public void toXML(Element currElem) { Document theDoc = currElem.getOwnerDocument(); - + Element lineElement = theDoc.createElement(XML_TAGS.LINE.tag); currElem.appendChild(lineElement); - + Element lineNumElement = theDoc.createElement(XML_TAGS.LINE_NUM.tag); lineNumElement.appendChild(theDoc.createTextNode(String.valueOf(this.lineNum))); lineElement.appendChild(lineNumElement); - + Element countElement = theDoc.createElement(XML_TAGS.COUNT.tag); countElement.appendChild(theDoc.createTextNode(String.valueOf(this.count))); lineElement.appendChild(countElement); - - Element scheduleElement = theDoc.createElement(XML_TAGS.SCHEDULE.tag); - scheduleElement.appendChild(theDoc.createTextNode(String.valueOf(this.schedule))); - lineElement.appendChild(scheduleElement); - - Element lineInfoElement = theDoc.createElement(XML_TAGS.LINE_INFO.tag); - lineInfoElement.appendChild(theDoc.createTextNode(String.valueOf(this.lineInfo))); - lineElement.appendChild(lineInfoElement); - - Element systemKeyElement = theDoc.createElement(XML_TAGS.SYSTEM_KEY.tag); - systemKeyElement.appendChild(theDoc.createTextNode(String.valueOf(this.systemKey))); - lineElement.appendChild(systemKeyElement); - - Element globalSeqElement = theDoc.createElement(XML_TAGS.GLOBAL_SEQ.tag); - globalSeqElement.appendChild(theDoc.createTextNode(String.valueOf(this.globalSeq))); - lineElement.appendChild(globalSeqElement); - - Element scheduleSeqElement = theDoc.createElement(XML_TAGS.SCHEDULE_SEQ.tag); - scheduleSeqElement.appendChild(theDoc.createTextNode(String.valueOf(this.scheduleSeq))); - lineElement.appendChild(scheduleSeqElement); - + Element stationsElement = theDoc.createElement(XML_TAGS.STATIONS.tag); lineElement.appendChild(stationsElement); - for(Station station : stations) + for (Station station : stations) { station.toXML(stationsElement); @@ -109,18 +85,17 @@ } + /** + * XML Tags used in toXML() + */ private static enum XML_TAGS { + LINE("Line"), LINE_NUM("Line_Num"), STATIONS("Stations"), - COUNT("Count"), - SCHEDULE("Schedule"), - LINE_INFO("Line_Info"), - SYSTEM_KEY("System_Key"), - GLOBAL_SEQ("Global_Seq"), - SCHEDULE_SEQ("Schedule_Seq"); - + COUNT("Count"); + String tag; - + private XML_TAGS(String n) { Index: trunk/src/atmsdriver/model/Highways.java =================================================================== --- trunk/src/atmsdriver/model/Highways.java (revision 180) +++ trunk/src/atmsdriver/model/Highways.java (revision 184) @@ -1,7 +1,7 @@ package atmsdriver.model; -import atmsdriver.FEPLineLoader; +import atmsdriver.model.Station.DIRECTION; import java.io.File; -import java.io.FileWriter; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintWriter; @@ -13,6 +13,5 @@ import java.util.HashMap; import java.util.Map; -import java.util.Observable; -import java.util.Observer; +import java.util.Scanner; import java.util.Set; import java.util.logging.Level; @@ -29,65 +28,73 @@ import tmcsim.common.SimulationException; -/** The Highways class aggregates all Highway instances within a geographic - * region, and all of the FEPLines within an electronic detector - * network, in the same geographic region. An instance of Highways.java - * comprises the underlying model for the ATMSDriver application. - * - * Highways uses method writeToFEP() to communicate with the FEP Simulator. - * It creates a socket client which sends the FEP Simulator a highways status - * message over the socket. This message is in the XML format required by the - * FEP Simulator, which is provided by the resident toXML() method. - * - * Currently, there is no driving logic within the highways class. It is only - * done through an instance of the ConsoleDriver.java class. Eventually, it - * will receive incident data (from exchange.xml or better yet, directly from - * the TMCSimulator itself) and drive the highways using resident logic. +/** + * The Highways class aggregates all Highway instances within a geographic + * region, and all of the FEPLines within an electronic detector network, in the + * same geographic region. An instance of Highways.java comprises the underlying + * model for the ATMSDriver application. + * + * Highways uses method writeToFEP() to communicate with the FEP Simulator. It + * creates a socket client which sends the FEP Simulator a highways status + * message over the socket. This message is sent in the format required by the + * FEP Simulator. + * + * Currently, there is no driving logic within the highways class. It is only + * done through an instance of the ConsoleDriver.java class. Eventually, it will + * receive incident data (from exchange.xml or better yet, directly from the + * TMCSimulator itself) and drive the highways using resident logic. * * @author John A. Torres */ -public class Highways { - - final private ArrayList lines; +final public class Highways +{ + final private String FEPHostName; final private int FEPPortNum; + final private ArrayList lines; final public ArrayList highways; - - public Highways(String ldsFileName, String loopsFileName, - String highwayMetaFileName, String FEPHostName, int FEPPortNum) { - /* - lines = loadLines(highwayMetaFileName); - System.out.println("SIZE: " + toXML().toCharArray().length); - */ - - FEPLineLoader ldr = new FEPLineLoader(new File(ldsFileName), new File(loopsFileName)); - this.lines = (ArrayList) ldr.getFEPLines(); + + public Highways(String highwaysMapFileName, String FEPHostName, int FEPPortNum) + { + // load FEP Lines + lines = loadLines(highwaysMapFileName); + // configure and load highways + this.highways = configureHighways(); + + // write to FEP host and port number this.FEPHostName = FEPHostName; this.FEPPortNum = FEPPortNum; - this.highways = loadHighways(); - //writeHighwaysMeta("hard.txt"); - } - - private ArrayList loadHighways() { + } + + private ArrayList configureHighways() + { System.out.println("Loading highways..."); // The list of highways to return ArrayList highways = new ArrayList(); - Map> - highwayMap = new HashMap<>(); + // map of hwy number to its list of stations + Map> highwayMap = new HashMap<>(); + // iterate through FEPLines and get data to add to the above map for (FEPLine line : lines) { + // grab all stations from the current FEPLine ArrayList lineStations = (ArrayList) line.stations; - for(Station station : lineStations) + // iterate through each station in the list of stations + for (Station station : lineStations) { Integer hwyNum = station.routeNumber; - - if(!highwayMap.containsKey(hwyNum)) + + // if the map does not contain an entry for the highway, create + // a new entry (key/value pair) for the highway and instantiate + // the empty list of stations + if (!highwayMap.containsKey(hwyNum)) { ArrayList stnList = new ArrayList<>(); stnList.add(station); highwayMap.put(hwyNum, stnList); - } + } + // if the map does have an entry for the highway, add the current + // station to its list of stations else { @@ -97,11 +104,14 @@ } + // get the set of highway numbers Set hwyKeys = highwayMap.keySet(); - for(Integer hwyKey : hwyKeys) + // get the highway number and associated stations and create a new hwy + // and add the hwy to this.highways + for (Integer hwyKey : hwyKeys) { ArrayList hwyStations = highwayMap.get(hwyKey); Collections.sort(hwyStations); System.out.println("Loaded highway " + hwyKey + "..."); - highways.add(new Highway(hwyKey, + highways.add(new Highway(hwyKey, hwyStations)); } @@ -109,9 +119,11 @@ return highways; } - /** - * Applies specified color to the specified highway stretch. Route number and - * direction specify the highway. Postmile and range specify the stretch of - * specified highway. Dot color is the color to be applied to the stretch. - * + + /** + * Applies specified color to the specified highway stretch. Route number + * and direction specify the highway. Postmile and range specify the stretch + * of specified highway. Dot color is the color to be applied to the + * stretch. + * * @param routeNumber highway route number * @param direction highway direction @@ -120,22 +132,22 @@ * @param dotColor the color to be applied to specified highway stretch */ - public void applyColorToHighwayStretch(Integer routeNumber, Station.DIRECTION direction, - Double postmile, Double range, LoopDetector.DOTCOLOR dotColor) { - System.out.println("Applying " + dotColor.name() + " dots to highway " - + routeNumber + " " + direction.name() + " at postmile " + public void applyColorToHighwayStretch(Integer routeNumber, Station.DIRECTION direction, + Double postmile, Double range, LoopDetector.DOTCOLOR dotColor) + { + System.out.println("Applying " + dotColor.name() + " dots to highway " + + routeNumber + " " + direction.name() + " at postmile " + postmile + " with a range of " + range + " miles..."); - + // Get the highway by route number Highway highway = getHighwayByRouteNumber(routeNumber); - + // start value for highway section, and end value for highway section // by postmile Double startPost; Double endPost; - + // postmiles increase from s to n and w to e - // if the direction is south or west - if(direction.equals(Station.DIRECTION.SOUTH) || direction.equals(Station.DIRECTION.WEST)) + if (direction.equals(Station.DIRECTION.SOUTH) || direction.equals(Station.DIRECTION.WEST)) { // add range value to startPost to get @@ -143,28 +155,27 @@ startPost = postmile; endPost = postmile + range; - + // iterate through the stations, if within the specified highway // stretch, update the station by direction and apply dot color - for(Station station : highway.stations) - { - if(station.postmile >= startPost && station.postmile <= endPost) + for (Station station : highway.stations) + { + if (station.postmile >= startPost && station.postmile <= endPost) { station.updateByDirection(direction, dotColor); } } - } - // if the direction is north or east + } // if the direction is north or east else { - //subtract range value from startPost + // subtract range value from startPost // to get the end postmile value of the highway section startPost = postmile; endPost = postmile - range; - + // iterate through the stations, if within the specified highway // section, update the station by direction and apply dot color - for(Station station : highway.stations) - { - if(station.postmile <= startPost && station.postmile >= endPost) + for (Station station : highway.stations) + { + if (station.postmile <= startPost && station.postmile >= endPost) { station.updateByDirection(direction, dotColor); @@ -174,158 +185,203 @@ System.out.println(""); } - - /* - private ArrayList loadLines(String highwayMetaFileName) { - ArrayList lines = new ArrayList<>(); - try { - Scanner sc = new Scanner(new File(highwayMetaFileName)); - String firstLine = sc.nextLine(); - - Scanner linesc = new Scanner(firstLine); - int numLines = linesc.nextInt(); - linesc.close(); - - for (int i = 0; i < numLines; i++) { - System.out.println("CURR: " + i); - lines.add(loadLine(sc)); - } - sc.close(); - - } catch (FileNotFoundException ex) { - Logger.getLogger(Highways.class.getName()).log(Level.SEVERE, null, ex); - } - return lines; - } - - private FEPLine loadLine(Scanner sc) { - String line = sc.nextLine(); - System.out.println(line); - Scanner scline = new Scanner(line); - - int lineNum = scline.nextInt(); - int count = scline.nextInt(); - int numStations = scline.nextInt(); - ArrayList stations = new ArrayList<>(); - for (int i = 0; i < numStations; i++) { - stations.add(loadStation(sc, lineNum)); - } - - return new FEPLine(lineNum, stations, count); - } - - private Station loadStation(Scanner sc, int lineNum) { - String line = sc.nextLine(); - System.out.println(line); - Scanner scline = new Scanner(line); - int ldsID = scline.nextInt(); - int drop = scline.nextInt(); - int fwy = scline.nextInt(); - DIRECTION dir = DIRECTION.getEnum(scline.next()); - double postmile = scline.nextDouble(); - int numLoops = scline.nextInt(); - String location = getStationLoc(line); - ArrayList loops = new ArrayList<>(); - for (int i = 0; i < numLoops; i++) { - loops.add(loadLoop(sc)); - } - - return new Station(lineNum, ldsID, drop, location, loops, fwy, dir, postmile); - } - - private LoopDetector loadLoop(Scanner sc) { - String line = sc.nextLine(); - Scanner scline = new Scanner(line); - - int loopID = scline.nextInt(); - int laneNum = scline.nextInt(); - String loopLoc = getLoopLoc(line); // NEED GET LOOPLOC - scline.close(); - return new LoopDetector(loopID, loopLoc, laneNum); - } - - private String getLoopLoc(String line) { - Scanner sc = new Scanner(line); - sc.nextInt(); - sc.nextInt(); + + /** + * Loads all FEPLines from the specified highways map file. + * + * @param highwaysMapFileName + * @return List of FEPLines + */ + private ArrayList loadLines(String highwaysMapFileName) + { + ArrayList lines = new ArrayList<>(); + try + { + Scanner sc = new Scanner(new File(highwaysMapFileName)); + String firstLine = sc.nextLine(); + + Scanner linesc = new Scanner(firstLine); + int numLines = linesc.nextInt(); + linesc.close(); + + for (int i = 0; i < numLines; i++) + { + lines.add(loadLine(sc)); + } + sc.close(); + + } catch (FileNotFoundException ex) + { + Logger.getLogger(Highways.class.getName()).log(Level.SEVERE, null, ex); + } + return lines; + } + + /** + * Loads a single FEP Line from the highways map file. + * + * @param sc scanner at the current FEPLine line + * @return FEPLine + */ + private FEPLine loadLine(Scanner sc) + { + String line = sc.nextLine(); + Scanner scline = new Scanner(line); + + int lineNum = scline.nextInt(); + int count = scline.nextInt(); + int numStations = scline.nextInt(); + ArrayList stations = new ArrayList<>(); + for (int i = 0; i < numStations; i++) + { + stations.add(loadStation(sc, lineNum)); + } + + return new FEPLine(lineNum, stations, count); + } + + /** + * Loads a single Station from the highways map file + * @param sc scanner at the current station line + * @param lineNum the FEPLine number for the station + * @return Station + */ + private Station loadStation(Scanner sc, int lineNum) + { + String line = sc.nextLine(); + Scanner scline = new Scanner(line); + int ldsID = scline.nextInt(); + int drop = scline.nextInt(); + int fwy = scline.nextInt(); + DIRECTION dir = DIRECTION.toDirection(scline.next()); + double postmile = scline.nextDouble(); + int numLoops = scline.nextInt(); + String location = getStationLoc(line); + ArrayList loops = new ArrayList<>(); + for (int i = 0; i < numLoops; i++) + { + loops.add(loadLoop(sc)); + } + + return new Station(lineNum, ldsID, drop, location, loops, fwy, dir, postmile); + } + + /** + * Loads a single loop from the highways map file + * + * @param sc scanner at the current loop line + * @return LoopDetector + */ + private LoopDetector loadLoop(Scanner sc) + { + String line = sc.nextLine(); + Scanner scline = new Scanner(line); + + int loopID = scline.nextInt(); + int laneNum = scline.nextInt(); + String loopLoc = getLoopLoc(line); // NEED GET LOOPLOC + scline.close(); + return new LoopDetector(loopID, loopLoc, laneNum); + } + + /** + * Scans the LoopDetector line and grabs the String location from the line. + * + * @param line the line containing the location + * @return A String loop location. + */ + private String getLoopLoc(String line) + { + Scanner sc = new Scanner(line); + sc.nextInt(); + sc.nextInt(); // GRABS FROM CURRENT TO END OF LINE - - sc.useDelimiter("\\z"); - String loc = sc.next().trim(); - sc.close(); - return loc; - } - - // Returns the loction given the whole line from the lookup file - private String getStationLoc(String line) { - Scanner scline = new Scanner(line); - scline.nextInt(); - scline.nextInt(); - scline.nextInt(); - scline.next(); - scline.nextDouble(); - scline.nextInt(); - - // GRABS FROM CURRENT TO END OF LINE - scline.useDelimiter("\\z"); - String loc = scline.next().trim(); - scline.close(); - return loc; - } - */ - - public void writeToFEP() throws SimulationException { - try { - Socket sock = new Socket(FEPHostName /*"192.168.251.130"*/, 8080); + sc.useDelimiter("\\z"); + String loc = sc.next().trim(); + sc.close(); + return loc; + } + + /** + * Scans the Station line and grabs the String location from the line. + * + * @param line the line containing the location + * @return A String station location. + */ + private String getStationLoc(String line) + { + Scanner scline = new Scanner(line); + scline.nextInt(); + scline.nextInt(); + scline.nextInt(); + scline.next(); + scline.nextDouble(); + scline.nextInt(); + + // GRABS FROM CURRENT TO END OF LINE + scline.useDelimiter("\\z"); + String loc = scline.next().trim(); + scline.close(); + return loc; + } + + /** + * Creates a socket client that writes the Highways data to the FEP Simulator. + * + * @throws SimulationException + */ + public void writeToFEP() throws SimulationException + { + try + { + // Create the socket to the FEP Simulator + Socket sock = new Socket(FEPHostName, FEPPortNum); PrintWriter out = new PrintWriter(sock.getOutputStream(), true); + + // Print the number of bytes the highways data message contains System.out.println("BYTES: " + this.toXML().toCharArray().length + 1); + + // Write the highways data over the socket out.println(this.toXML()); + + // close the socket sock.close(); - } catch (IOException ex) { + } catch (IOException ex) + { Logger.getLogger(Highways.class.getName()).log(Level.SEVERE, null, ex); System.out.println("Highway Model failed writing to FEPSim."); throw new SimulationException(SimulationException.BINDING); } - updateSequences(); - } - - // CHECK: DO WE EVEN NEED TO DO THIS? - private void updateSequences() { - for (FEPLine line : lines) { - line.updateSequences(); - } - } - - /** - * Returns the network metadata in condensed form. This is just a quick - * script function to make a proper highway metadata configuration file, so - * that we can read the network faster. + } + + /** + * Returns the highways metadata in condensed form. This function took the + * highways model and wrote it into condensed form. It is also useful for + * testing. * - * @return Network metadata - */ - public void writeHighwaysMeta(String fileName) { - - try { - FileWriter fw = new FileWriter(new File(fileName)); + * @return the highways meta data string + */ + public String getHighwaysMeta() + { StringBuilder build = new StringBuilder(); build.append(lines.size()); build.append("\n"); - System.out.println(lines.size()); - fw.write(build.toString()); - int count = 1; - for (FEPLine line : lines) { - System.out.println("Writing num: " + count); - count++; - fw.write(line.getLineMeta()); - - } - } catch (IOException ex) { - Logger.getLogger(Highways.class.getName()).log(Level.SEVERE, null, ex); - } - } - - public String toXML() { + for (FEPLine line : lines) + { + build.append(line.getLineMeta()); + } + return build.toString(); + } + + /** + * Returns the Highways model data in XML format. + * + * @return highways data in XML format + */ + public String toXML() + { String xml = null; - try { + try + { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); @@ -335,5 +391,6 @@ theDoc.appendChild(networkElement); - for (FEPLine line : lines) { + for (FEPLine line : lines) + { line.toXML(networkElement); } @@ -349,5 +406,6 @@ xml = out.toString(); out.close(); - } catch (Exception ex) { + } catch (Exception ex) + { Logger.getLogger(Highways.class.getName()).log(Level.SEVERE, null, ex); } @@ -356,9 +414,16 @@ } - public Highway getHighwayByRouteNumber(Integer routeNum) { + /** + * Returns a highway by given highway number. + * + * @param routeNum + * @return Highway with specified route number + */ + public Highway getHighwayByRouteNumber(Integer routeNum) + { Highway returnHwy = null; - for(Highway hwy : highways) - { - if(hwy.routeNumber.equals(routeNum)) + for (Highway hwy : highways) + { + if (hwy.routeNumber.equals(routeNum)) { returnHwy = hwy; @@ -369,5 +434,9 @@ } - private static enum XML_TAGS { + /** + * XML tags used in writeToXML() + */ + private static enum XML_TAGS + { NETWORK("Network"); @@ -375,5 +444,6 @@ String tag; - private XML_TAGS(String n) { + private XML_TAGS(String n) + { tag = n; } Index: trunk/src/atmsdriver/model/LoopDetector.java =================================================================== --- trunk/src/atmsdriver/model/LoopDetector.java (revision 180) +++ trunk/src/atmsdriver/model/LoopDetector.java (revision 184) @@ -6,5 +6,6 @@ import org.w3c.dom.Element; -/** A LoopDetector represents a single detector for a single lane in a network. +/** + * A LoopDetector represents a single detector for a single lane in a network. * * A LoopDetector contains static meta data, and three dynamic attributes: vol, @@ -26,4 +27,11 @@ private int spd; + /** + * Constructs a LoopDetector from loopID, loopLocation, and laneNum + * + * @param loopID + * @param loopLocation + * @param laneNum + */ public LoopDetector(int loopID, String loopLocation, int laneNum) { @@ -39,4 +47,7 @@ } + /** + * XML tags used for toXML() method. + */ private static enum XML_TAGS { @@ -89,5 +100,10 @@ this.spd = spd; } - + + /** + * Returns the LoopDetector data in XMLFormat + * + * @param currElem The current XML element + */ public void toXML(Element currElem) { Index: trunk/src/atmsdriver/FEPLineLoader.java =================================================================== --- trunk/src/atmsdriver/FEPLineLoader.java (revision 103) +++ (revision ) @@ -1,273 +1,0 @@ -package atmsdriver; - -import atmsdriver.model.FEPLine; -import atmsdriver.model.Station; -import atmsdriver.model.LoopDetector; -import atmsdriver.model.Station.DIRECTION; -import java.io.File; -import java.io.FileNotFoundException; -import java.util.ArrayList; -import java.util.List; -import java.util.Scanner; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** The FEPLineLoader loads all static data for the FEPLines, using the station - * and loop lookup files. - * - * THIS CLASS WILL BE REMOVED AND THE LOADING OF FEPLINES WILL BE THE RESPONSIBILITY - * OF THE HIGHWAYS.JAVA CLASS FOR PROPER OOP. JUST USING FOR NOW BECAUSE IT WORKS. - * - * The public method getFEPLines() method can be used to get all the FEPLines - * within the network. All other methods are private and are used to construct - * the FEPLines. - * - * @author John A. Torres - * @version 09/10/2017 - */ -public class FEPLineLoader { - // Two network config files - private final File LDSFile; - private final File loopFile; - - // The list of FEPLines - private List lines; - - /** - * Constructor - * @param LDSFile contains FEPLine and Station static data - * @param loopFile contains individual LoopDetector static data - */ - public FEPLineLoader(File LDSFile, File loopFile) - { - this.LDSFile = LDSFile; - this.loopFile = loopFile; - this.lines = new ArrayList<>(); - constructFEPLines(); - } - - /** - * Returns the list of FEPLines in the configured network - */ - public List getFEPLines() - { - return lines; - } - - // returns a list of the line numbers found in LDSFile - private ArrayList getLineNums(Scanner sc) - { - ArrayList lineNums = new ArrayList<>(); - - sc.nextLine(); // skip first line - - while(sc.hasNext()) - { - sc.nextInt(); // skip to line no - Integer lineNum = sc.nextInt(); // get the line number - - /* If the line is new, and has not been added, add it to lineNums */ - if(!lineNums.contains(lineNum)) - { - lineNums.add(lineNum); - } - - sc.nextLine(); // skip to next line - } - - sc.close(); - - return lineNums; - } - - // returns a list of station numbers for a given line - private ArrayList getStationNums(Integer lineNum, Scanner sc) - { - ArrayList stnNums = new ArrayList<>(); - - sc.nextLine(); // skip first line - - while(sc.hasNext()) - { - Integer stnNum = sc.nextInt(); - Integer theLine = sc.nextInt(); - if(theLine.equals(lineNum)) - { - stnNums.add(stnNum); - } - - sc.nextLine(); - } - - sc.close(); - - return stnNums; - } - - // returns a list of loop detectors for a given station - private ArrayList getLoops(Integer stnNum, Scanner sc) - { - ArrayList loops = new ArrayList<>(); - - sc.nextLine(); // skip first line - - while(sc.hasNext()) - { - sc.next(); // skip FWY - sc.next(); // skip dir - sc.next(); // skip postmile - Integer ldsID = sc.nextInt(); // lds id - sc.next(); // skip vdsID - Integer loopID = sc.nextInt(); // loop id - sc.next(); // skip LOC - Integer laneNum = sc.nextInt(); // lane number - String loopLoc = sc.next(); - if(stnNum.equals(ldsID)) - { - LoopDetector loop = new LoopDetector(loopID, loopLoc, laneNum); - loops.add(loop); - } - sc.nextLine(); - } - - sc.close(); - - return loops; - } - - // method called to actually build the network from config files - private void constructFEPLines() - { - try { - System.out.println("Building network..."); - - // Get FEPLine IDs - ArrayList lineNums = getLineNums(new Scanner(LDSFile)); - - // Create each FEPLine in the network - for(Integer lineNum : lineNums) - { - // Get Station IDs for the current FEPLine - ArrayList stnNums = getStationNums(lineNum, - new Scanner(LDSFile)); - - // Create each Station for the current FEPLine - ArrayList stns = new ArrayList<>(); - for(Integer stnNum : stnNums) - { - // Get Loops for the current Station - ArrayList loops = - getLoops(stnNum, new Scanner(loopFile)); - - // Create the Station and add to list for curr FEPLine - Station stn = - createStation(stnNum, new Scanner(LDSFile), loops); - stns.add(stn); - } - - // Now that stations are created, create the actual FEPLine and - // and to FEPLines list - FEPLine line = createLine(lineNum, new Scanner(LDSFile), stns); - lines.add(line); - } - } catch (FileNotFoundException ex) { - Logger.getLogger(FEPLineLoader.class.getName()).log(Level.SEVERE, null, ex); - } - } - - // Creates line - private FEPLine createLine(int lineNum, Scanner scLine, ArrayList stns) - { - FEPLine line = null; - - scLine.nextLine(); - - while(scLine.hasNext()) - { - scLine.nextInt(); // skip ldsID - int currLineNum = scLine.nextInt(); // linenum - if(currLineNum == lineNum) - { - scLine.nextInt(); // skip drop - int sch = scLine.nextInt(); // schedule - int lineinfo = scLine.nextInt(); // lineinfo - int sysKey = scLine.nextInt(); // sysKey - int schSeq = scLine.nextInt(); // schSeq - int globSeq = scLine.nextInt(); // globSeq - int count = scLine.nextInt(); // count - - line = new FEPLine(lineNum, stns, count, sch, lineinfo, sysKey, globSeq, schSeq); - - break; - } - - scLine.nextLine(); - } - - scLine.close(); - - return line; - } - - // Returns the loction given the whole line from the lookup file - private String getLocation(String line) - { - Scanner sc = new Scanner(line); - sc.nextInt(); // skip lds num - sc.nextInt(); // skip line num - int drop = sc.nextInt(); // drop num - sc.nextInt(); // skip schedule - sc.nextInt(); // skip lineinfo - sc.nextInt(); // skp systemkey - sc.nextInt(); // skip sch_seq - sc.nextInt(); // skip glob_seq - sc.nextInt(); // skip count - sc.nextInt(); // fwy - DIRECTION dir = DIRECTION.toDirection(sc.next()); // direction - sc.nextDouble(); - - /** GRABS FROM CURRENT TO END OF LINE */ - sc.useDelimiter("\\z"); - String loc = sc.next().trim(); - sc.close(); - return loc; - } - - // creates a Station - private Station createStation(int stnNum, Scanner sc, ArrayList detectors) - { - Station LDS = null; - - sc.nextLine(); - - while(sc.hasNext()) - { - String strLine = sc.nextLine(); - Scanner scLine = new Scanner(strLine); - int ldsID = scLine.nextInt(); // get curr lds id - if(ldsID == stnNum) // if we are on correct stn - { - int lineNum = scLine.nextInt(); // skip line num - int drop = scLine.nextInt(); // drop num - scLine.nextInt(); // skip schedule - scLine.nextInt(); // skip lineinfo - scLine.nextInt(); // skp systemkey - scLine.nextInt(); // skip sch_seq - scLine.nextInt(); // skip glob_seq - scLine.nextInt(); // skip count - int fwy = scLine.nextInt(); // fwy - DIRECTION dir = DIRECTION.toDirection(scLine.next()); // direction - double postmile = scLine.nextDouble(); - String ldsName = getLocation(strLine); /************* DOESNT GRAB WHOLE???? *///// - LDS = new Station(lineNum, ldsID, drop, ldsName, detectors, fwy, dir, postmile); - - break; - } - scLine.close(); - } - - sc.close(); - - return LDS; - } -}