Index: branches/FEPSimulator/HighwaysParser.cpp
===================================================================
--- branches/FEPSimulator/HighwaysParser.cpp	(revision 177)
+++ branches/FEPSimulator/HighwaysParser.cpp	(revision 186)
@@ -1,121 +1,15 @@
-#include "NetworkReader.h"
+/* 
+ * File:   HighwaysParser.cpp
+ * Author: jtorres
+ * 
+ * Created on October 28, 2017, 7:23 PM
+ */
 
-HighwaysParser::HighwaysParser(const char * xml) {
-    ldsIndex = 0;
-    loadLines(xml);
-}
+#include "HighwaysParser.h"
 
-LOOP * HighwaysParser::parseLoop(TiXmlElement * loopElem) {
-    LOOP *loop = new LOOP;
-
-    TiXmlElement *subLoopElem = loopElem->FirstChildElement();
-    loop->loopID = atoi(subLoopElem->GetText());
-    subLoopElem = subLoopElem->NextSiblingElement();
-    loop->loop_loc = (char *) subLoopElem->GetText();
-    subLoopElem = subLoopElem->NextSiblingElement();
-    subLoopElem = subLoopElem->NextSiblingElement(); // skip lane num
-    loop->vol = atoi(subLoopElem->GetText());
-    subLoopElem = subLoopElem->NextSiblingElement();
-    loop->occ = atof(subLoopElem->GetText());
-    subLoopElem = subLoopElem->NextSiblingElement();
-    loop->spd = atof(subLoopElem->GetText());
-
-    return loop;
-}
-
-STATION * HighwaysParser::parseStation(TiXmlElement *stationElem, FEP_LINE *line) {
-    STATION *station = new STATION;
-
-    TiXmlElement *stationSubElem = stationElem->FirstChildElement();
-    station->lds = atol(stationSubElem->GetText());
-    cout << "Station: " << station->lds << endl;
-    line->lds.push_back(station->lds);
-    line->ldsIndex.push_back(ldsIndex++);
-    stationSubElem = stationSubElem->NextSiblingElement();
-    station->line_num = atoi(stationSubElem->GetText());
-    stationSubElem = stationSubElem->NextSiblingElement();
-    station->drop = atoi(stationSubElem->GetText());
-    stationSubElem = stationSubElem->NextSiblingElement();
-    stationSubElem = stationSubElem->NextSiblingElement(); // skip location
-    stationSubElem = stationSubElem->NextSiblingElement(); // skip postmile
-    stationSubElem = stationSubElem->NextSiblingElement(); // skip direction
-    stationSubElem = stationSubElem->NextSiblingElement(); // skip freeway
-    station->MlTotVol = atoi(stationSubElem->GetText());
-    stationSubElem = stationSubElem->NextSiblingElement();
-    station->OppTotVol = atoi(stationSubElem->GetText());
-
-    station->pos = 0; // NOT SURE WHY WE NEED THIS?
-
-    // Add loops to station
-    TiXmlElement *loopElem = stationSubElem->NextSiblingElement()->FirstChildElement();
-    for (loopElem; loopElem; loopElem = loopElem->NextSiblingElement()) {
-        LOOP *loop = parseLoop(loopElem);
-        station->loops.push_back(loop);
-    }
-    cout << "Number of Loops: " << station->loops.size() << endl;
-    // Data pack ATMS message
-    station->length = station->loops.size() * 2 + CONTROL_DATA_LEN;
-    cout << station->loops.size() << endl;
-    station->dataPack = DataPacker::packData(station);
-
-    return station;
-}
-
-FEP_LINE * HighwaysParser::parseLine(TiXmlElement * lineElem) {
-    FEP_LINE *line = new FEP_LINE;
-
-    TiXmlElement *lineSubElem = lineElem->FirstChildElement();
-    line->lineNum = atoi(lineSubElem->GetText());
-    cout << "Line: " << line->lineNum << endl;
-    lineSubElem = lineSubElem->NextSiblingElement();
-    line->count = atoi(lineSubElem->GetText());
-    lineSubElem = lineSubElem->NextSiblingElement();
-    line->schedule = atoi(lineSubElem->GetText());
-    lineSubElem = lineSubElem->NextSiblingElement();
-    line->lineInfo = atoi(lineSubElem->GetText());
-    lineSubElem = lineSubElem->NextSiblingElement();
-    line->systemKey = atol(lineSubElem->GetText());
-    lineSubElem = lineSubElem->NextSiblingElement();
-    line->globalSeq = atol(lineSubElem->GetText());
-    lineSubElem = lineSubElem->NextSiblingElement();
-    line->schedleSeq = atol(lineSubElem->GetText());
-
-    TiXmlElement *stationsElem = lineSubElem->NextSiblingElement();
-    TiXmlElement *stationElem = stationsElem->FirstChildElement();
-    for (stationElem; stationElem; stationElem = stationElem->NextSiblingElement()) {
-        stations.push_back(parseStation(stationElem, line));
-    }
-    return line;
-}
-
-void HighwaysParser::loadLines(const char * xml) {
-    // Load network xml file
-    TiXmlDocument doc;
-    doc.Parse((const char*) xml, 0, TIXML_ENCODING_UTF8);
-
-    // grab <Network> element
-    TiXmlHandle hDoc(&doc);
-    TiXmlElement *networkElem = hDoc.FirstChildElement().Element();
-
-    // grab first <Line> element
-    TiXmlElement *lineElem = networkElem->FirstChildElement();
-
-    // iterate through each line element to create FEP_LINE list
-    for (lineElem; lineElem; lineElem = lineElem->NextSiblingElement()) {
-        lines.push_back(parseLine(lineElem));
-    }
-}
-
-vector<FEP_LINE*> HighwaysParser::getLines() {
-
-    return lines;
-}
-
-vector<STATION*> HighwaysParser::getStations() {
-
-    return stations;
+HighwaysParser::HighwaysParser() {
 }
 
 HighwaysParser::~HighwaysParser() {
+}
 
-}
Index: branches/FEPSimulator/nbproject/configurations.xml
===================================================================
--- branches/FEPSimulator/nbproject/configurations.xml	(revision 185)
+++ branches/FEPSimulator/nbproject/configurations.xml	(revision 186)
@@ -7,5 +7,5 @@
       <itemPath>DataPacker.h</itemPath>
       <itemPath>FEPSim.h</itemPath>
-      <itemPath>NetworkReader.h</itemPath>
+      <itemPath>HighwaysParser.h</itemPath>
       <itemPath>fep.h</itemPath>
       <itemPath>network.h</itemPath>
@@ -62,7 +62,7 @@
       <item path="HighwaysParser.cpp" ex="false" tool="1" flavor2="0">
       </item>
+      <item path="HighwaysParser.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="Main.cpp" ex="false" tool="1" flavor2="0">
-      </item>
-      <item path="NetworkReader.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="fep.h" ex="false" tool="3" flavor2="0">
@@ -105,7 +105,7 @@
       <item path="HighwaysParser.cpp" ex="false" tool="1" flavor2="0">
       </item>
+      <item path="HighwaysParser.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="Main.cpp" ex="false" tool="1" flavor2="0">
-      </item>
-      <item path="NetworkReader.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="fep.h" ex="false" tool="3" flavor2="0">
Index: branches/FEPSimulator/nbproject/private/private.xml
===================================================================
--- branches/FEPSimulator/nbproject/private/private.xml	(revision 185)
+++ branches/FEPSimulator/nbproject/private/private.xml	(revision 186)
@@ -8,4 +8,5 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Main.cpp</file>
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file>
         </group>
Index: branches/FEPSimulator/NetworkReader.h
===================================================================
--- branches/FEPSimulator/NetworkReader.h	(revision 182)
+++ 	(revision )
@@ -1,122 +1,0 @@
-/** 
- * File: NetworkReader.h
- * 
- * A NetworkReader reads in data about the traffic network from a specified
- * xml file.
- * 
- * A NetworkReader contains two public methods 'getLines' and 'getLoops',
- * which are getters for the list of FEP_LINES, and STATIONS, respectively.
- * 
- * Example XML file:
- * <code>
- * <Network>
- * <Line>
- *   <Line_Num>5</Line_Num>
- *   <Count>20</Count>
- *   <Schedule>1</Schedule>
- *   <Line_Info>1</Line_Info>
- *   <System_Key>1123005673</System_Key>
- *   <Global_Seq>1357648</Global_Seq>
- *   <Schedule_Seq>26492</Schedule_Seq>
- *   <Stations>
- *     <Station>
- *       <LDS_ID>1205270</LDS_ID>
- *       <Line_Num>5</Line_Num>
- *       <Drop>19</Drop>
- *       <Location>MAIN 1</Location>
- *       <Post_Mile>33.0</Post_Mile>
- *       <Direction>S</Direction>
- *       <Freeway>5</Freeway>
- *       <ML_Tot_Vol>0</ML_Tot_Vol>
- *       <Opp_Tot_Vol>0</Opp_Tot_Vol>
- *       <Loops>
- *         <Loop>
- *           <Loop_ID>1205272</Loop_ID>
- *           <Loop_Location>RAMP_ON</Loop_Location>
- *           <Lane_Num>1</Lane_Num>
- *           <Vol>0</Vol>
- *           <Occ>0</Occ>
- *           <Spd>0</Spd>
- *         </Loop>
- *          .......
- * </code>
- * 
- * @author John A. Torres
- * @verions 9/08/2017
- */
-
-// Include guard
-#ifndef __NETWORKREADER_H_INCLUDED__
-#define __NETWORKREADER_H_INCLUDED__
-
-// Included dependencies
-#include "network.h"
-#include <vector>
-#include <string.h>
-#include <iostream>
-#include "tinyxml.h"
-#include "DataPacker.h"
-
-class HighwaysParser {
-public:
-    /**
-     * Constructor
-     * @param xml Highway Status XML data
-     */
-    HighwaysParser(const char * xml);
-    
-    /**
-     * Destructor: no cleaning necessary
-     */
-    ~HighwaysParser();
-    
-    /**
-     * Returns FEP_LINE list.
-     * 
-     * @return List of FEP_LINES
-     */
-    vector<FEP_LINE*> getLines();
-    
-    /**
-     * Returns STATIONS list.
-     * @return List of STATIONs
-     */
-    vector<STATION*> getStations();
-    
-private:
-    vector<FEP_LINE*> lines;
-    vector<STATION*> stations;
-    int ldsIndex;
-    
-    /**
-     * Loads Highway Status data from xml.
-     * 
-     * @param xml Highway Status XML.
-     */
-    void loadLines(const char * networkFileName);
-    
-    /**
-     * Parses a single LOOP
-     * @param loopElem TinyXML loop elem
-     * @return LOOP
-     */
-    LOOP * parseLoop(TiXmlElement * loopElem);
-    
-    /**
-     * Parses a single STATION
-     * 
-     * @param TinyXML station element
-     * @param the parent FEP_LINE
-     * @return STATION
-     */
-    STATION * parseStation(TiXmlElement *stationElem, FEP_LINE *line);
-    
-    /**
-     * Parses a single FEP_LINE
-     * @param TinyXML line element
-     * @return FEP_LINE
-     */
-    FEP_LINE * parseLine(TiXmlElement *lineElem);
-};
-
-#endif