Changeset 170 in tmcsimulator


Ignore:
Timestamp:
10/23/2017 07:04:39 PM (9 years ago)
Author:
jtorres
Message:

Full LDS data list now working

Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • branches/FEPSimulator/FEPSim.h

    r86 r170  
    4343#include <unistd.h> 
    4444 
    45 const int BUFF_SIZE = 1000000; 
     45const int BUFF_SIZE = 5500000; 
    4646 
    4747class FEPSim { 

  • branches/FEPSimulator/nbproject/Makefile-Debug.mk

    r117 r170  
    5858 
    5959# Link Libraries and Options 
    60 LDLIBSOPTIONS=tinyxml/tinyxml.a 
     60LDLIBSOPTIONS=tinyxml/libosxtinyxml.a 
    6161 
    6262# Build Targets 
    … …  
    6464        "${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator 
    6565 
    66 ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/tinyxml.a 
     66${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: tinyxml/libosxtinyxml.a 
    6767 
    6868${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/fepsimulator: ${OBJECTFILES} 

  • branches/FEPSimulator/nbproject/configurations.xml

    r117 r170  
    5353        <linkerTool> 
    5454          <linkerLibItems> 
    55             <linkerLibFileItem>tinyxml/tinyxml.a</linkerLibFileItem> 
     55            <linkerLibFileItem>tinyxml/libosxtinyxml.a</linkerLibFileItem> 
    5656          </linkerLibItems> 
    5757        </linkerTool> 

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

    r162 r170  
    77    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> 
    88    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> 
    9         <group> 
    10             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file> 
    11             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/NetworkReader.cpp</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/fep.h</file> 
    16             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/NetworkReader.h</file> 
    17             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file> 
    18         </group> 
     9        <group/> 
    1910    </open-files> 
    2011</project-private> 

  • trunk/src/atmsdriver/model/Highways.java

    r128 r170  
    214214            Socket sock = new Socket(FEPHostName /*"192.168.251.130"*/, 8080); 
    215215            PrintWriter out = new PrintWriter(sock.getOutputStream(), true); 
     216            System.out.println("BYTES: " + this.toXML().toCharArray().length + 1); 
    216217            out.println(this.toXML()); 
    217218            sock.close(); 

  • trunk/src/tmcsim/application.properties

    r162 r170  
    1 #Mon, 23 Oct 2017 11:00:55 -0700 
     1#Mon, 23 Oct 2017 20:10:38 -0700 
    22 
    3 Application.revision=161 
     3Application.revision=169 
    44 
    55Application.buildnumber=53 

  • trunk/src/tmcsim/client/ATMSBatchDriver.java

    r158 r170  
    144144        incidents = new HashMap<String, List<String>> (); 
    145145        highways = new Highways( 
    146         "config/vds_data/lds.txt", 
    147         "config/vds_data/loop.txt", 
     146        "config/vds_data/extend_lds_file.txt", 
     147        "config/vds_data/extend_loop_file.txt", 
    148148        "config/vds_data/highwaysMeta.txt", 
    149         "192.168.251.46", 8080);  //IP address of FEP Sim Linux VM 
    150 //        "localhost", 8080); 
     149//        "192.168.251.46", 8080);  //IP address of FEP Sim Linux VM 
     150        "localhost", 8080); 
    151151        // Create console driver but don't start run() method 
    152152        console = new ConsoleDriver(highways); 
Note: See TracChangeset for help on using the changeset viewer.