Changeset 101 in tmcsimulator

Timestamp:

10/11/2017 04:36:47 PM (9 years ago)

Author:

jtorres

Message:

ATMSDriver: added local configuration for ATMSDriver (for when the FEPSimulator is being run locally). This included adding a new config file: turnk/config/atms_driver_config_local.properties

Files:

• branches/FEPSimulator/build/Debug/GNU-MacOSX/Main.o.d (modified) (1 diff)
• trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ATMSDriverLocal.properties (added)
• trunk/config/atms_driver_config.properties (modified) (1 diff)
• trunk/config/atms_driver_config_local.properties (added)
• trunk/src/atmsdriver/model/Highways.java (modified) (4 diffs)
• trunk/src/tmcsim/application.properties (modified) (1 diff)

branches/FEPSimulator/build/Debug/GNU-MacOSX/Main.o.d

@@ -1 +1 @@
 build/Debug/GNU-MacOSX/Main.o: Main.cpp FEPSim.h fep.h NetworkReader.h \
- network.h tinyxml/tinyxml.h tinyxml/tinystr.h DataPacker.h
+  network.h tinyxml/tinyxml.h tinyxml/tinystr.h DataPacker.h
 
 FEPSim.h:

trunk/config/atms_driver_config.properties

@@ -4 +4 @@
 NetworkFileName = networkFile.txt
 ExchangeFileName = exchange.xml
-FEPWriterHost = localhost
+FEPWriterHost = 192.168.251.46
 FEPWriterPort = 8080

trunk/src/atmsdriver/model/Highways.java

@@ -18 +18 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Observable;
+import java.util.Observer;
 import java.util.Scanner;
 import java.util.Set;
@@ -36 +38 @@
  * @author John A. Torres
  */
-public class Highways {
+public class Highways implements Observer {
 
     final private ArrayList<FEPLine> lines;
@@ -213 +215 @@
 
     public void writeToFEP() {
+                    System.out.println(this.toXML().toCharArray().length);
+
         try {
             Socket sock = new Socket(FEPHostName, FEPPortNum);
@@ -289 +293 @@
     }
 
+    @Override
+    public void update(Observable o, Object arg) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
     private static enum XML_TAGS {
 

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Tue, 10 Oct 2017 15:53:59 -0700
+#Wed, 11 Oct 2017 17:25:07 -0700
 
-Application.revision=88
+Application.revision=97
 
 Application.buildnumber=50