Index: trunk/src/atmsdriver/model/Station.java =================================================================== --- trunk/src/atmsdriver/model/Station.java (revision 186) +++ trunk/src/atmsdriver/model/Station.java (revision 190) @@ -22,5 +22,5 @@ /* Static Station meta data */ - final public int lineNum; + final public int lineID; final public int ldsID; // double check final public int drop; @@ -36,9 +36,9 @@ /* Constructor */ - public Station(int lineNum, int ldsID, int drop, + public Station(int lineID, int ldsID, int drop, String location, List loops, int hwy, DIRECTION direction, double postmile) { - this.lineNum = lineNum; + this.lineID = lineID; this.ldsID = ldsID; this.drop = drop; @@ -186,6 +186,5 @@ { // UPDATE LOOP WITH VALUES - int speed = 0; - loop.updateLoop(dotColor.volume(), dotColor.occupancy(), speed); + loop.updateLoop(dotColor.volume(), dotColor.occupancy()); } } @@ -253,5 +252,5 @@ Element lineNumElement = theDoc.createElement(XML_TAGS.LINE_NUM.tag); - lineNumElement.appendChild(theDoc.createTextNode(String.valueOf(this.lineNum))); + lineNumElement.appendChild(theDoc.createTextNode(String.valueOf(this.lineID))); stationElement.appendChild(lineNumElement); Index: trunk/src/atmsdriver/model/FEPLine.java =================================================================== --- trunk/src/atmsdriver/model/FEPLine.java (revision 186) +++ trunk/src/atmsdriver/model/FEPLine.java (revision 190) @@ -19,5 +19,5 @@ { /* Static FEPLine meta data */ - final public int lineNum; + final public int lineID; final public List stations; final private int count; @@ -30,7 +30,7 @@ * @param count */ - FEPLine(int lineNum, ArrayList stations, int count) + FEPLine(int lineID, ArrayList stations, int count) { - this.lineNum = lineNum; + this.lineID = lineID; this.stations = stations; this.count = count; @@ -55,5 +55,5 @@ { StringBuilder build = new StringBuilder(); - build.append(Integer.toString(this.lineNum)); + build.append(Integer.toString(this.lineID)); build.append(" "); build.append(Integer.toString(this.count)); @@ -81,5 +81,5 @@ Element lineNumElement = theDoc.createElement(XML_TAGS.LINE_NUM.tag); - lineNumElement.appendChild(theDoc.createTextNode(String.valueOf(this.lineNum))); + lineNumElement.appendChild(theDoc.createTextNode(String.valueOf(this.lineID))); lineElement.appendChild(lineNumElement); Index: trunk/src/atmsdriver/model/Highways.java =================================================================== --- trunk/src/atmsdriver/model/Highways.java (revision 186) +++ trunk/src/atmsdriver/model/Highways.java (revision 190) @@ -61,5 +61,5 @@ // configure and load highways this.highways = configureHighways(); - + // write to FEP host and port number this.FEPHostName = FEPHostName; @@ -278,8 +278,7 @@ int loopID = scline.nextInt(); - int laneNum = scline.nextInt(); - String loopLoc = getLoopLoc(line); // NEED GET LOOPLOC + String loopLoc = getLoopLoc(line); scline.close(); - return new LoopDetector(loopID, loopLoc, laneNum); + return new LoopDetector(loopID, loopLoc); } @@ -293,5 +292,4 @@ { Scanner sc = new Scanner(line); - sc.nextInt(); sc.nextInt(); @@ -343,5 +341,5 @@ // Write the highways data over the socket - out.println(this.toXML()); + out.println(this.toCondensedFormat(false)); // close the socket @@ -369,4 +367,37 @@ * @param MetaDataOnly Whether you want meta data, or a full dump for FEPSim * @return String, highways data in condensed format + * + * Example toCondensedFormat(MetaDataOnly = false) output: + * + * 43 // "number of lines" + * 32 0 13 // "line id" "count num" "number of stations" + * 1210831 1 5 S 0.9 8 // "station id" "drop num" "route num"... + * // ..."direction" "postmile" "number of loops" + * 1210832 0.0 0 // "loop id" "occ" "vol" + * 1210833 0.0 0 // .. + * 1210834 0.0 0 // .. + * 1210835 0.0 0 // .. + * 1210836 0.0 0 // .. + * 1210837 0.0 0 // .. + * 1210838 0.0 0 // .. + * 1210839 0.0 0 // .. + * ... + * + * Example toCondensedFormat(MetaDataOnly = true) output: + * + * 43 // "number of lines" + * 32 0 13 // "line id" "count num" "number of stations" + * 1210831 1 5 S 0.9 8 CALAFIA // "station id" "drop num" "route num"... + * // ..."direction" "postmile"... + * // ..."number of loops" "string location" + * 1210832 ML_1 // "loop id" "loop location" + * 1210833 ML_2 // " " + * 1210834 ML_3 // " " + * 1210835 ML_4 // " " + * 1210836 PASSAGE // " " + * 1210837 DEMAND // " " + * 1210838 QUEUE // " " + * 1210839 RAMP_OFF // " " + * ... */ public String toCondensedFormat(boolean MetaDataOnly) Index: trunk/src/atmsdriver/model/LoopDetector.java =================================================================== --- trunk/src/atmsdriver/model/LoopDetector.java (revision 186) +++ trunk/src/atmsdriver/model/LoopDetector.java (revision 190) @@ -20,10 +20,8 @@ final public int loopID; final public String loopLocation; - final public int laneNum; /* dynamic data */ public int vol; public float occ; - private int spd; /** @@ -34,14 +32,12 @@ * @param laneNum */ - public LoopDetector(int loopID, String loopLocation, int laneNum) + public LoopDetector(int loopID, String loopLocation) { /* Set static data */ this.loopID = loopID; this.loopLocation = loopLocation; - this.laneNum = laneNum; /* Init dynamic data */ this.vol = 0; - this.spd = 0; this.occ = 0; } @@ -54,7 +50,5 @@ LOOP_ID("Loop_ID"), LOOP_LOCATION("Loop_Location"), - LANE_NUM("Lane_Num"), VOL("Vol"), - SPD("Spd"), OCC("Occ"), LOOP("Loop"); @@ -88,6 +82,4 @@ build.append(Integer.toString(this.loopID)); build.append(" "); - build.append(Integer.toString(this.laneNum)); - build.append(" "); if(!MetaDataOnly) { @@ -96,6 +88,4 @@ build.append(" "); build.append(this.vol); - build.append(" "); - build.append(this.spd); } else @@ -113,9 +103,8 @@ * @param spd speed */ - public void updateLoop(int vol, float occ, int spd) + public void updateLoop(int vol, float occ) { this.vol = vol; this.occ = occ; - this.spd = spd; } @@ -140,8 +129,4 @@ loopElement.appendChild(loopLocElement); - Element laneNumElement = theDoc.createElement(XML_TAGS.LANE_NUM.tag); - laneNumElement.appendChild(theDoc.createTextNode(String.valueOf(this.laneNum))); - loopElement.appendChild(laneNumElement); - Element volElement = theDoc.createElement(XML_TAGS.VOL.tag); volElement.appendChild(theDoc.createTextNode(String.valueOf(this.vol))); @@ -151,8 +136,4 @@ occElement.appendChild(theDoc.createTextNode(String.valueOf(this.occ))); loopElement.appendChild(occElement); - - Element spdElement = theDoc.createElement(XML_TAGS.SPD.tag); - spdElement.appendChild(theDoc.createTextNode(String.valueOf(this.spd))); - loopElement.appendChild(spdElement); }