From b5b6c6fb899b576e463bb826b32ff20fbb0a0947 Mon Sep 17 00:00:00 2001 From: Dnomd343 Date: Tue, 10 Jan 2023 21:25:27 +0800 Subject: [PATCH] feat: 2x2 block move in core --- src/core_demo.cc | 53 ++++++++++++++++++++++++++++++++++++----- src/core_demo.h | 6 ++--- src/raw_code/raw_code.h | 2 ++ 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/src/core_demo.cc b/src/core_demo.cc index 65a16bc..bdbbd44 100644 --- a/src/core_demo.cc +++ b/src/core_demo.cc @@ -5,7 +5,7 @@ int cache_size; cache_t cache[16]; -#define release_1x1(filter_dir) {\ +#define release_1x1(filter_dir) { \ cache_t next_case = { \ .code = code & ~(F_1x1 << addr) | (C_1x1 << next_addr), \ .mask = (uint64_t)0b111 << next_addr, \ @@ -15,7 +15,7 @@ cache_t cache[16]; cache_insert(next_case); \ } -#define release_1x2(filter_dir) {\ +#define release_1x2(filter_dir) { \ cache_t next_case = { \ .code = code & ~(F_1x2 << addr) | (C_1x2 << next_addr), \ .mask = (uint64_t)0b111 << next_addr, \ @@ -25,7 +25,7 @@ cache_t cache[16]; cache_insert(next_case); \ } -#define release_2x1(filter_dir) {\ +#define release_2x1(filter_dir) { \ cache_t next_case = { \ .code = code & ~(F_2x1 << addr) | (C_2x1 << next_addr), \ .mask = (uint64_t)0b111 << next_addr, \ @@ -35,6 +35,16 @@ cache_t cache[16]; cache_insert(next_case); \ } +#define release_2x2(filter_dir) { \ + cache_t next_case = { \ + .code = code & ~(F_2x2 << addr) | (C_2x2 << next_addr), \ + .mask = (uint64_t)0b111 << next_addr, \ + .filter = filter_dir, \ + .addr = next_addr \ + }; \ + cache_insert(next_case); \ +} + inline bool cache_insert(cache_t &new_item) { auto *p = cache; for (; p < cache + cache_size; ++p) { @@ -132,6 +142,33 @@ void move_2x1(uint64_t code, int addr) { } +void move_2x2(uint64_t code, int addr) { + cache_size = 1; + cache[0].code = code; + cache[0].addr = addr; + cache[0].filter = 0; // filter unset + + int current = 0; + while (current != cache_size) { // start bfs search + code = cache[current].code; + addr = cache[current].addr; + int next_addr; // address after block moved + int filter = cache[current++].filter; // case filter + + if (filter != UP && addr >= 4 * 3 && !(code >> (next_addr = addr + UP) & F_1x2)) { + release_2x2(-UP); // 2x2 block move up + } + if (filter != DOWN && addr <= 10 * 3 && !(code >> (next_addr = addr + DOWN) & F_1x2_D)) { + release_2x2(-DOWN); // 2x2 block move down + } + if (filter != LEFT && (addr & 3) != 0 && !(code >> (next_addr = addr + LEFT) & F_2x1)) { + release_2x2(-LEFT); // 2x2 block move left + } + if (filter != RIGHT && (addr & 3) != 2 && !(code >> (next_addr = addr + RIGHT) & F_2x1_R)) { + release_2x2(-RIGHT); // 2x2 block move right + } + } +} void next_step(uint64_t raw_code, uint64_t mask) { @@ -144,9 +181,13 @@ void next_step(uint64_t raw_code, uint64_t mask) { // raw_code = RawCode(CommonCode("1003")).unwrap(); // move_1x1(raw_code, addr * 3); - int addr = 9; - raw_code = RawCode(CommonCode("1002")).unwrap(); - move_2x1(raw_code, addr * 3); +// int addr = 9; +// raw_code = RawCode(CommonCode("1002")).unwrap(); +// move_2x1(raw_code, addr * 3); + + int addr = 5; + raw_code = RawCode(CommonCode("5")).unwrap(); + move_2x2(raw_code, addr * 3); // std::cout << RawCode(raw_code).dump_case(); diff --git a/src/core_demo.h b/src/core_demo.h index f1cb74c..9078ecb 100644 --- a/src/core_demo.h +++ b/src/core_demo.h @@ -5,9 +5,9 @@ #define UP (-12) // -4 * 3-bits #define LEFT (-3) // +1 * 3-bits #define DOWN (+12) // +4 * 3-bits -#define DOWN_2 (+24) // +8 * 3-bits +//#define DOWN_2 (+24) // +8 * 3-bits #define RIGHT (+3) // +1 * 3-bits -#define RIGHT_2 (+6) // +2 * 3-bits +//#define RIGHT_2 (+6) // +2 * 3-bits struct cache_t { uint64_t code; // raw code @@ -16,6 +16,4 @@ struct cache_t { int addr; }; -//typedef uint64_t cache_t; - void next_step(uint64_t raw_code, uint64_t mask); diff --git a/src/raw_code/raw_code.h b/src/raw_code/raw_code.h index a795596..7272c31 100644 --- a/src/raw_code/raw_code.h +++ b/src/raw_code/raw_code.h @@ -22,6 +22,8 @@ #define F_1x1_R (uint64_t)0x38 // 111 000 #define F_1x1_D (uint64_t)0x7000 // 111 000 000 000 000 +#define F_2x1_R (uint64_t)0x38038 // 111 000 000 000 111 000 +#define F_1x2_D (uint64_t)0x3F000 // 111 111 000 000 000 000 class CommonCode;