Index: branches/fep_rpc_client/NetworkReader.h
===================================================================
--- branches/fep_rpc_client/NetworkReader.h	(revision 78)
+++ branches/fep_rpc_client/NetworkReader.h	(revision 79)
@@ -1,3 +1,6 @@
-/** A NetworkReader reads in data about the traffic network from a specified
+/** 
+ * File: NetworkReader.h
+ * 
+ * A NetworkReader reads in data about the traffic network from a specified
  * xml file.
  * 
@@ -5,5 +8,5 @@
  * which are getters for the list of FEP_LINES, and LDS_LOOPS, respectively.
  * 
- * Example xml file:
+ * Example XML file:
  * <code>
  * <Network>
@@ -47,13 +50,11 @@
 #define __NETWORKREADER_H_INCLUDED__
 
-// Forward declared dependencies
-
 // Included dependencies
 #include "network.h"
 #include <vector>
-#include <string>
 #include <string.h>
 #include <iostream>
 #include "tinyxml.h"
+#include "DataPacker.h"
 
 class NetworkReader
@@ -63,18 +64,15 @@
         ~NetworkReader(); // Destructor
         
-        vector<FEP_LINE> getLines(); // Getter for FEP_LINE list
-        vector<LDS_LOOP> getStations(); // Getter for LDS_LOOP list
+        vector<FEP_LINE*> getLines(); // Getter for FEP_LINE list
+        vector<LDS_LOOP*> getStations(); // Getter for LDS_LOOP list
     private:
-        vector<FEP_LINE> lines;
-        vector<LDS_LOOP> stations;
+        vector<FEP_LINE*> lines;
+        vector<LDS_LOOP*> stations;
         int ldsIndex;
 
         void loadLines(const char * networkFileName);
-        LDS_LOOP parseStation(TiXmlElement *stationElem, FEP_LINE *line);
-        FEP_LINE parseLine(TiXmlElement *lineElem);
-
-        bool DataAvail(char flag, int num); // Helper function for msgDataPack
-        unsigned char * staticDataPack(LDS_LOOP loop); // Packs the static data in message sent to ATMS
-        // int pp_data_packing(int index, int packNo, int pos); // Packs dynamic data in message sent to ATMS
+        LOOP * parseLoop(TiXmlElement * loopElem);
+        LDS_LOOP * parseStation(TiXmlElement *stationElem, FEP_LINE *line);
+        FEP_LINE * parseLine(TiXmlElement *lineElem);
 };