dnomd343
/
klotski
mirror of https://github.com/dnomd343/klotski.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

remove: redundant test code

legacy
Dnomd343 2 years ago
parent
cf89c55f72
commit
f22472e83a
6 changed files with 11 additions and 498 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/all_cases/all_cases.cc
  2. 8
      src/all_cases/all_cases.h
  3. 5
      src/all_cases/basic_ranges.h
  4. 451
      src/main.cc
  5. 33
      src/utils/common.cc
  6. 4
      src/utils/common.h

8
src/all_cases/all_cases.cc
View File

@ -45,11 +45,6 @@ void AllCases::build_data() { // find all cases
data[head].reserve(ALL_CASES_SIZE[head]); // memory pre-allocated data[head].reserve(ALL_CASES_SIZE[head]); // memory pre-allocated
/// head(4-bits) + basic ranges(32-bits) ==check==> release valid cases /// head(4-bits) + basic ranges(32-bits) ==check==> release valid cases
for (auto index = 0; index < basic_ranges.size(); ++index) { for (auto index = 0; index < basic_ranges.size(); ++index) {
if ((basic_ranges[index] & 0b111111) == 0b010111) {
continue;
}
auto broken_offset = Common::check_range(head, basic_ranges[index]); auto broken_offset = Common::check_range(head, basic_ranges[index]);
if (broken_offset) { // case invalid if (broken_offset) { // case invalid
auto delta = (uint32_t)1 << (32 - broken_offset * 2); // delta to next possible range auto delta = (uint32_t)1 << (32 - broken_offset * 2); // delta to next possible range
@ -60,12 +55,9 @@ void AllCases::build_data() { // find all cases
while (Common::range_reverse(basic_ranges[++index]) < next_min); // located next range while (Common::range_reverse(basic_ranges[++index]) < next_min); // located next range
--index; --index;
} else { } else {
// if (!Common::check_range(head, basic_ranges[index])) {
// if (Common::check_case(head, basic_ranges[index])) {
AllCases::data[head].emplace_back( AllCases::data[head].emplace_back(
Common::range_reverse(basic_ranges[index]) // release valid cases Common::range_reverse(basic_ranges[index]) // release valid cases
); );
// }
} }
} }
} }

8
src/all_cases/all_cases.h
View File

@ -18,14 +18,10 @@ public:
static enum Status status(); static enum Status status();
static const std::vector<uint32_t> (&fetch())[16]; static const std::vector<uint32_t> (&fetch())[16];
// TODO: remove after test
static bool available;
static std::vector<uint32_t> data[16];
private: private:
// static bool available; static bool available;
static std::mutex building; static std::mutex building;
// static std::vector<uint32_t> data[16]; static std::vector<uint32_t> data[16];
static void build_data(); static void build_data();
}; };

5
src/all_cases/basic_ranges.h
View File

@ -17,9 +17,6 @@ public:
static enum Status status(); static enum Status status();
static const std::vector<uint32_t>& fetch(); static const std::vector<uint32_t>& fetch();
// TODO: remove after test
static std::vector<uint32_t> data;
private: private:
struct generate_t { struct generate_t {
int n1; // number of `00` int n1; // number of `00`
@ -30,7 +27,7 @@ private:
static bool available; static bool available;
static std::mutex building; static std::mutex building;
// static std::vector<uint32_t> data; static std::vector<uint32_t> data;
static void build_data(); static void build_data();
static void generate(generate_t info); static void generate(generate_t info);

451
src/main.cc
View File

@ -8,263 +8,23 @@
#include "fast_cal.h" #include "fast_cal.h"
#include "analyse.h" #include "analyse.h"
#include "common.h" #include "common.h"
#include "offset/all_cases_offset.h"
//#include "core_demo.h"
//#include "basic_ranges_demo.h"
#include <set>
#include <thread> #include <thread>
#include <algorithm> #include <algorithm>
#include <unistd.h> #include <unistd.h>
//void get_status() {
// switch (BasicRanges::status()) {
// case BasicRanges::NO_INIT:
// std::cout << "basic ranges no init" << std::endl;
// break;
// case BasicRanges::BUILDING:
// std::cout << "basic ranges building" << std::endl;
// break;
// case BasicRanges::AVAILABLE:
// std::cout << "basic ranges available" << std::endl;
// break;
// }
//
// switch (AllCases::status()) {
// case AllCases::NO_INIT:
// std::cout << "all cases no init" << std::endl;
// break;
// case AllCases::BUILDING:
// std::cout << "all cases building" << std::endl;
// break;
// case AllCases::AVAILABLE:
// std::cout << "all cases available" << std::endl;
// break;
// }
//}
//void release(uint64_t code, uint64_t mask) {
// std::cout << RawCode(code).dump_case();
// std::cout << "~~~~~~~" << std::endl;
// for (int n = 0; n < 20; ++n, mask >>= 3) {
// std::cout << "+."[!(mask & 0b111)] << " \n"[!(~n & 0b11)];
// }
// std::cout << std::endl;
//}
//std::vector<uint64_t> all_cases;
//
//void short_code_verify(uint32_t start, uint32_t end) {
// for (uint32_t short_code = start; short_code < end; ++short_code) {
// auto common_code = all_cases[short_code]; // correct result
//
// if (ShortCode(short_code).to_common_code().unwrap() != common_code) {
// std::cout << "Error decode: " << ShortCode(short_code) << std::endl;
// }
//
// if (ShortCode(CommonCode(common_code)).unwrap() != short_code) {
// std::cout << "Error encode: " << ShortCode(short_code) << std::endl;
// }
// }
// std::cout << "[" << start << ", " << end << ")" << std::endl;
//}
//void raw_code_check_verify(uint64_t index) {
// uint64_t start = index * 0x100000000;
// uint64_t end = start + 0x100000000;
// for (uint64_t common_code = start; common_code < end; ++common_code) {
// if (RawCode::check(RawCode::extract(common_code)) != CommonCode::check(common_code)) {
// printf("Error -> %09lX\n", common_code);
// }
// }
// std::cout << "verify ok: " << std::hex << "[" << start << ", " << end << ")" << std::endl;
//}
int main() { int main() {
// AllCases::build(); BasicRanges::build();
//
// for (uint64_t head = 0; head < 16; ++head) {
// for (const auto &range : AllCases::fetch()[head]) {
// all_cases.emplace_back(head << 32 | range);
// }
// }
//
// ShortCode::speed_up(ShortCode::NORMAL);
// std::cout << "start verify" << std::endl;
//
// auto start_time = clock();
//
// std::thread tasks[16];
//
// for (int head = 0; head < 16; ++head) {
// uint32_t start = ALL_CASES_OFFSET[head];
// uint32_t end = start + AllCases::fetch()[head].size();
// tasks[head] = std::thread(short_code_verify, start, end);
// }
//
// for (auto &t : tasks) {
// t.join();
// }
//
// std::cout << "verify complete" << std::endl;
// return 0;
// printf("%p\n", BasicRanges::build);
// printf("%p\n", AllCases::build);
//
// printf("%p\n", BasicRanges::status);
// printf("%p\n", AllCases::status);
//
// printf("%p\n", BasicRanges::fetch);
// printf("%p\n", AllCases::fetch);
//
// get_status();
// BasicRanges::build();
// get_status();
// AllCases::build();
// get_status();
//
// std::cout << BasicRanges::fetch()->size() << std::endl;
//
// uint32_t sum = 0;
// for (auto const &all_case : *AllCases::fetch()) {
// sum += all_case.size();
// std::cout << " " << all_case.size() << std::endl;
// }
// std::cout << sum << std::endl;
//
// std::cout << AllCases::fetch() << std::endl;
// std::cout << AllCases::BasicRanges::fetch() << std::endl;
// std::cout << BasicRanges::fetch() << std::endl;
// std::cout << CommonCode::check(0x123456789) << std::endl;
// std::cout << CommonCode::check(0x4FEA13400) << std::endl;
//
// printf("%09lX\n", CommonCode("1A9bF0c0").unwrap());
// std::cout << CommonCode(0x1A9BF0C00).to_string() << std::endl;
// std::cout << CommonCode(0x1A9BF0C00).to_string(true) << std::endl;
//
// auto c = CommonCode("4Fea13400");
// std::cout << c.to_string(true) << std::endl;
// std::cout << c.to_string() << std::endl;
// printf("%09lX\n", c.unwrap());
// std::cout << ShortCode::check_mode() << std::endl;
//
// std::cout << "start NORMAL speed up" << std::endl;
// std::thread t1(ShortCode::speed_up, ShortCode::NORMAL);
// std::thread t2(ShortCode::speed_up, ShortCode::NORMAL);
// t1.join();
// t2.join();
// std::cout << "NORMAL speed up complete" << std::endl;
//
// std::cout << ShortCode::check_mode() << std::endl;
//
// std::cout << "start FAST speed up" << std::endl;
// std::thread t3(ShortCode::speed_up, ShortCode::FAST);
// std::thread t4(ShortCode::speed_up, ShortCode::FAST);
// t3.join();
// t4.join();
// std::cout << "FAST speed up complete" << std::endl;
//
// std::cout << ShortCode::check_mode() << std::endl;
// auto s = ShortCode(14323231);
//// auto s = ShortCode(14323231, ShortCode::NORMAL);
//// auto s = ShortCode(14323231, ShortCode::FAST);
// std::cout << s.unwrap() << std::endl;
// std::cout << s.to_string() << std::endl;
// std::cout << ShortCode("EP4HZ", ShortCode::NORMAL).unwrap() << std::endl;
// std::cout << ShortCode("eP4hZ", ShortCode::FAST).to_string() << std::endl;
// ShortCode::speed_up(ShortCode::FAST);
// std::cout << ShortCode(14323231).to_common_code().to_string() << std::endl;
// std::cout << ShortCode(CommonCode(0x6EC0F8800)).to_string() << std::endl;
//
//// ShortCode::speed_up(ShortCode::FAST);
// std::cout << ShortCode(14323231).to_common_code().to_string() << std::endl;
// std::cout << ShortCode(CommonCode(0x6EC0F8800)).to_string() << std::endl;
// std::cout << ShortCode(CommonCode(0x6EC0F8800), ShortCode::NORMAL).to_string() << std::endl;
// std::cout << ShortCode(CommonCode(0x6EC0F8800), ShortCode::FAST).to_string() << std::endl;
// std::cout << CommonCode(0x6EC0F8800).to_short_code().to_string() << std::endl;
// std::cout << CommonCode(ShortCode(14323231)).to_string() << std::endl;
// std::cout << ShortCode(14323231).to_common_code().to_string() << std::endl;
//
// std::cout << ShortCode(CommonCode(0x6EC0F8800)).to_string() << std::endl;
// std::cout << CommonCode(0x6EC0F8800).to_short_code().to_string() << std::endl;
// auto r = RawCode(0x0E58FC85FFEBC4DB);
// printf("%015lX\n", r.unwrap());
//
// std::cout << r.to_common_code().to_string() << std::endl;
// printf("%015lX\n", RawCode(CommonCode(0x4FEA13400)).unwrap());
// auto r = RawCode(0x0E58FC85FFEBC4DB);
// auto r = RawCode(0x0E58FC85FFEBC4DD); // invalid raw code -> only for test
// std::cout << r.dump_case() << std::endl;
// std::cout << CommonCode(RawCode(0x0E58FC85FFEBC4DB)).to_string() << std::endl;
// auto c = Core();
// auto raw_code = RawCode(CommonCode("4fea134")).unwrap();
// auto raw_code = RawCode(CommonCode("1A9bf0c")).unwrap();
// c.next_step(raw_code, release);
// std::vector<uint64_t> all_cases_raw;
// for (int head = 0; head < 16; ++head) {
// uint64_t prefix = (uint64_t)head << 32;
// for (auto const &range : (*AllCases::fetch())[head]) {
// all_cases_raw.emplace_back(
// RawCode(CommonCode::unsafe_create(prefix | range)).unwrap()
// );
// }
// }
// ShortCode::speed_up(ShortCode::FAST); // std::cout << "wait 3s" << std::endl;
// AllCases::build(); // sleep(3);
// BasicRanges::build();
// std::vector<uint64_t> all_cases; std::cout << "start benchmark" << std::endl;
// for (uint64_t head = 0; head < 16; ++head) { auto start_time = clock();
// for (const auto &range : AllCases::fetch()[head]) {
// all_cases.emplace_back(head << 32 | range);
// }
// }
// std::cout << "test data size: " << all_cases.size() << std::endl;
// auto raw_code = RawCode(CommonCode("4fea134")).unwrap(); AllCases::build();
// for (int i = 0; i < 100000000; ++i) {
// c.next_step(raw_code);
// }
// std::vector<uint32_t> steps;
// for (auto const &raw_code : all_cases_raw) {
// steps.emplace_back(c.next_step(raw_code));
// }
// std::sort(steps.begin(), steps.end());
// std::cout << steps[0] << std::endl;
// std::cout << steps[steps.size() - 1] << std::endl;
// for (int i = 0; i < all_cases_raw.size(); ++i) {
// if (steps[i] == 0) {
// if (steps[i] == 68) { // max next steps
// std::cout << RawCode(all_cases_raw[i]).dump_case();
// std::cout << CommonCode(RawCode(all_cases_raw[i])).to_string() << std::endl << std::endl;
// }
// }
// auto raw_code = CommonCode("1a9bf0c").to_raw_code().unwrap(); // auto raw_code = CommonCode("1a9bf0c").to_raw_code().unwrap();
// auto raw_code = CommonCode("A5D3AF0").to_raw_code().unwrap(); // auto raw_code = CommonCode("A5D3AF0").to_raw_code().unwrap();
@ -311,212 +71,15 @@ int main() {
// } // }
// BasicRanges::build();
// const auto &br = BasicRanges::fetch();
// br.push_back(123);
// std::cout << "size: " << BasicRanges::fetch().size() << std::endl;
// std::cout << "size: " << br.size() << std::endl;
// for (const auto &range : *BasicRanges::fetch()) {
// printf("%08X\n", range);
// }
// AllCases::build();
// for (auto head = 0; head < 16; ++head) {
// uint64_t prefix = (uint64_t)head << 32;
// for (const auto &range : AllCases::fetch()[head]) {
// printf("%09lX\n", prefix | range);
// }
// }
// for (uint32_t i = 1000000; i < 1010000; ++i) {
// ShortCode::tiny_decode(i);
// ShortCode::tiny_encode(all_cases[i]);
// }
// printf("%09lX\n", ShortCode::tiny_decode(14323231));
// std::cout << ShortCode::tiny_encode(0x6EC0F8800) << std::endl;
// std::cout << ShortCode(14323231).to_string() << std::endl;
// std::cout << ShortCode::from_string("EP4HZ").unwrap() << std::endl;
// std::cout << ShortCode("EP4HZ") << std::endl; // std::cout << ShortCode("EP4HZ") << std::endl;
// std::cout << ShortCode(14323231) << std::endl; // std::cout << ShortCode(14323231) << std::endl;
// printf("%09lX\n", ShortCode::fast_decode(14323231));
// std::cout << ShortCode::fast_encode(0x6EC0F8800) << std::endl;
// std::cout << sizeof(ShortCode) << std::endl;
// int sum = 0;
// for (uint64_t common_code = 0; common_code < 0x1000000000; ++common_code) {
// if (CommonCode::check(common_code)) {
// printf("%09lX\n", common_code);
// ++sum;
// }
// if (common_code % 0x10000000 == 0) {
// std::cerr << common_code / 0x10000000 << std::endl;
// }
// if (CommonCode::check(common_code) != CommonCode::check_demo(common_code)) {
// printf("%09lX\n", common_code);
// }
// }
// std::cout << "sum = " << sum << std::endl;
// std::cout << CommonCode::check_demo(0x4FEA13400) << std::endl;
// std::cout << CommonCode::check_demo(0x0000011CE) << std::endl;
// std::cout << CommonCode::check_demo(0x02ED67000) << std::endl;
// std::cout << CommonCode("1a9bf0C0").to_string() << std::endl;
// std::cout << CommonCode(0x4FEA13400).to_string() << std::endl;
// printf("%09lX\n", CommonCode::from_string("1a9bf0c").unwrap());
// std::cout << CommonCode("4feA134") << std::endl;
// std::vector<uint64_t> all_cases;
// for (uint64_t head = 0; head < 16; ++head) {
// for (const auto &range : AllCases::fetch()[head]) {
// all_cases.emplace_back(head << 32 | range);
// }
// }
// std::cout << "test size: " << all_cases.size() << std::endl;
//
// for (const auto &common_code : all_cases) {
// if (RawCode::compact(RawCode::extract(common_code)) != common_code) {
// std::cout << "Error: " << CommonCode(common_code) << std::endl;
// }
// }
// std::cout << CommonCode(RawCode(RawCode::extract(0x4FEA13400))) << std::endl;
// std::cout << CommonCode(0x4FEA13400).to_raw_code().to_common_code() << std::endl;
// std::cout << RawCode::check(CommonCode(0x4FEA13400).to_raw_code().unwrap()) << std::endl;
// for (const auto &common_code : all_cases) {
// if (!RawCode::check(RawCode::extract(common_code))) {
// std::cout << "Error: " << CommonCode(common_code) << std::endl;
// }
// }
// for (uint64_t common_code = 0; common_code < 0x100000000; ++common_code) {
// for (uint64_t common_code = 0x555A4000; common_code < 0x100000000; ++common_code) {
// if (RawCode::check(RawCode::extract(common_code)) != CommonCode::check(common_code)) {
// printf("%09lX\n", common_code);
// }
// if (common_code % 0x1000000 == 0) {
// std::cout << (common_code / 0x1000000) << std::endl;
// }
// }
// std::thread tasks[16];
// std::cout << "verify start" << std::endl;
// for (int i = 0; i < 16; ++i) {
// tasks[i] = std::thread(raw_code_check_verify, i);
// }
// for (auto &t : tasks) {
// t.join();
// }
// std::cout << "verify complete" << std::endl;
// TODO: why 0x555a4001 broken extract function?
// std::cout << RawCode(RawCode::extract(0x00000FEC4)).dump_case() << std::endl;
// std::cout << RawCode(RawCode::extract(0x000055480)).dump_case() << std::endl;
// std::cout << RawCode(RawCode::extract(0x0000FF004)).dump_case() << std::endl;
// std::cout << RawCode::extract(0x555a4001) << std::endl;
// std::cout << RawCode::create(CommonCode(0x4FEA13400).to_raw_code().unwrap()) << std::endl;
// AllCases::build();
//
// std::set<uint32_t> used_ranges;
// for (const auto &ranges : AllCases::fetch()) {
// for (const auto &range : ranges) {
// used_ranges.emplace(Common::range_reverse(range));
// used_ranges.emplace(range);
// }
// }
// std::cout << "used number: " << used_ranges.size() << std::endl;
//
// auto basic_ranges = BasicRanges::fetch();
// for (auto &range : basic_ranges) {
// range = Common::range_reverse(range);
// }
// int deep = 16;
// int deep = 6;
// std::cout << "check deep -> " << deep << "-bits" << std::endl;
// std::vector<std::vector<uint32_t> > data(1 << deep);
// for (auto &range : basic_ranges) {
// data[range >> (32 - deep)].emplace_back(range);
// }
//
// int sum = 0;
// for (uint32_t i = 0; i < data.size(); ++i) {
// auto &dat = data[i];
//
// int num = 0;
// for (auto &range : dat) {
// if (used_ranges.find(range) == used_ranges.end()) {
// ++num;
// }
// }
// printf("%02X: %d/%zu\n", i, num, dat.size());
// if (num == dat.size()) {
// printf("%02X -> %d\n", i, num);
// sum += num;
// }
//
// }
// std::cout << "sum = " << sum << std::endl;
// for (const auto &range : BasicRanges::fetch()) {
// if (used_ranges.find(range) == used_ranges.end()) {
// printf("%08X -> no\n", Common::range_reverse(range)); // never used
// } else {
// printf("%08X -> yes\n", Common::range_reverse(range));
// }
// }
// BasicRanges::build();
// BasicRanges::data.clear();
// for (const auto &range : used_ranges) {
// BasicRanges::data.emplace_back(Common::range_reverse(range));
// }
// std::sort(BasicRanges::data.begin(), BasicRanges::data.end());
// for (auto &range : BasicRanges::data) {
// range = Common::range_reverse(range);
// }
// std::cout << "basic ranges size: " << BasicRanges::data.size() << std::endl;
// for (auto &a : AllCases::data) {
// a.clear(); // clear built data
// }
// AllCases::available = false;
//
// std::cout << "wait 3s" << std::endl;
// sleep(3);
BasicRanges::build();
std::cout << "start benchmark" << std::endl;
auto start_time = clock();
AllCases::build();
// uint32_t sum = 0;
// for (const auto &a : AllCases::fetch()) {
// sum += a.size();
// }
// std::cout << "sum = " << sum << std::endl;
// std::cerr << (clock() - start_time) / CLOCKS_PER_SEC << "s" << std::endl; // 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) * 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; // std::cout << "complete benchmark" << std::endl;
// pause(); // pause();

33
src/utils/common.cc
View File

@ -45,36 +45,3 @@ uint8_t Common::check_range(uint32_t head, uint32_t range) { // check generated
} }
return 0; // pass check return 0; // pass check
} }
// TODO: remove after benchmark
bool Common::check_case(uint32_t head, uint32_t range) { // whether the head and range is valid
uint32_t mask = 0b110011 << head; // fill 2x2 block
for (int addr = 0; range; range >>= 2) { // traverse every 2-bits
while (mask >> addr & 0b1) {
++addr; // search next not filled block
}
switch (range & 0b11) {
case 0b00: // space block
case 0b11: // 1x1 block
if (addr > 19) { // invalid address
return false;
}
mask |= 0b1 << addr; // fill 1x1 block
break;
case 0b10: // 2x1 block
if (addr > 15 || mask >> (addr + 4) & 0b1) { // invalid address
return false;
}
mask |= 0b10001 << addr; // fill 2x1 block
break;
case 0b01: // 1x2 block
if (addr > 18 || (addr & 0b11) == 0b11 || mask >> (addr + 1) & 0b1) { // invalid address
return false;
}
mask |= 0b11 << addr; // fill 1x2 block
break;
}
}
return true; // valid case
}

4
src/utils/common.h
View File

@ -42,9 +42,7 @@
class Common { class Common {
public: public:
static uint32_t range_reverse(uint32_t bin); static uint32_t range_reverse(uint32_t bin);
// static bool check_case(uint32_t head, uint32_t range);
// TODO: remove this function
static bool check_case(uint32_t head, uint32_t range);
// TODO: with broken block offset return // TODO: with broken block offset return
static uint8_t check_range(uint32_t head, uint32_t range); static uint8_t check_range(uint32_t head, uint32_t range);

Write Preview
Loading…
Cancel
Save