Changeset 212 in tmcsimulator for branches/FEPSimulator

Timestamp:

11/02/2017 01:42:45 PM (9 years ago)

Author:

jtorres

Message:

branches/FEPSimulator/tests/HighwaysParserTest.cpp: Unit test for HighwaysParser?.cpp. HighwaysTest?.java: now passing toXML(), added test for toCondensedFormat() method. LoadHighwaysTest?.java: passing. LoadSadDotsTest?.java: conformed to changes, not passing. Highway.java/Highways.java: converted class attributes to List instead of ArrayList?. Highways.java: corrected toCondensedFormat() method comments and added comments throughout file.

Location:

branches/FEPSimulator

Files:

• nbproject/private/private.xml (modified) (1 diff)
• tests/HighwaysParserTest.cpp (modified) (3 diffs)

branches/FEPSimulator/nbproject/private/private.xml

@@ -15 +15 @@
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file>
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Makefile</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/tests/HighwaysParserTest.cpp</file>
         </group>
     </open-files>

branches/FEPSimulator/tests/HighwaysParserTest.cpp

@@ -154 +154 @@
     }
     
+    // test loops
     vector<LOOP *> loopsOne = stations.at(0)->loops;
-
+    
+    // test loopIDS
     long expectedLoopIDS[8] = { 1210832, 1210833, 1210834, 1210835, 
             1210836, 1210837, 1210838, 1210839 };
@@ -170 +172 @@
     }
     
+    // test loop occ
     float expectedOCC[8] = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
     float actualOCC[8] = { loopsOne.at(0)->occ, loopsOne.at(1)->occ, 
@@ -182 +185 @@
     }
     
+    // test loop locations
     char * expectedLocs[8] = {"ML_1", "ML_2", "ML_3", "ML_4", "PASSAGE", "DEMAND",
             "QUEUE", "RAMP_OFF"};