Browse Source

fix: namespace in all cases test

master
Dnomd343 2 years ago
parent
commit
fbaa616f5c
  1. 2
      src/klotski/all_cases/all_cases.h
  2. 2
      src/klotski/all_cases/basic_ranges.h
  3. 5
      src/klotski/utils/common.h
  4. 16
      test/all_cases.cc

2
src/klotski/all_cases/all_cases.h

@ -6,7 +6,7 @@
#include "basic_ranges.h" #include "basic_ranges.h"
namespace klotski { namespace klotski {
/// all cases count /// all cases count -> memory pre-allocated
const uint32_t ALL_CASES_SIZE[16] = { const uint32_t ALL_CASES_SIZE[16] = {
2942906, 2260392, 2942906, 0, 2942906, 2260392, 2942906, 0,
2322050, 1876945, 2322050, 0, 2322050, 1876945, 2322050, 0,

2
src/klotski/all_cases/basic_ranges.h

@ -5,7 +5,7 @@
#include <cstdint> #include <cstdint>
namespace klotski { namespace klotski {
/// basic ranges count /// basic ranges count -> memory pre-allocated
const uint32_t BASIC_RANGES_SIZE = 7311921; const uint32_t BASIC_RANGES_SIZE = 7311921;
class BasicRanges { class BasicRanges {

5
src/klotski/utils/common.h

@ -9,9 +9,8 @@
/// ///
/// 3. `2x2` block must have and only one, `2x1` `1x2` `1x1` are not required in number. /// 3. `2x2` block must have and only one, `2x1` `1x2` `1x1` are not required in number.
/// ///
/// NOTE: 2x2 2x1 1x2 1x1 /// NOTE: 2x2 -> # # | 2x1 -> # | 1x2 -> # # | 1x1 -> #
/// # # # # # # /// # # | # | |
/// # # #
/// ///
/// After statistics, there are a total of 29334498 cases that meet the above requirements. /// After statistics, there are a total of 29334498 cases that meet the above requirements.

16
test/all_cases.cc

@ -3,17 +3,19 @@
#include "all_cases.h" #include "all_cases.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
using namespace klotski;
/// basic ranges constants /// basic ranges constants
const uint32_t BASIC_RANGES_SIZE = 7311921; //const uint32_t BASIC_RANGES_SIZE = 7311921;
const char BASIC_RANGES_MD5[] = "6f385dc171e201089ff96bb010b47212"; const char BASIC_RANGES_MD5[] = "6f385dc171e201089ff96bb010b47212";
/// all cases constants /// all cases constants
const uint32_t ALL_CASES_SIZE[16] = { //const uint32_t ALL_CASES_SIZE[16] = {
2942906, 2260392, 2942906, 0, // 2942906, 2260392, 2942906, 0,
2322050, 1876945, 2322050, 0, // 2322050, 1876945, 2322050, 0,
2322050, 1876945, 2322050, 0, // 2322050, 1876945, 2322050, 0,
2942906, 2260392, 2942906, 0, // 2942906, 2260392, 2942906, 0,
}; //};
const uint32_t ALL_CASES_SIZE_SUM = 29334498; const uint32_t ALL_CASES_SIZE_SUM = 29334498;
const char ALL_CASES_MD5[] = "3888e9fab8d3cbb50908b12b147cfb23"; const char ALL_CASES_MD5[] = "3888e9fab8d3cbb50908b12b147cfb23";

Loading…
Cancel
Save