Index: branches/FEPSimulator/NetworkReader.h
===================================================================
--- branches/FEPSimulator/NetworkReader.h	(revision 80)
+++ branches/FEPSimulator/NetworkReader.h	(revision 86)
@@ -58,21 +58,64 @@
 #include "DataPacker.h"
 
-class NetworkReader
-{
-    public:
-        NetworkReader(const char * networkFile); // Constructor
-        ~NetworkReader(); // Destructor
-        
-        vector<FEP_LINE*> getLines(); // Getter for FEP_LINE list
-        vector<STATION*> getStations(); // Getter for STATION list
-    private:
-        vector<FEP_LINE*> lines;
-        vector<STATION*> stations;
-        int ldsIndex;
-
-        void loadLines(const char * networkFileName);
-        LOOP * parseLoop(TiXmlElement * loopElem);
-        STATION * parseStation(TiXmlElement *stationElem, FEP_LINE *line);
-        FEP_LINE * parseLine(TiXmlElement *lineElem);
+class NetworkReader {
+public:
+    /**
+     * Constructor
+     * @param xml Highway Status XML data
+     */
+    NetworkReader(const char * xml);
+    
+    /**
+     * Destructor: no cleaning necessary
+     */
+    ~NetworkReader();
+    
+    /**
+     * 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);
 };