Index: trunk/test/atmsdriver/model/LoadSadDotsTest.java
===================================================================
--- trunk/test/atmsdriver/model/LoadSadDotsTest.java	(revision 205)
+++ trunk/test/atmsdriver/model/LoadSadDotsTest.java	(revision 212)
@@ -7,4 +7,5 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.List;
 import junit.framework.TestCase;
 
@@ -52,5 +53,5 @@
         
          // Test for correct number of highways
-        ArrayList<Highway> result = highways.highways;
+        List<Highway> result = (ArrayList) highways.highways;
         assertEquals(2, result.size());
         
@@ -59,5 +60,5 @@
         assertEquals(new Integer(5), fiftyfiveN.routeNumber);
         
-        ArrayList<Station> stations = fiftyfiveN.stations;
+        List<Station> stations = (ArrayList) fiftyfiveN.stations;
         Station sad = stations.get(0);
         System.out.println(""+sad.toCondensedFormat(true));
Index: trunk/test/atmsdriver/model/HighwaysTest.java
===================================================================
--- trunk/test/atmsdriver/model/HighwaysTest.java	(revision 208)
+++ trunk/test/atmsdriver/model/HighwaysTest.java	(revision 212)
@@ -86,7 +86,7 @@
         String result = highways.toString();
         System.out.println(result);
-        assertEquals(expString, result);
-    }
-    String expString = 
+        assertEquals(expToString, result);
+    }
+    String expToString = 
         "241 ------------------------------------------------------------\n"
        +"  5 @-------------------------------------------------------------------------------------------------------------------------------------------\n"
@@ -101,4 +101,93 @@
        +"605 ---\n";
 
+    
+    public void testToCondensedFormat()
+    {
+        System.out.println("ToCondensedFormat");
+        Highways highways = new Highways(
+                "test/atmsdriver/model/ldssample.txt",
+                "localhost", 8080);
+        System.out.println("STARTMETA");
+        System.out.println(highways.toCondensedFormat(true));
+        String actualCondensedFormatMeta = highways.toCondensedFormat(true);
+        String actualCondensedFormatFEP = highways.toCondensedFormat(false);
+        assertEquals(expectedCondensedFormatFEP, actualCondensedFormatFEP);
+        assertEquals(expectedCondensedFormatMeta, actualCondensedFormatMeta);
+    }
+    String expectedCondensedFormatMeta = 
+            "2\n" +
+            "32 0 2\n" +
+            "1210831 1 5 S 0.9 8 CALAFIA\n" +
+            "1210832 ML_1\n" +
+            "1210833 ML_2\n" +
+            "1210834 ML_3\n" +
+            "1210835 ML_4\n" +
+            "1210836 PASSAGE\n" +
+            "1210837 DEMAND\n" +
+            "1210838 QUEUE\n" +
+            "1210839 RAMP_OFF\n" +
+            "1210845 2 5 S 1.49 9 EL CAMINO REAL\n" +
+            "1210846 ML_1\n" +
+            "1210847 ML_2\n" +
+            "1210848 ML_3\n" +
+            "1210849 ML_4\n" +
+            "1210850 RAMP_ON\n" +
+            "1210851 PASSAGE\n" +
+            "1210853 DEMAND\n" +
+            "1210854 QUEUE\n" +
+            "1210855 RAMP_OFF\n" +
+            "74 0 1\n" +
+            "1204203 2 5 N 1.26 13 MAGDALENA\n" +
+            "1204205 RAMP_ON\n" +
+            "1204206 QUEUE\n" +
+            "1204207 DEMAND\n" +
+            "1204208 PASSAGE\n" +
+            "1204210 RAMP_OFF\n" +
+            "1204212 ML_1\n" +
+            "1204213 ML_2\n" +
+            "1204214 ML_3\n" +
+            "1204215 ML_4\n" +
+            "1204217 OS_1\n" +
+            "1204218 OS_2\n" +
+            "1204219 OS_3\n" +
+            "1204220 OS_4\n";
+    String expectedCondensedFormatFEP = 
+            "2\n" +
+            "32 0 2\n" +
+            "1210831 1 5 S 0.9 8 \n" +
+            "1210832  0.0 0 ML_1\n" +
+            "1210833  0.0 0 ML_2\n" +
+            "1210834  0.0 0 ML_3\n" +
+            "1210835  0.0 0 ML_4\n" +
+            "1210836  0.0 0 PASSAGE\n" +
+            "1210837  0.0 0 DEMAND\n" +
+            "1210838  0.0 0 QUEUE\n" +
+            "1210839  0.0 0 RAMP_OFF\n" +
+            "1210845 2 5 S 1.49 9 \n" +
+            "1210846  0.0 0 ML_1\n" +
+            "1210847  0.0 0 ML_2\n" +
+            "1210848  0.0 0 ML_3\n" +
+            "1210849  0.0 0 ML_4\n" +
+            "1210850  0.0 0 RAMP_ON\n" +
+            "1210851  0.0 0 PASSAGE\n" +
+            "1210853  0.0 0 DEMAND\n" +
+            "1210854  0.0 0 QUEUE\n" +
+            "1210855  0.0 0 RAMP_OFF\n" +
+            "74 0 1\n" +
+            "1204203 2 5 N 1.26 13 \n" +
+            "1204205  0.0 0 RAMP_ON\n" +
+            "1204206  0.0 0 QUEUE\n" +
+            "1204207  0.0 0 DEMAND\n" +
+            "1204208  0.0 0 PASSAGE\n" +
+            "1204210  0.0 0 RAMP_OFF\n" +
+            "1204212  0.0 0 ML_1\n" +
+            "1204213  0.0 0 ML_2\n" +
+            "1204214  0.0 0 ML_3\n" +
+            "1204215  0.0 0 ML_4\n" +
+            "1204217  0.0 0 OS_1\n" +
+            "1204218  0.0 0 OS_2\n" +
+            "1204219  0.0 0 OS_3\n" +
+            "1204220  0.0 0 OS_4\n";
+    
     /**
      * Test of toXML method
@@ -110,209 +199,240 @@
                 "localhost", 8080);
         String result = highways.toXML();
-        assertEquals(expResult, result);
-    }
-String expResult =
-"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
-+"<Network>\n"
-+"  <Line>\n"
-+"    <Line_Num>5</Line_Num>\n"
-+"    <Count>20</Count>\n"
-+"    <Schedule>1</Schedule>\n"
-+"    <Line_Info>1</Line_Info>\n"
-+"    <System_Key>1123005673</System_Key>\n"
-+"    <Global_Seq>1357648</Global_Seq>\n"
-+"    <Schedule_Seq>26492</Schedule_Seq>\n"
-+"    <Stations>\n"
-+"      <Station>\n"
-+"        <LDS_ID>1205270</LDS_ID>\n"
-+"        <Line_Num>5</Line_Num>\n"
-+"        <Drop>19</Drop>\n"
-+"        <Location>MAIN 1</Location>\n"
-+"        <Post_Mile>33.0</Post_Mile>\n"
-+"        <Direction>S</Direction>\n"
-+"        <Freeway>5</Freeway>\n"
-+"        <ML_Tot_Vol>0</ML_Tot_Vol>\n"
-+"        <Opp_Tot_Vol>0</Opp_Tot_Vol>\n"
-+"        <Loops>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1205272</Loop_ID>\n"
-+"            <Loop_Location>RAMP_ON</Loop_Location>\n"
-+"            <Lane_Num>1</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1205273</Loop_ID>\n"
-+"            <Loop_Location>QUEUE</Loop_Location>\n"
-+"            <Lane_Num>2</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1205274</Loop_ID>\n"
-+"            <Loop_Location>DEMAND</Loop_Location>\n"
-+"            <Lane_Num>3</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1205275</Loop_ID>\n"
-+"            <Loop_Location>PASSAGE</Loop_Location>\n"
-+"            <Lane_Num>4</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1205277</Loop_ID>\n"
-+"            <Loop_Location>ML_1</Loop_Location>\n"
-+"            <Lane_Num>1</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1205278</Loop_ID>\n"
-+"            <Loop_Location>ML_2</Loop_Location>\n"
-+"            <Lane_Num>2</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1205279</Loop_ID>\n"
-+"            <Loop_Location>ML_3</Loop_Location>\n"
-+"            <Lane_Num>3</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1209945</Loop_ID>\n"
-+"            <Loop_Location>ML_4</Loop_Location>\n"
-+"            <Lane_Num>4</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1209947</Loop_ID>\n"
-+"            <Loop_Location>ML_5</Loop_Location>\n"
-+"            <Lane_Num>5</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1209948</Loop_ID>\n"
-+"            <Loop_Location>SD_1</Loop_Location>\n"
-+"            <Lane_Num>1</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1209949</Loop_ID>\n"
-+"            <Loop_Location>SD_2</Loop_Location>\n"
-+"            <Lane_Num>1</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"        </Loops>\n"
-+"      </Station>\n"
-+"    </Stations>\n"
-+"  </Line>\n"
-+"  <Line>\n"
-+"    <Line_Num>6</Line_Num>\n"
-+"    <Count>19</Count>\n"
-+"    <Schedule>2</Schedule>\n"
-+"    <Line_Info>2</Line_Info>\n"
-+"    <System_Key>1123005691</System_Key>\n"
-+"    <Global_Seq>1357639</Global_Seq>\n"
-+"    <Schedule_Seq>26491</Schedule_Seq>\n"
-+"    <Stations>\n"
-+"      <Station>\n"
-+"        <LDS_ID>1208933</LDS_ID>\n"
-+"        <Line_Num>6</Line_Num>\n"
-+"        <Drop>15</Drop>\n"
-+"        <Location>S OF 55</Location>\n"
-+"        <Post_Mile>26.3</Post_Mile>\n"
-+"        <Direction>S</Direction>\n"
-+"        <Freeway>73</Freeway>\n"
-+"        <ML_Tot_Vol>0</ML_Tot_Vol>\n"
-+"        <Opp_Tot_Vol>0</Opp_Tot_Vol>\n"
-+"        <Loops>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1212466</Loop_ID>\n"
-+"            <Loop_Location>ML_1</Loop_Location>\n"
-+"            <Lane_Num>2</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1212467</Loop_ID>\n"
-+"            <Loop_Location>ML_2</Loop_Location>\n"
-+"            <Lane_Num>3</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1212468</Loop_ID>\n"
-+"            <Loop_Location>ML_3</Loop_Location>\n"
-+"            <Lane_Num>1</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1212469</Loop_ID>\n"
-+"            <Loop_Location>OS_1</Loop_Location>\n"
-+"            <Lane_Num>1</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1212470</Loop_ID>\n"
-+"            <Loop_Location>OS_2</Loop_Location>\n"
-+"            <Lane_Num>2</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1212471</Loop_ID>\n"
-+"            <Loop_Location>OS_3</Loop_Location>\n"
-+"            <Lane_Num>3</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1212516</Loop_ID>\n"
-+"            <Loop_Location>SD_4</Loop_Location>\n"
-+"            <Lane_Num>1</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"          <Loop>\n"
-+"            <Loop_ID>1212517</Loop_ID>\n"
-+"            <Loop_Location>SD_5</Loop_Location>\n"
-+"            <Lane_Num>2</Lane_Num>\n"
-+"            <Vol>0</Vol>\n"
-+"            <Occ>0</Occ>\n"
-+"            <Spd>0</Spd>\n"
-+"          </Loop>\n"
-+"        </Loops>\n"
-+"      </Station>\n"
-+"    </Stations>\n"
-+"  </Line>\n"
-+"</Network>\n";
+        assertEquals(expXMLResult, result);
+    }
+String expXMLResult =
+"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
+"<Network>\n" +
+"  <Line>\n" +
+"    <Line_Num>32</Line_Num>\n" +
+"    <Count>0</Count>\n" +
+"    <Stations>\n" +
+"      <Station>\n" +
+"        <LDS_ID>1210831</LDS_ID>\n" +
+"        <Line_Num>32</Line_Num>\n" +
+"        <Drop>1</Drop>\n" +
+"        <Location>CALAFIA</Location>\n" +
+"        <Post_Mile>0.9</Post_Mile>\n" +
+"        <Direction>S</Direction>\n" +
+"        <Freeway>5</Freeway>\n" +
+"        <ML_Tot_Vol>0</ML_Tot_Vol>\n" +
+"        <Opp_Tot_Vol>0</Opp_Tot_Vol>\n" +
+"        <Loops>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210832</Loop_ID>\n" +
+"            <Loop_Location>ML_1</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210833</Loop_ID>\n" +
+"            <Loop_Location>ML_2</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210834</Loop_ID>\n" +
+"            <Loop_Location>ML_3</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210835</Loop_ID>\n" +
+"            <Loop_Location>ML_4</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210836</Loop_ID>\n" +
+"            <Loop_Location>PASSAGE</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210837</Loop_ID>\n" +
+"            <Loop_Location>DEMAND</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210838</Loop_ID>\n" +
+"            <Loop_Location>QUEUE</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210839</Loop_ID>\n" +
+"            <Loop_Location>RAMP_OFF</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"        </Loops>\n" +
+"      </Station>\n" +
+"      <Station>\n" +
+"        <LDS_ID>1210845</LDS_ID>\n" +
+"        <Line_Num>32</Line_Num>\n" +
+"        <Drop>2</Drop>\n" +
+"        <Location>EL CAMINO REAL</Location>\n" +
+"        <Post_Mile>1.49</Post_Mile>\n" +
+"        <Direction>S</Direction>\n" +
+"        <Freeway>5</Freeway>\n" +
+"        <ML_Tot_Vol>0</ML_Tot_Vol>\n" +
+"        <Opp_Tot_Vol>0</Opp_Tot_Vol>\n" +
+"        <Loops>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210846</Loop_ID>\n" +
+"            <Loop_Location>ML_1</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210847</Loop_ID>\n" +
+"            <Loop_Location>ML_2</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210848</Loop_ID>\n" +
+"            <Loop_Location>ML_3</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210849</Loop_ID>\n" +
+"            <Loop_Location>ML_4</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210850</Loop_ID>\n" +
+"            <Loop_Location>RAMP_ON</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210851</Loop_ID>\n" +
+"            <Loop_Location>PASSAGE</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210853</Loop_ID>\n" +
+"            <Loop_Location>DEMAND</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210854</Loop_ID>\n" +
+"            <Loop_Location>QUEUE</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1210855</Loop_ID>\n" +
+"            <Loop_Location>RAMP_OFF</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"        </Loops>\n" +
+"      </Station>\n" +
+"    </Stations>\n" +
+"  </Line>\n" +
+"  <Line>\n" +
+"    <Line_Num>74</Line_Num>\n" +
+"    <Count>0</Count>\n" +
+"    <Stations>\n" +
+"      <Station>\n" +
+"        <LDS_ID>1204203</LDS_ID>\n" +
+"        <Line_Num>74</Line_Num>\n" +
+"        <Drop>2</Drop>\n" +
+"        <Location>MAGDALENA</Location>\n" +
+"        <Post_Mile>1.26</Post_Mile>\n" +
+"        <Direction>N</Direction>\n" +
+"        <Freeway>5</Freeway>\n" +
+"        <ML_Tot_Vol>0</ML_Tot_Vol>\n" +
+"        <Opp_Tot_Vol>0</Opp_Tot_Vol>\n" +
+"        <Loops>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204205</Loop_ID>\n" +
+"            <Loop_Location>RAMP_ON</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204206</Loop_ID>\n" +
+"            <Loop_Location>QUEUE</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204207</Loop_ID>\n" +
+"            <Loop_Location>DEMAND</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204208</Loop_ID>\n" +
+"            <Loop_Location>PASSAGE</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204210</Loop_ID>\n" +
+"            <Loop_Location>RAMP_OFF</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204212</Loop_ID>\n" +
+"            <Loop_Location>ML_1</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204213</Loop_ID>\n" +
+"            <Loop_Location>ML_2</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204214</Loop_ID>\n" +
+"            <Loop_Location>ML_3</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204215</Loop_ID>\n" +
+"            <Loop_Location>ML_4</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204217</Loop_ID>\n" +
+"            <Loop_Location>OS_1</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204218</Loop_ID>\n" +
+"            <Loop_Location>OS_2</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204219</Loop_ID>\n" +
+"            <Loop_Location>OS_3</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"          <Loop>\n" +
+"            <Loop_ID>1204220</Loop_ID>\n" +
+"            <Loop_Location>OS_4</Loop_Location>\n" +
+"            <Vol>0</Vol>\n" +
+"            <Occ>0.0</Occ>\n" +
+"          </Loop>\n" +
+"        </Loops>\n" +
+"      </Station>\n" +
+"    </Stations>\n" +
+"  </Line>\n" +
+"</Network>\n";
 }
Index: trunk/test/atmsdriver/model/LoadHighwaysTest.java
===================================================================
--- trunk/test/atmsdriver/model/LoadHighwaysTest.java	(revision 209)
+++ trunk/test/atmsdriver/model/LoadHighwaysTest.java	(revision 212)
@@ -7,4 +7,5 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.List;
 import junit.framework.TestCase;
 
@@ -83,7 +84,7 @@
                 "test/atmsdriver/model/lds_loadhighways_sample.txt",
                 "localhost", 8080);
-        System.out.println(highways.toCondensedFormat(false));
+
         // Test for correct number of highways
-        ArrayList<Highway> result = highways.highways;
+        List<Highway> result = (ArrayList) highways.highways;
         assertEquals(1, result.size());
         
@@ -96,5 +97,5 @@
         
         // Test 5 stations are sorted by postmile
-        ArrayList<Station> stations = fiveS.stations;
+        List<Station> stations = (ArrayList) fiveS.stations;
         ArrayList<Double> stationsPostmiles = new ArrayList<>();
         for(Station station : stations)
Index: trunk/src/tmcsim/application.properties
===================================================================
--- trunk/src/tmcsim/application.properties	(revision 210)
+++ trunk/src/tmcsim/application.properties	(revision 212)
@@ -1,5 +1,5 @@
-#Thu, 02 Nov 2017 00:01:21 -0700
+#Thu, 02 Nov 2017 13:59:47 -0700
 
-Application.revision=208
+Application.revision=209
 
 Application.buildnumber=69
Index: trunk/src/atmsdriver/model/Highway.java
===================================================================
--- trunk/src/atmsdriver/model/Highway.java	(revision 103)
+++ trunk/src/atmsdriver/model/Highway.java	(revision 212)
@@ -2,4 +2,5 @@
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
@@ -15,5 +16,5 @@
     public final Integer routeNumber;
     /** The ordered list of stations (lane detector stations) on this highway */
-    public final ArrayList<Station> stations;
+    public final List<Station> stations;
 
     /** Construct a highway 
Index: trunk/src/atmsdriver/model/Highways.java
===================================================================
--- trunk/src/atmsdriver/model/Highways.java	(revision 203)
+++ trunk/src/atmsdriver/model/Highways.java	(revision 212)
@@ -12,4 +12,5 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
@@ -52,6 +53,6 @@
     final private int FEPPortNum;
     
-    final private ArrayList<FEPLine> lines;
-    final public ArrayList<Highway> highways;
+    final private List<FEPLine> lines;
+    final public List<Highway> highways;
 
     public Highways(String highwaysMapFileName, String FEPHostName, int FEPPortNum)
@@ -227,8 +228,10 @@
         String line = sc.nextLine();
         Scanner scline = new Scanner(line);
-        // Get the attribute of this FEP Line
+        // Get the attributes of this FEP Line
         int lineNum = scline.nextInt();
         int count = scline.nextInt();
         int numStations = scline.nextInt();
+        
+        // initialze stations array
         ArrayList<Station> stations = new ArrayList<>();
         // Read all the stations for thie FEP Line
@@ -251,4 +254,5 @@
         String line = sc.nextLine();
         Scanner scline = new Scanner(line);
+        
         int ldsID = scline.nextInt();
         int drop = scline.nextInt();
@@ -371,16 +375,16 @@
      * 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       // ..
+     * 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  ML_1     // "loop id" "occ" "vol"
+     * 1210833  0.0 0  ML_2     // ..
+     * 1210834  0.0 0  ML_3     // ..
+     * 1210835  0.0 0  ML_4     // ..
+     * 1210836  0.0 0  PASSAGE  // ..
+     * 1210837  0.0 0  DEMAND   // ..
+     * 1210838  0.0 0  QUEUE    // ..
+     * 1210839  0.0 0  RAMP_OFF // ..
      * ...
      * 
@@ -404,11 +408,14 @@
     public String toCondensedFormat(boolean MetaDataOnly)
     {
+        // first line: number of FEPLines
         StringBuilder build = new StringBuilder();
         build.append(lines.size());
         build.append("\n");
+        // append each fep line to the string
         for(FEPLine line : lines)
         {
             build.append(line.toCondensedFormat(MetaDataOnly));
         }
+        // return the full condensed format string
         return build.toString();
     }
@@ -458,9 +465,11 @@
      * 
      * @param routeNum
-     * @return Highway with specified route number
+     * @return Highway with specified route number, or null if no highway with
+     *          the specified route num
      */
     public Highway getHighwayByRouteNumber(Integer routeNum)
     {
         Highway returnHwy = null;
+        // search through highways and check routeNums
         for (Highway hwy : highways)
         {