From be3ce8158088e43811367ae27342ccbd09618c07 Mon Sep 17 00:00:00 2001 From: Kyle Vedder Date: Sat, 25 Apr 2020 12:26:39 -0400 Subject: [PATCH] Fixed compilation and linking issues. Now compiles under Ubuntu 18.04. --- .gitignore | 3 +- CMakeLists.txt | 1 + Examples/empty_log.xml | 61 -------- Examples/empty_single_log.xml | 261 ---------------------------------- ilogger.h | 2 +- multiagent_search_result.h | 2 +- 6 files changed, 5 insertions(+), 325 deletions(-) delete mode 100644 Examples/empty_log.xml delete mode 100644 Examples/empty_single_log.xml diff --git a/.gitignore b/.gitignore index 86a9657..11cb3da 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -*.pro.user \ No newline at end of file +*.pro.user +/Examples/*log* \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b26471..b16c914 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,7 @@ set(SOURCE_FILES isearch.cpp mission.cpp map.cpp + mdd.cpp dijkstra.cpp config.cpp astar.cpp diff --git a/Examples/empty_log.xml b/Examples/empty_log.xml deleted file mode 100644 index 2bf766a..0000000 --- a/Examples/empty_log.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - 16 - 16 - - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - - - - cbs - empty-16-16-random - 2 - - 1000 - true - false - true - 2 - true - false - - - - - empty.xml - - - - - - - - - - - - - - - - - - - - diff --git a/Examples/empty_single_log.xml b/Examples/empty_single_log.xml deleted file mode 100644 index df6f3dc..0000000 --- a/Examples/empty_single_log.xml +++ /dev/null @@ -1,261 +0,0 @@ - - - - 16 - 16 - - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - - - - cbs - empty-16-16-random - 1 - - 1000 - true - true - false - 2 - true - true - - - - - empty_single.xml - empty-16-16-random-1.xml - - - -
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
- - - - -
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
- - - - -
-
-
-
- - - - -
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - - diff --git a/ilogger.h b/ilogger.h index e3c3d81..56f73a3 100644 --- a/ilogger.h +++ b/ilogger.h @@ -1,7 +1,7 @@ #ifndef ILOGGER_H #define ILOGGER_H #include "map.h" -#include +#include "node.h" #include #include diff --git a/multiagent_search_result.h b/multiagent_search_result.h index 547c964..7231558 100644 --- a/multiagent_search_result.h +++ b/multiagent_search_result.h @@ -3,7 +3,7 @@ #include #include "node.h" -#include +#include "agent_move.h" struct MultiagentSearchResult {