diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/matrix.c | 62 | ||||
-rw-r--r-- | src/vector.c | 23 |
2 files changed, 82 insertions, 3 deletions
diff --git a/src/matrix.c b/src/matrix.c index 115e0a3..a23aad4 100644 --- a/src/matrix.c +++ b/src/matrix.c @@ -9,14 +9,74 @@ void put_identity_diagonal(Matrix_double *m) { m->data[y]->data[y] = 1.0; } +Matrix_double *copy_matrix(Matrix_double *m) { + Matrix_double *copy = InitMatrixWithSize(double, m->rows, m->cols, 0.0); + for (size_t y = 0; y < copy->rows; y++) { + free_vector(copy->data[y]); + copy->data[y] = copy_vector(m->data[y]); + } + return copy; +} + +Matrix_double **put_lu_decomp(Matrix_double *m) { + assert(m->cols == m->rows); + + Matrix_double *u = copy_matrix(m); + Matrix_double *l = InitMatrixWithSize(double, m->rows, m->cols, 0.0); + put_identity_diagonal(l); + + Matrix_double **u_l = malloc(sizeof(Matrix_double *) * 2); + + for (size_t y = 0; y < m->rows; y++) { + if (u->data[y]->data[y] == 0) { + printf("ERROR: a pivot is zero in given matrix\n"); + exit(-1); + } + } + + if (u && l) { + for (size_t x = 0; x < m->cols; x++) { + for (size_t y = x + 1; y < m->rows; y++) { + double denom = u->data[x]->data[x]; + + if (denom == 0) { + printf("ERROR: non-factorable matrix\n"); + exit(-1); + } + + double factor = -(u->data[y]->data[x] / denom); + + Array_double *scaled = scale_v(u->data[x], factor); + Array_double *added = add_v(scaled, u->data[y]); + free_vector(scaled); + free_vector(u->data[y]); + + u->data[y] = added; + l->data[y]->data[x] = -factor; + } + } + } + + u_l[0] = u; + u_l[1] = l; + return u_l; +} + +void free_matrix(Matrix_double *m) { + for (size_t y = 0; y < m->rows; ++y) + free_vector(m->data[y]); + free(m); +} + void format_matrix_into(Matrix_double *m, char *s) { sprintf(s, ""); if (m->rows == 0) sprintf(s, "empty"); for (size_t y = 0; y < m->rows; ++y) { - char row_s[256]; + char *row_s = malloc(sizeof(char) * 256); format_vector_into(m->data[y], row_s); sprintf(s, "%s %s \n", s, row_s); + free(row_s); } } diff --git a/src/vector.c b/src/vector.c index 61692e1..e6e2544 100644 --- a/src/vector.c +++ b/src/vector.c @@ -41,12 +41,19 @@ double sum_v(Array_double *v) { return sum; } +Array_double *scale_v(Array_double *v, double m) { + Array_double *copy = copy_vector(v); + for (size_t i = 0; i < v->size; i++) + copy->data[i] *= m; + return copy; +} + Array_double *add_v(Array_double *v1, Array_double *v2) { assert(v1->size == v2->size); - Array_double *sum = InitArrayWithSize(double, v1->size, 0); + Array_double *sum = copy_vector(v1); for (size_t i = 0; i < v1->size; i++) - sum->data[i] = v1->data[i] + v2->data[i]; + sum->data[i] += v2->data[i]; return sum; } @@ -80,6 +87,18 @@ double linf_distance(Array_double *v1, Array_double *v2) { return dist; } +Array_double *copy_vector(Array_double *v) { + Array_double *copy = InitArrayWithSize(double, v->size, 0.0); + for (size_t i = 0; i < copy->size; ++i) + copy->data[i] = v->data[i]; + return copy; +} + +void free_vector(Array_double *v) { + free(v->data); + free(v); +} + void format_vector_into(Array_double *v, char *s) { sprintf(s, ""); if (v->size == 0) |