Changeset 186 in tmcsimulator for branches/FEPSimulator/nbproject


Ignore:
Timestamp:
10/28/2017 06:48:11 PM (9 years ago)
Author:
jtorres
Message:

Highways.java, FEPLine.java, LoopDetector?.java, Station.java: reconfigured the getHighwaysMeta() function to a toCondensedFormat(boolean MetaDataOnly?) method. By specifying MetaDataOnly? as true, you get the same output as the previous getHighwaysMeta() function. By specifying MetaDataOnly? as false, you get the new condensed format needed to send to the FEPSim over the socket. This allows us to use the same function to get a meta data dump, as well as get the highways data format needed for FEPSim socket. HighwaysParser?.cpp: removed the old tinyxml code, set up skeleton for new parser. NetworkReader?.h: deleted, and added HighwaysParser?.h. LoadSadDotsTest?.java and StationTest?.java: configured to use new toCondensedFormat method instead of getHighwaysMeta.

Location:
branches/FEPSimulator/nbproject
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/FEPSimulator/nbproject/configurations.xml

    r185 r186  
    77      <itemPath>DataPacker.h</itemPath> 
    88      <itemPath>FEPSim.h</itemPath> 
    9       <itemPath>NetworkReader.h</itemPath> 
     9      <itemPath>HighwaysParser.h</itemPath> 
    1010      <itemPath>fep.h</itemPath> 
    1111      <itemPath>network.h</itemPath> 
    … …  
    6262      <item path="HighwaysParser.cpp" ex="false" tool="1" flavor2="0"> 
    6363      </item> 
     64      <item path="HighwaysParser.h" ex="false" tool="3" flavor2="0"> 
     65      </item> 
    6466      <item path="Main.cpp" ex="false" tool="1" flavor2="0"> 
    65       </item> 
    66       <item path="NetworkReader.h" ex="false" tool="3" flavor2="0"> 
    6767      </item> 
    6868      <item path="fep.h" ex="false" tool="3" flavor2="0"> 
    … …  
    105105      <item path="HighwaysParser.cpp" ex="false" tool="1" flavor2="0"> 
    106106      </item> 
     107      <item path="HighwaysParser.h" ex="false" tool="3" flavor2="0"> 
     108      </item> 
    107109      <item path="Main.cpp" ex="false" tool="1" flavor2="0"> 
    108       </item> 
    109       <item path="NetworkReader.h" ex="false" tool="3" flavor2="0"> 
    110110      </item> 
    111111      <item path="fep.h" ex="false" tool="3" flavor2="0"> 

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

    r185 r186  
    88    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> 
    99        <group> 
     10            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Main.cpp</file> 
    1011            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file> 
    1112        </group> 
Note: See TracChangeset for help on using the changeset viewer.