build: update cmake compile structure

src/CMakeLists.txt

@@ -1,60 +1,14 @@
 cmake_minimum_required(VERSION 3.0)
 
-################################################
+include_directories(klotski)
+include_directories(klotski/utils)
+include_directories(klotski/all_cases)
 
-include_directories(utils)
+include_directories(klotski/raw_code)
-include_directories(all_cases)
+include_directories(klotski/short_code)
+include_directories(klotski/common_code)
 
-include_directories(raw_code)
+add_subdirectory(klotski)
-include_directories(short_code)
-include_directories(common_code)
 
-include_directories(core)
+add_executable(klotski_bin main.cc)
-include_directories(analyse)
+target_link_libraries(klotski_bin klotski)
-include_directories(fast_cal)
-
-include_directories(graph)
-
-include_directories(benchmark)
-
-################################################
-
-add_subdirectory(utils)
-add_subdirectory(all_cases)
-
-add_subdirectory(raw_code)
-add_subdirectory(short_code)
-add_subdirectory(common_code)
-
-add_subdirectory(core)
-add_subdirectory(analyse)
-add_subdirectory(fast_cal)
-
-add_subdirectory(graph)
-
-add_subdirectory(benchmark)
-
-################################################
-
-add_executable(klotski main.cc)
-
-################################################
-
-target_link_libraries(klotski utils)
-target_link_libraries(klotski all_cases)
-
-target_link_libraries(klotski raw_code)
-target_link_libraries(klotski short_code)
-target_link_libraries(klotski common_code)
-
-target_link_libraries(klotski core)
-target_link_libraries(klotski analyse)
-target_link_libraries(klotski fast_cal)
-
-target_link_libraries(klotski graph)
-
-target_link_libraries(klotski benchmark)
-
-target_link_libraries(klotski pthread)
-
-################################################

src/graph/svg/CMakeLists.txt

@@ -1 +0,0 @@
-add_library(svg svg.cc)

src/klotski/CMakeLists.txt

@@ -0,0 +1,67 @@
+cmake_minimum_required(VERSION 3.0)
+
+################################################
+
+include_directories(utils)
+include_directories(all_cases)
+
+include_directories(raw_code)
+include_directories(short_code)
+include_directories(common_code)
+
+#include_directories(core)
+#include_directories(analyse)
+#include_directories(fast_cal)
+#
+#include_directories(graph)
+#
+#include_directories(benchmark)
+
+################################################
+
+add_subdirectory(utils)
+add_subdirectory(all_cases)
+
+add_subdirectory(raw_code)
+add_subdirectory(short_code)
+add_subdirectory(common_code)
+
+#add_subdirectory(core)
+#add_subdirectory(analyse)
+#add_subdirectory(fast_cal)
+#
+#add_subdirectory(graph)
+#
+#add_subdirectory(benchmark)
+
+################################################
+
+add_library(klotski klotski_ffi.cc)
+
+target_link_libraries(klotski utils)
+target_link_libraries(klotski all_cases)
+
+target_link_libraries(klotski raw_code)
+target_link_libraries(klotski short_code)
+target_link_libraries(klotski common_code)
+
+################################################
+
+#target_link_libraries(klotski utils)
+#target_link_libraries(klotski all_cases)
+
+#target_link_libraries(klotski raw_code)
+#target_link_libraries(klotski short_code)
+#target_link_libraries(klotski common_code)
+#
+#target_link_libraries(klotski core)
+#target_link_libraries(klotski analyse)
+#target_link_libraries(klotski fast_cal)
+#
+#target_link_libraries(klotski graph)
+#
+#target_link_libraries(klotski benchmark)
+#
+#target_link_libraries(klotski pthread)
+
+################################################

src/all_cases/CMakeLists.txt → src/klotski/all_cases/CMakeLists.txt

@@ -1,3 +1,4 @@
-add_library(all_cases all_cases.cc basic_ranges.cc)
+cmake_minimum_required(VERSION 3.0)
 
+add_library(all_cases all_cases.cc basic_ranges.cc)
 target_link_libraries(all_cases utils)

src/klotski/klotski_ffi.cc

@@ -0,0 +1,2 @@
+#include <iostream>
+

src/main.cc

@@ -1,16 +1,18 @@
 #include <iostream>
-#include "core.h"
+//#include "core.h"
+
 #include "all_cases.h"
-#include "basic_ranges.h"
+
-#include "common_code.h"
-#include "short_code.h"
 #include "raw_code.h"
-#include "fast_cal.h"
+#include "short_code.h"
-#include "analyse.h"
+#include "common_code.h"
+
+//#include "fast_cal.h"
+//#include "analyse.h"
 #include "common.h"
-#include "graph.h"
+//#include "graph.h"
 
-#include "benchmark.h"
+//#include "benchmark.h"
 
 #include <thread>
 #include <algorithm>
@@ -20,19 +22,42 @@
 //int main(int argc, char *argv[]) {
 int main() {
 
+    std::cout << "start test" << std::endl;
+
+//    std::cout << (uint32_t)Common::check_range(1, Common::range_reverse(0xA9BF0C00)) << std::endl;
+
+//    AllCases::build();
+//    for (const auto &a : AllCases::fetch()) {
+//        std::cout << a.size() << std::endl;
+//    }
+
+    std::cout << RawCode::from_common_code("1a9bf0c") << std::endl;
+    std::cout << RawCode::create(0x0603EDF5CAFFF5E2) << std::endl;
+
+    std::cout << CommonCode::create(0x1A9BF0C00) << std::endl;
+    std::cout << CommonCode::from_string("1a9bf0c") << std::endl;
+    std::cout << CommonCode::from_short_code(4091296) << std::endl;
+    std::cout << CommonCode::from_raw_code(0x0603EDF5CAFFF5E2) << std::endl;
+
+    std::cout << ShortCode::create(4091296) << std::endl;
+    std::cout << ShortCode::from_string("4WVE1") << std::endl;
+    std::cout << ShortCode::from_common_code(0x1A9BF0C00) << std::endl;
+
+    std::cout << "end test" << std::endl;
+
 //    BasicRanges::build();
 
 //    Benchmark::basic_ranges(std::cout);
 //    std::cout << std::endl;
-    Benchmark::all_cases(std::cout);
+//    Benchmark::all_cases(std::cout);
 
-    std::cout << std::endl;
+//    std::cout << std::endl;
-    Benchmark::basic_ranges(std::cout);
+//    Benchmark::basic_ranges(std::cout);
 
     return 0;
 
 
-    BasicRanges::build();
+//    BasicRanges::build();
 //    AllCases::build();
 
 
@@ -73,9 +98,9 @@ int main() {
 //    }
 
 
-    auto start_time = clock();
+//    auto start_time = clock();
 
-    auto a = Analyse(RawCode::from_common_code("1a9bf0c"));
+//    auto a = Analyse(RawCode::from_common_code("1a9bf0c"));
 //    auto a = Analyse(RawCode::from_common_code("4fea134"));
 //    auto a = Analyse(RawCode::from_common_code("A5D3AF"));
 
@@ -84,23 +109,23 @@ int main() {
 //    auto ret = a.build_until([](uint64_t code) {
 //        return ((code >> (3 * 0xD)) & 0b111) == B_2x2;
 //    });
-    auto ret = a.build_resolve();
+//    auto ret = a.build_resolve();
 //    for (const auto &r : ret) {
 //        std::cout << r << std::endl;
 //    }
 //    std::cout << ret.size() << std::endl;
 
 
-    std::cerr << (clock() - start_time) * 1000000 / CLOCKS_PER_SEC << "us" << std::endl;
+//    std::cerr << (clock() - start_time) * 1000000 / CLOCKS_PER_SEC << "us" << std::endl;
 
 
-    start_time = clock();
+//    start_time = clock();
-    auto svg_ret = a.backtrack(ret);
+//    auto svg_ret = a.backtrack(ret);
-    std::cerr << (clock() - start_time) * 1000000 / CLOCKS_PER_SEC << "us" << std::endl;
+//    std::cerr << (clock() - start_time) * 1000000 / CLOCKS_PER_SEC << "us" << std::endl;
 
 
-    auto g = Graph();
+//    auto g = Graph();
-    auto svg_data = g.svg_demo(svg_ret);
+//    auto svg_data = g.svg_demo(svg_ret);
 
 //    std::cout << svg_data << std::endl;
 
@@ -141,7 +166,7 @@ int main() {
 
 //    std::cerr << (clock() - start_time) / CLOCKS_PER_SEC << "s" << std::endl;
 //    std::cerr << (clock() - start_time) * 1000 / CLOCKS_PER_SEC << "ms" << std::endl;
-    std::cerr << (clock() - start_time) * 1000000 / CLOCKS_PER_SEC << "us" << std::endl;
+//    std::cerr << (clock() - start_time) * 1000000 / CLOCKS_PER_SEC << "us" << std::endl;
 
 //    std::cout << "complete benchmark" << std::endl;