Changeset 208 in tmcsimulator


Ignore:
Timestamp:
11/01/2017 08:24:06 PM (9 years ago)
Author:
jtorres
Message:

LoadHighwaysTest?.java: ensured we are loading all loops

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/FEPSimulator/nbproject/private/private.xml

    r205 r208  
    88    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> 
    99        <group> 
     10            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/HighwaysParser.cpp</file> 
     11            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file> 
     12            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.cpp</file> 
     13            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/HighwaysParser.h</file> 
     14            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file> 
    1015            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file> 
    11             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/HighwaysParser.h</file> 
    12             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.h</file> 
    13             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.cpp</file> 
    14             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file> 
    15             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Main.cpp</file> 
    16             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file> 
    17             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file> 
    18             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/HighwaysParser.cpp</file> 
    1916        </group> 
    2017    </open-files> 

  • trunk/src/tmcsim/application.properties

    r205 r208  
    1 #Wed, 01 Nov 2017 05:01:19 -0700 
     1#Wed, 01 Nov 2017 21:34:34 -0700 
    22 
    3 Application.revision=202 
     3Application.revision=207 
    44 
    55Application.buildnumber=68 

  • trunk/test/atmsdriver/model/HighwaysTest.java

    r205 r208  
    2626        try { 
    2727            writer = new PrintWriter(new FileWriter("test/atmsdriver/model/ldssample.txt")); 
    28             writer.println("lds_id      line    drop sch lineinfo       system_key      sch_seq glo_seq         count   freeway Dir     ca_pm   lds_name"); 
    29             writer.println("1205270     5       19      1       1       1123005673      26492   1357648         20      5       S       33      MAIN 1   "); 
    30             writer.println("1208933     6       15      2       2       1123005691      26491   1357639         19      73      S       26.3    S OF 55  "); 
     28            writer.println("2"); 
     29            writer.println("32 0 2"); 
     30            writer.println("1210831 1 5 S 0.9 8 CALAFIA"); 
     31            writer.println("1210832 ML_1"); 
     32            writer.println("1210833 ML_2"); 
     33            writer.println("1210834 ML_3"); 
     34            writer.println("1210835 ML_4"); 
     35            writer.println("1210836 PASSAGE"); 
     36            writer.println("1210837 DEMAND"); 
     37            writer.println("1210838 QUEUE"); 
     38            writer.println("1210839 RAMP_OFF"); 
     39            writer.println("1210845 2 5 S 1.49 9 EL CAMINO REAL"); 
     40            writer.println("1210846 ML_1"); 
     41            writer.println("1210847 ML_2"); 
     42            writer.println("1210848 ML_3"); 
     43            writer.println("1210849 ML_4"); 
     44            writer.println("1210850 RAMP_ON"); 
     45            writer.println("1210851 PASSAGE"); 
     46            writer.println("1210853 DEMAND"); 
     47            writer.println("1210854 QUEUE"); 
     48            writer.println("1210855 RAMP_OFF"); 
     49            writer.println("74 0 1"); 
     50            writer.println("1204203 2 5 N 1.26 13 MAGDALENA"); 
     51            writer.println("1204205 RAMP_ON"); 
     52            writer.println("1204206 QUEUE"); 
     53            writer.println("1204207 DEMAND"); 
     54            writer.println("1204208 PASSAGE"); 
     55            writer.println("1204210 RAMP_OFF"); 
     56            writer.println("1204212 ML_1"); 
     57            writer.println("1204213 ML_2"); 
     58            writer.println("1204214 ML_3"); 
     59            writer.println("1204215 ML_4"); 
     60            writer.println("1204217 OS_1"); 
     61            writer.println("1204218 OS_2"); 
     62            writer.println("1204219 OS_3"); 
     63            writer.println("1204220 OS_4"); 
    3164            writer.close(); 
    3265        } catch (Exception e) { 
    … …  
    74107        System.out.println("toXML"); 
    75108        Highways highways = new Highways( 
    76                 "config/vds_data/highways_fullmap.txt", 
     109                "test/atmsdriver/model/ldssample.txt", 
    77110                "localhost", 8080); 
    78111        String result = highways.toXML(); 

  • trunk/test/atmsdriver/model/LoadHighwaysTest.java

    r205 r208  
    114114                    stationsPostmiles.get(i)); 
    115115        } 
     116         
     117        // Test for correct number of loops 
     118        assertEquals(new Integer(30), new Integer(fiveS.stations.get(0).loops.size() 
     119            + fiveS.stations.get(1).loops.size() + fiveS.stations.get(2).loops.size())); 
    116120    } 
    117121} 
Note: See TracChangeset for help on using the changeset viewer.