Added board library to decrease size of boardmaps

Only allocate two maps, instead of another per generation

4 files changed, 165 insertions, 1 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b216bf..47d993f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,13 @@
 # Makefile stuff
 include_directories(.)
-add_executable(life life.c life.h updatemap.c updatemap.h menus.c menus.h)
+add_library(board board.c board.h)
+target_compile_features(board PUBLIC c_function_prototypes)
+if (UNIX)
+# target_link_libraries(board m)
+endif()
+add_executable(life life.c life.h board updatemap.c updatemap.h menus.c menus.h)
+add_executable(test_board test_board.c board)
 target_compile_features(life PUBLIC c_function_prototypes c_variadic_macros)
+target_compile_features(test_board PRIVATE c_std_99)
 target_include_directories(life PRIVATE "${CURSES_INCLUDE_DIRS}")
 target_link_libraries(life "${CURSES_LIBRARIES}")
diff --git a/src/board.c b/src/board.c
new file mode 100644
index 0000000..c22aa0d
--- /dev/null
+++ b/src/board.c
@@ -0,0 +1,113 @@
+#include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "board.h"
+
+struct BOARD {
+        unsigned int* arr;
+        unsigned int arr_size;
+        unsigned int w;
+        unsigned int h;
+};
+
+BOARD newboard(unsigned int w, unsigned int h) {
+        BOARD ret = (BOARD) malloc(sizeof(struct BOARD));
+        ret->w = w;
+        ret->h = h;
+        // (a / b) + ((a % b) != 0)
+        unsigned int bits = sizeof(unsigned int) * 8;
+        ret->arr_size = w * h / bits + ((w * h) % bits != 0);
+        ret->arr = ( unsigned int*) calloc(ret->arr_size, sizeof(unsigned int));
+        return ret;
+}
+
+BOARD dupboard (BOARD old) {
+        BOARD ret = (BOARD) malloc(sizeof(struct BOARD));
+        ret->w = old->w;
+        ret->h = old->h;
+        ret->arr_size = old->arr_size;
+        ret->arr = ( unsigned int*) calloc(old->arr_size, sizeof(unsigned int));
+        memcpy(ret->arr, old->arr, old->arr_size * sizeof(*old->arr));
+        return ret;
+}
+
+// Copy boards of the same size
+// For boards of differing sizes, just use dupboard
+BOARD cpyboard (BOARD dest, BOARD src) {
+        assert(dest != NULL && dest->arr != NULL);
+        assert(src != NULL && src->arr != NULL);
+        memcpy(dest->arr, src->arr, src->arr_size * sizeof(*src->arr));
+        return dest;
+}
+
+void delboard(BOARD b) {
+        free(b->arr);
+        free(b);
+}
+
+unsigned int board_getval(BOARD b, unsigned int x, unsigned int y) {
+        assert(("board_getval out of bounds", x < b->w && y < b->h));
+        unsigned int n = b->w * y + x;
+        return (b->arr[n / sizeof(unsigned int) / 8] >> (n % (sizeof(unsigned int) * 8))) & 1;
+}
+
+unsigned int board_setval(BOARD b, unsigned int x, unsigned int y, unsigned int val) {
+        assert(("board_setval out of bounds", x < b->w && y < b->h));
+        unsigned int n = b->w * y + x;
+        unsigned int retval = (b->arr[n / sizeof(unsigned int) / 8] >> (n % (sizeof(unsigned int) * 8))) & 1;
+        unsigned int pos = n % (sizeof(unsigned int) * 8);
+        switch (val) {
+        case 0:
+                b->arr[n / sizeof(unsigned int) / 8] &= ~(( unsigned int) (1 << pos));
+                break;
+        case 1:
+        default:
+                b->arr[n / sizeof(unsigned int) / 8] |= 1 << pos;
+                break;
+        }
+        return retval;
+}
+unsigned int board_flip(BOARD b, unsigned int x, unsigned int y) {
+        assert(("board_flip out of bounds", x < b->w && y < b->h));
+        unsigned int n = b->w * y + x;
+        unsigned int retval = (b->arr[n / sizeof(unsigned int) / 8] >> (n % (sizeof(unsigned int) * 8))) & 1;
+        unsigned int pos = n % (sizeof(unsigned int) * 8);
+        b->arr[n / sizeof(unsigned int) / 8] ^= 1 << pos;
+        return retval;
+}
+
+unsigned int board_getval_i(BOARD b, unsigned int i) {
+        assert(("board_getval_i out of bounds", i < b->w * b->h));
+        return (b->arr[i / sizeof(unsigned int) / 8] >> (i % (sizeof(unsigned int) * 8))) & 1;
+}
+
+unsigned int board_setval_i(BOARD b, unsigned int i, unsigned int val) {
+        assert(("board_setval_i out of bounds", i < b->w * b->h));
+        unsigned int retval = (b->arr[i / sizeof(unsigned int) / 8] >> (i % (sizeof(unsigned int) * 8))) & 1;
+        unsigned int pos = i % (sizeof(unsigned int) * 8);
+        switch (val) {
+        case 0:
+                b->arr[i / sizeof(unsigned int) / 8] &= ~(( unsigned int) (1 << pos));
+                break;
+        case 1:
+        default:
+                b->arr[i / sizeof(unsigned int) / 8] |= 1 << pos;
+                break;
+        }
+        return retval;
+}
+
+unsigned int board_flip_i(BOARD b, unsigned int i) {
+        assert(("board_flip_i out of bounds", i < b->w * b->h));
+        unsigned int retval = (b->arr[i / sizeof(unsigned int) / 8] >> (i % (sizeof(unsigned int) * 8))) & 1;
+        unsigned int pos = i % (sizeof(unsigned int) * 8);
+        b->arr[i / sizeof(unsigned int) / 8] ^= 1 << pos;
+        return retval;
+}
+
+void board_setall(BOARD b, unsigned int val) {
+        assert(b != NULL);
+        memset(b->arr, val == 0 ? 0 : 1, b->arr_size * sizeof(*b->arr));
+}
\ No newline at end of file
diff --git a/src/board.h b/src/board.h
new file mode 100644
index 0000000..3b25c88
--- /dev/null
+++ b/src/board.h
@@ -0,0 +1,23 @@
+#ifndef LIFE_BOARD_H_
+#define LIFE_BOARD_H_
+// Everything assumes there are 8 bits per byte
+
+struct BOARD;
+typedef struct BOARD* BOARD;
+
+BOARD newboard(unsigned int w, unsigned int h);
+BOARD dupboard(BOARD old);
+BOARD cpyboard(BOARD dest, BOARD src);
+void delboard(BOARD b);
+unsigned int board_getval(BOARD b, unsigned int x, unsigned int y);
+unsigned int board_setval(BOARD b, unsigned int x, unsigned int y, unsigned int val);
+unsigned int board_flip (BOARD b, unsigned int x, unsigned int y);
+
+// Variant of the regular functions which takes i instead of (x, y)
+unsigned int board_getval_i(BOARD b, unsigned int i);
+unsigned int board_setval_i(BOARD b, unsigned int i, unsigned int val);
+unsigned int board_flip_i(BOARD b, unsigned int i);
+
+void board_setall(BOARD b, unsigned int val);
+
+#endif // LIFE_BOARD_H_
\ No newline at end of file
diff --git a/src/test_board.c b/src/test_board.c
new file mode 100644
index 0000000..e9a75bd
--- /dev/null
+++ b/src/test_board.c
@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include "board.h"
+
+int main () {
+        printf("sizeof(unsigned int): %d\n", sizeof(unsigned int));
+        BOARD jim = newboard(10, 10);
+        for (unsigned int y = 0; y < 10; ++y) {
+                for (unsigned int x = 0; x < 10; ++x)
+                        putchar(board_getval(jim, x, y) == 0 ? '.' : '#');
+                putchar('\n');
+        }
+        board_setval(jim, 0, 3, 1);
+        board_setval(jim, 4, 5, 1);
+        for (unsigned int y = 0; y < 10; ++y) {
+                for (unsigned int x = 0; x < 10; ++x)
+                        putchar(board_getval(jim, x, y) == 0 ? '.' : '#');
+                putchar('\n');
+        }
+        delboard(jim);
+        return 0;
+}
\ No newline at end of file