From 08c59bb54f13d4caf5323fc9e659157c254b921f Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sun, 25 Aug 2024 16:33:30 +0200 Subject: [PATCH] fixed eastsig and westsig being initialized in reversed + config fixes --- Makefile | 2 +- bin/back | Bin 102144 -> 102168 bytes src/generation.c | 11 +++++++---- templates.txt | 8 ++++---- templates_lv2.txt | 47 ++++++++++++++++++++++++++++++++++++---------- 5 files changed, 49 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index f410968..65a02d8 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ test0: bin/back bin/back templates.txt 47 test1: bin/back - bin/back templates_lv2.txt 49 + bin/back templates_lv2.txt 52 bin/back: obj/main.o obj/generation.o obj/display.o obj/base.o obj/hash.o obj/move.o mkdir -p bin diff --git a/bin/back b/bin/back index f25716c0f00929d8f86d37ac4f9ef6b609bb111e..594527e33be893dbfa235f5deb412eadba3e1e7f 100755 GIT binary patch delta 9192 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 NQq^nuBfE(D{{gVHo4Ei0 delta 9018 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 bLVCdAfRwZva8)Yg;4kgwz@!JOS*QO6ScqDU diff --git a/src/generation.c b/src/generation.c index 9cdd6a4..dd7ba3c 100644 --- a/src/generation.c +++ b/src/generation.c @@ -252,11 +252,13 @@ void parse_one(FILE* ptr, FILE* ptr2, int index) { configs[index].lines[i] += xres ; if(j == 7) { - configs[index].westsig *= 2; - configs[index].westsig += xres; + //configs[index].westsig *= 2; + //configs[index].westsig += xres; + configs[index].westsig += pw(2, i) * xres ; } else if(j == 0) { - configs[index].eastsig *= 2; - configs[index].eastsig += xres; + //configs[index].eastsig *= 2; + //configs[index].eastsig += xres; + configs[index].eastsig += pw(2, i) * xres ; } } }; @@ -266,6 +268,7 @@ void parse_one(FILE* ptr, FILE* ptr2, int index) { printf("-----| Template %d (line %d) |-----\n", index, 9*index); print_template(index); + printf("sigs : (%d, %d, %d, %d) (N, E, S, W)\n", configs[index].lines[0], configs[index].eastsig, configs[index].lines[7], configs[index].westsig); printf("\n"); } diff --git a/templates.txt b/templates.txt index 503453b..73a0088 100644 --- a/templates.txt +++ b/templates.txt @@ -1,9 +1,9 @@ 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 1 -1 0 0 0 0 0 0 1 -1 0 0 0 0 0 0 1 -1 0 0 0 0 0 0 1 -1 0 0 0 0 0 0 1 +1 0 1 1 1 1 0 1 +1 0 1 0 0 1 0 1 +1 0 1 0 0 1 0 1 +1 0 1 1 1 1 0 1 1 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 diff --git a/templates_lv2.txt b/templates_lv2.txt index ab1a6b9..a5f22d8 100644 --- a/templates_lv2.txt +++ b/templates_lv2.txt @@ -1,11 +1,11 @@ -1 1 1 1 1 1 1 1 -1 0 0 0 0 0 0 1 1 0 1 1 1 1 0 1 -1 0 1 0 0 1 0 1 -1 0 1 0 0 1 0 1 -1 0 1 1 1 1 0 1 -1 0 0 0 0 0 0 1 +0 1 1 1 1 1 1 0 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +0 1 1 1 1 1 1 0 +1 0 1 1 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 @@ -16,14 +16,14 @@ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -1 0 1 1 1 1 0 1 +1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 +1 1 1 0 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 0 0 1 1 1 -1 1 1 0 0 1 1 1 -1 1 1 0 0 1 1 1 +1 1 1 1 0 1 1 1 0 0 0 0 0 0 0 0 -1 0 1 1 1 1 0 1 +1 1 1 1 1 1 1 1 1 0 1 1 1 1 1 1 0 0 1 1 1 1 1 1 @@ -439,4 +439,31 @@ 0 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +0 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +0 0 0 0 0 0 0 1 +1 1 1 1 1 1 1 1 + +1 1 1 1 1 1 1 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +0 0 0 0 0 0 0 1 +1 1 1 1 1 1 1 1 + +1 1 1 1 1 1 1 1 +0 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 0 0 0 0 0 0 1 +1 1 1 1 1 1 1 1 + $ \ No newline at end of file