diff options
| author | Elizabeth Hunt <elizabeth.hunt@simponic.xyz> | 2023-10-11 14:09:59 -0600 |
|---|---|---|
| committer | Elizabeth Hunt <elizabeth.hunt@simponic.xyz> | 2023-10-11 14:09:59 -0600 |
| commit | faaef032d866f956665653e58086af9872c3c093 (patch) | |
| tree | a3eb7311af47755c8ad50e7d8e0af4d892c5c200 /inc | |
| parent | 1ce75ab5fe461ddd3823403754f5b4c543016abc (diff) | |
| download | cmath-faaef032d866f956665653e58086af9872c3c093.tar.gz cmath-faaef032d866f956665653e58086af9872c3c093.zip | |
matrices
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/lizfcm.h | 3 | ||||
| -rw-r--r-- | inc/macros.h | 28 | ||||
| -rw-r--r-- | inc/types.h | 6 |
3 files changed, 30 insertions, 7 deletions
diff --git a/inc/lizfcm.h b/inc/lizfcm.h index b390394..2dc9e42 100644 --- a/inc/lizfcm.h +++ b/inc/lizfcm.h @@ -25,6 +25,9 @@ extern double linf_distance(Array_double *v1, Array_double *v2); extern void format_vector_into(Array_double *v, char *s); +extern void format_matrix_into(Matrix_double *m, char *s); +extern void put_identity_diagonal(Matrix_double *m); + extern Line *least_squares_lin_reg(Array_double *x, Array_double *y); #endif // LIZFCM_H diff --git a/inc/macros.h b/inc/macros.h index 841084d..f6e531e 100644 --- a/inc/macros.h +++ b/inc/macros.h @@ -11,15 +11,20 @@ size_t size; \ } Array_##TYPE +#define DEFINE_MATRIX(TYPE) \ + typedef struct { \ + Array_##TYPE **data; \ + size_t cols; \ + size_t rows; \ + } Matrix_##TYPE + #define InitArray(TYPE, ...) \ ({ \ TYPE temp[] = __VA_ARGS__; \ Array_##TYPE *arr = malloc(sizeof(Array_##TYPE)); \ arr->size = sizeof(temp) / sizeof(temp[0]); \ arr->data = malloc(arr->size * sizeof(TYPE)); \ - if (arr->data) { \ - memcpy(arr->data, temp, arr->size * sizeof(TYPE)); \ - } \ + memcpy(arr->data, temp, arr->size * sizeof(TYPE)); \ arr; \ }) @@ -28,13 +33,22 @@ Array_##TYPE *arr = malloc(sizeof(Array_##TYPE)); \ arr->size = SIZE; \ arr->data = malloc(arr->size * sizeof(TYPE)); \ - if (arr->data) { \ - for (size_t i = 0; i < arr->size; i++) \ - arr->data[i] = INIT_VALUE; \ - } \ + for (size_t i = 0; i < arr->size; i++) \ + arr->data[i] = INIT_VALUE; \ arr; \ }) +#define InitMatrixWithSize(TYPE, ROWS, COLS, INIT_VALUE) \ + ({ \ + Matrix_##TYPE *matrix = malloc(sizeof(Matrix_##TYPE)); \ + matrix->rows = ROWS; \ + matrix->cols = COLS; \ + matrix->data = malloc(matrix->rows * sizeof(Array_##TYPE *)); \ + for (size_t y = 0; y < matrix->rows; y++) \ + matrix->data[y] = InitArrayWithSize(TYPE, COLS, INIT_VALUE); \ + matrix; \ + }) + #define c_max(x, y) (((x) >= (y)) ? (x) : (y)) #define c_min(x, y) (((x) <= (y)) ? (x) : (y)) diff --git a/inc/types.h b/inc/types.h index 4af17db..6df04c2 100644 --- a/inc/types.h +++ b/inc/types.h @@ -10,6 +10,12 @@ DEFINE_ARRAY(int32_t); DEFINE_ARRAY(float); DEFINE_ARRAY(double); +DEFINE_MATRIX(int); +DEFINE_MATRIX(uint32_t); +DEFINE_MATRIX(int32_t); +DEFINE_MATRIX(float); +DEFINE_MATRIX(double); + typedef struct Line { double m; double a; |