| Revision 184,
1.1 KB
checked in by jtorres, 9 years ago
(diff) |
|
highways.java: converted to immutable, removed use of FEPLineLoader and added loadLines(), loadLine(), loadStation(), and loadLoop() methods. Renamed loadHighways() to configureHighways(), renamed writeHighwaysMeta() to getHighwaysMeta() which now returns a String containing metadata instead of opening a file and writing to it, which is more flexible. FEPLineLoader.java: deleted, no longer need it. FEPLine.java: converted to immutable, removed unnecessary member variables and adjusted all methods accordingly. Station.java: MLTotVol() and OppTotVol?() are now being updated at end of updateByDirection(). ATMSDriver.java: Now using one config file: highways_fullmap.txt, as opposed to the older lds.txt and loop.txt files. config/vds_data: added highways_fullmap.txt. config/atms_driver_config.properties, atms_driver_config_local.properties: updated config to reflect use of highways_fullmap.txt instead of old loop.txt and lds.txt configuration. ATMSBatchDriver.java: conformed highways initialization in constructor to reflect use of highways_fullmap.txt
|
| Line | |
|---|
| 1 | <?xml version="1.0" encoding="UTF-8"?> |
|---|
| 2 | <project-private xmlns="http://www.netbeans.org/ns/project-private/1"> |
|---|
| 3 | <data xmlns="http://www.netbeans.org/ns/make-project-private/1"> |
|---|
| 4 | <activeConfTypeElem>1</activeConfTypeElem> |
|---|
| 5 | <activeConfIndexElem>0</activeConfIndexElem> |
|---|
| 6 | </data> |
|---|
| 7 | <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> |
|---|
| 8 | <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.cpp</file> |
|---|
| 13 | <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file> |
|---|
| 14 | <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file> |
|---|
| 15 | <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file> |
|---|
| 16 | </group> |
|---|
| 17 | </open-files> |
|---|
| 18 | </project-private> |
|---|
Note: See
TracBrowser
for help on using the repository browser.