rename DTALite_DLL_test to test_dll

- update the correspoding parts in .gitignore as well - minor cleanup on main_api.cpp to remove duplicate inclusions - update inclusions on main_api.cpp and signal_api.cpp
jeshy · Feb 27, 2021 · deb5809 · deb5809
1 parent 29d5a01
commit deb5809
Show file tree

Hide file tree

Showing 39 changed files with 8 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,10 +13,10 @@ debug/
 test/link_performance.csv
 test/agent.csv
 test/solution.csv
-# untrack output files in DTALite_DLL_test folder
-DTALite_DLL_test/link_performance.csv
-DTALite_DLL_test/agent.csv
-DTALite_DLL_test/solution.csv
-DTALite_DLL_test/log.txt
+# untrack output files in test_dll folder
+test_dll/link_performance.csv
+test_dll/agent.csv
+test_dll/solution.csv
+test_dll/log.txt
 # untrack build folder for building shared libraries
 build/
diff --git a/src/v2/DLL_src/DP/FlashDTA.cpp b/src/v2/DLL_src/DP/FlashDTA.cpp
@@ -88,8 +88,8 @@ typedef basic_teestream<char> teestream;
 
 extern teestream log_out;
 extern double SignalAPI(int iteration_number, int MainSigModual_mode, int signal_updating_output);
-#include "..\AgentLite\main_api.cpp";
-#include "..\AgentLite\signal_api.cpp";
+#include "main_api.cpp";
+#include "signal_api.cpp";
 
 std::ofstream file("log.csv");
 teestream log_out(std::cout, file);

diff --git a/src/v2/DLL_src/DP/main_api.cpp b/src/v2/DLL_src/DP/main_api.cpp
@@ -18,14 +18,11 @@
 #include <functional>
 #include <stdio.h>   
 #include <math.h>
-
-
 #include <stack>
 #include <string>
 #include <vector>
 #include <map>
 #include <sstream>
-#include <iostream>
 #include <iomanip>
 #include "MathLibrary.h"
 #include <cstring>
@@ -36,7 +33,6 @@ using std::vector;
 using std::map;
 using std::istringstream;
 using std::max;
-template <typename T>
 
 // some basic parameters setting
 

diff --git a/src/v2/Exe_src/AgentLite/DTALite_main.cpp b/src/v2/Exe_src/AgentLite/DTALite_main.cpp
@@ -9,8 +9,7 @@
 
 #include "stdafx.h"
 
-
-#include "C:\SourceCode\DTALite_DLL\DTALite\src\Exe_src\AgentLite\main_api.cpp"
+#include "main_api.cpp"
 
 
 int main(int argc, TCHAR* argv[], TCHAR* envp[])

diff --git a/src/v2/Exe_src/AgentLite/main_api.cpp b/src/v2/Exe_src/AgentLite/main_api.cpp
@@ -18,14 +18,11 @@
 #include <functional>
 #include <stdio.h>   
 #include <math.h>
-
-
 #include <stack>
 #include <string>
 #include <vector>
 #include <map>
 #include <sstream>
-#include <iostream>
 #include <iomanip>
 using namespace std;
 using std::string;
@@ -34,7 +31,6 @@ using std::vector;
 using std::map;
 using std::istringstream;
 using std::max;
-template <typename T>
 
 // some basic parameters setting
 

diff --git a/...adox/Braess_network_Process_Tutorial.xlsx → ...adox/Braess_network_Process_Tutorial.xlsx b/...adox/Braess_network_Process_Tutorial.xlsx → ...adox/Braess_network_Process_Tutorial.xlsx
diff --git a/DTALite_DLL_test/Braess's_Paradox/agent.csv → test_dll/Braess's_Paradox/agent.csv b/DTALite_DLL_test/Braess's_Paradox/agent.csv → test_dll/Braess's_Paradox/agent.csv
diff --git a/DTALite_DLL_test/Braess's_Paradox/demand.csv → test_dll/Braess's_Paradox/demand.csv b/DTALite_DLL_test/Braess's_Paradox/demand.csv → test_dll/Braess's_Paradox/demand.csv
diff --git a/DTALite_DLL_test/Braess's_Paradox/link.csv → test_dll/Braess's_Paradox/link.csv b/DTALite_DLL_test/Braess's_Paradox/link.csv → test_dll/Braess's_Paradox/link.csv
diff --git a/...est/Braess's_Paradox/link_performance.csv → ...dll/Braess's_Paradox/link_performance.csv b/...est/Braess's_Paradox/link_performance.csv → ...dll/Braess's_Paradox/link_performance.csv
diff --git a/DTALite_DLL_test/Braess's_Paradox/log.csv → test_dll/Braess's_Paradox/log.csv b/DTALite_DLL_test/Braess's_Paradox/log.csv → test_dll/Braess's_Paradox/log.csv
diff --git a/DTALite_DLL_test/Braess's_Paradox/log.txt → test_dll/Braess's_Paradox/log.txt b/DTALite_DLL_test/Braess's_Paradox/log.txt → test_dll/Braess's_Paradox/log.txt
diff --git a/DTALite_DLL_test/Braess's_Paradox/node.csv → test_dll/Braess's_Paradox/node.csv b/DTALite_DLL_test/Braess's_Paradox/node.csv → test_dll/Braess's_Paradox/node.csv
diff --git a/...te_DLL_test/Braess's_Paradox/settings.csv → test_dll/Braess's_Paradox/settings.csv b/...te_DLL_test/Braess's_Paradox/settings.csv → test_dll/Braess's_Paradox/settings.csv
diff --git a/DTALite_DLL_test/Chicago_Sketch/NeXTA.log → test_dll/Chicago_Sketch/NeXTA.log b/DTALite_DLL_test/Chicago_Sketch/NeXTA.log → test_dll/Chicago_Sketch/NeXTA.log
diff --git a/DTALite_DLL_test/Chicago_Sketch/agent.csv → test_dll/Chicago_Sketch/agent.csv b/DTALite_DLL_test/Chicago_Sketch/agent.csv → test_dll/Chicago_Sketch/agent.csv
diff --git a/DTALite_DLL_test/Chicago_Sketch/demand.csv → test_dll/Chicago_Sketch/demand.csv b/DTALite_DLL_test/Chicago_Sketch/demand.csv → test_dll/Chicago_Sketch/demand.csv
diff --git a/DTALite_DLL_test/Chicago_Sketch/link.csv → test_dll/Chicago_Sketch/link.csv b/DTALite_DLL_test/Chicago_Sketch/link.csv → test_dll/Chicago_Sketch/link.csv
diff --git a/..._test/Chicago_Sketch/link_performance.csv → test_dll/Chicago_Sketch/link_performance.csv b/..._test/Chicago_Sketch/link_performance.csv → test_dll/Chicago_Sketch/link_performance.csv
diff --git a/...o_Sketch/link_performance_comparison.xlsx → ...o_Sketch/link_performance_comparison.xlsx b/...o_Sketch/link_performance_comparison.xlsx → ...o_Sketch/link_performance_comparison.xlsx
diff --git a/...ite_DLL_test/Chicago_Sketch/link_type.csv → test_dll/Chicago_Sketch/link_type.csv b/...ite_DLL_test/Chicago_Sketch/link_type.csv → test_dll/Chicago_Sketch/link_type.csv
diff --git a/DTALite_DLL_test/Chicago_Sketch/log.txt → test_dll/Chicago_Sketch/log.txt b/DTALite_DLL_test/Chicago_Sketch/log.txt → test_dll/Chicago_Sketch/log.txt
diff --git a/DTALite_DLL_test/Chicago_Sketch/node.csv → test_dll/Chicago_Sketch/node.csv b/DTALite_DLL_test/Chicago_Sketch/node.csv → test_dll/Chicago_Sketch/node.csv
diff --git a/DTALite_DLL_test/Chicago_Sketch/settings.csv → test_dll/Chicago_Sketch/settings.csv b/DTALite_DLL_test/Chicago_Sketch/settings.csv → test_dll/Chicago_Sketch/settings.csv
diff --git a/...Sketch/~$link_performance_comparison.xlsx → ...Sketch/~$link_performance_comparison.xlsx b/...Sketch/~$link_performance_comparison.xlsx → ...Sketch/~$link_performance_comparison.xlsx
diff --git a/DTALite_DLL_test/DTALite.dll → test_dll/DTALite.dll b/DTALite_DLL_test/DTALite.dll → test_dll/DTALite.dll
diff --git a/DTALite_DLL_test/DTALite.dylib → test_dll/DTALite.dylib b/DTALite_DLL_test/DTALite.dylib → test_dll/DTALite.dylib
diff --git a/DTALite_DLL_test/DTALite.exe → test_dll/DTALite.exe b/DTALite_DLL_test/DTALite.exe → test_dll/DTALite.exe
diff --git a/DTALite_DLL_test/DTALite.so → test_dll/DTALite.so b/DTALite_DLL_test/DTALite.so → test_dll/DTALite.so
diff --git a/...e_DLL_test/Sioux_Falls_network/demand.csv → test_dll/Sioux_Falls_network/demand.csv b/...e_DLL_test/Sioux_Falls_network/demand.csv → test_dll/Sioux_Falls_network/demand.csv
diff --git a/...ite_DLL_test/Sioux_Falls_network/link.csv → test_dll/Sioux_Falls_network/link.csv b/...ite_DLL_test/Sioux_Falls_network/link.csv → test_dll/Sioux_Falls_network/link.csv
diff --git a/..._network/link_performance_comparison.xlsx → ..._network/link_performance_comparison.xlsx b/..._network/link_performance_comparison.xlsx → ..._network/link_performance_comparison.xlsx
diff --git a/...ite_DLL_test/Sioux_Falls_network/node.csv → test_dll/Sioux_Falls_network/node.csv b/...ite_DLL_test/Sioux_Falls_network/node.csv → test_dll/Sioux_Falls_network/node.csv
diff --git a/...DLL_test/Sioux_Falls_network/settings.csv → test_dll/Sioux_Falls_network/settings.csv b/...DLL_test/Sioux_Falls_network/settings.csv → test_dll/Sioux_Falls_network/settings.csv
diff --git a/DTALite_DLL_test/demand.csv → test_dll/demand.csv b/DTALite_DLL_test/demand.csv → test_dll/demand.csv
diff --git a/DTALite_DLL_test/link.csv → test_dll/link.csv b/DTALite_DLL_test/link.csv → test_dll/link.csv
diff --git a/DTALite_DLL_test/node.csv → test_dll/node.csv b/DTALite_DLL_test/node.csv → test_dll/node.csv
diff --git a/DTALite_DLL_test/settings.csv → test_dll/settings.csv b/DTALite_DLL_test/settings.csv → test_dll/settings.csv
diff --git a/DTALite_DLL_test/test_dll.py → test_dll/test_dll.py b/DTALite_DLL_test/test_dll.py → test_dll/test_dll.py