Algorithm improvement

CMakeLists.txt

@@ -1,32 +1,29 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.8)
 project(LianSearch)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -Wall -Wextra")
-set(CMAKE_EXE_LINKER_FLAGS "-static -static-libgcc -static-libstdc++")
-set(SOURCE_FILES
-	    main.cpp
-    	tinyxml/tinyxmlparser.cpp
-    	tinyxml/tinyxmlerror.cpp
-    	tinyxml/tinyxml.cpp
-   	  tinyxml/tinystr.cpp
-    	liansearch.cpp
-    	openlist.cpp
-    	config.cpp
-    	map.cpp
-    	mission.cpp
-    	xmllogger.cpp)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
 
-set(HEADER_FILES
-	  tinyxml/tinyxml.h
-    tinyxml/tinystr.h
-  	searchresult.h
-   	gl_const.h
-   	liansearch.h
-   	node.h
-   	openlist.h
-   	config.h
-   	map.h
-   	logger.h
-   	mission.h
-   	search.h
-   	xmllogger.h)
-add_executable(LianSearch ${SOURCE_FILES} ${HEADER_FILES})
+add_subdirectory(contrib)
+
+add_executable(LianSearch
+		src/main.cpp
+		src/liansearch.cpp
+		src/structures/search_tree.cpp
+		src/structures/config.cpp
+		src/structures/map.cpp
+		src/structures/mission.cpp
+		src/log/logger.cpp
+		src/log/xml_utils.cpp
+
+		src/structures/search_result.h
+		src/log/gl_const.h
+		src/liansearch.h
+		src/structures/node.h
+		src/structures/search_tree.h
+		src/structures/config.h
+		src/structures/map.h
+		src/log/logger.h
+		src/structures/mission.h
+		src/log/xml_utils.h)
+target_link_libraries(LianSearch PUBLIC tinyxml)
+target_include_directories(LianSearch PUBLIC contrib)

README.md

@@ -16,17 +16,15 @@ Algorithm supports XML files as input and output format. Input file contains map
 
 ## Getting Started
 
-To go and try this algorithm you can use QtCreator or CMake.
-Both `.pro` and `CMakeLists` files are available in the repository.
+To go and try this algorithm you can use CMake.
+`CMakeLists` file is available in the repository.
 
-Notice, that project uses C++11 standart. Make sure that your compiler supports it.
+Notice, that project uses C++20 standard. Make sure that your compiler supports it.
 
 These instructions will get you a copy of the project up and running on your local machine for development and testing purposes.
 
 ### Prerequisites
 
-**[Qt Creator](https://info.qt.io/download-qt-for-device-creation?hsCtaTracking=c80600ba-f2ea-45ed-97ef-6949c1c4c236%7C643bd8f4-2c59-4c4c-ba1a-4aaa05b51086)**  — a cross-platform C++, JavaScript and QML integrated development environment which is part of the SDK for the Qt GUI Application development framework.
-
 **[CMake](https://cmake.org/)** — an open-source, cross-platform family of tools designed to build, test and package software.
 
 ### Installing
@@ -83,10 +81,10 @@ Input file should contain:
 
     * `<loglevel>` &mdash; defines the level of detalization of log-file. Default value is "1". Possible values:
         - "0" or "none" &mdash; log-file is not created.
-        - "0.5" or "tiny" &mdash; All the input data is copied to the log-file plus short `<summary>` is appended. `<summary>` contains info of the path length, number of steps, elapsed time, etc.
-        - "1" or "short" &mdash; 0.5 - log plus `<path>` is appended. It looks like `<grid>` but cells forming the path are marked by "\*" instead of "0". The following tags are also appended: `<hplevel>` and `<lplevel>`. `<lplevel>` is the sequence of coordinates of cells forming the path. `<hplevel>` is the sequence of sections forming the path.
-        - "1.5" or "medium" &mdash; 1 - log plus the information (explicit enumeration) on last iteration's OPEN and CLOSE lists.
-        - "2" or "full" &mdash; 1 - log plus OPEN and CLOSE lists are written into the log-file after each step of the algorithm. Can make log-files really huge and also slow down the whole algorithm.
+        - "2" or "short" &mdash; All the input data is copied to the log-file plus short `<summary>` is appended. `<summary>` contains info of the path length, number of steps, elapsed time, etc.
+        - "3" or "high" &mdash; 0.5 - log plus `<path>` is appended. It looks like `<grid>` but cells forming the path are marked by "\*" instead of "0". The following tags are also appended: `<hplevel>` and `<lplevel>`. `<lplevel>` is the sequence of coordinates of cells forming the path. `<hplevel>` is the sequence of sections forming the path.
+        - "4" or "medium" &mdash; 1 - log plus the information (explicit enumeration) on last iteration's OPEN and CLOSE lists.
+        - "5" or "full" &mdash; 1 - log plus OPEN and CLOSE lists are written into the log-file after each step of the algorithm. Can make log-files really huge and also slow down the whole algorithm.
 
         In order to understand differences between output files with different `<loglevel>` tags there are examples of each in [samples](https://github.com/PathPlanning/LIAN/tree/master/examples) folder.