tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[math] Matrix scalar arithmetic functions

Browse Source
This commit is contained in:
Al
2016-01-08 00:44:33 -05:00
parent b6ce94166b
commit 31a3a2a3fa
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/matrix.c
View File

@@ -73,16 +73,35 @@ inline void matrix_set(matrix_t *self, double value) {
} }
inline void matrix_set_row(matrix_t *self, size_t index, double *row) { inline void matrix_set_row(matrix_t *self, size_t index, double *row) {
size_t offset = index * self->m; size_t offset = index * self->n;
double *values = self->values; double *values = self->values;
size_t n = self->n; size_t n = self->n;
memcpy(values + offset, row, n * sizeof(double)); memcpy(values + offset, row, n * sizeof(double));
} }
inline void matrix_set_scalar(matrix_t *self, size_t row_index, size_t col_index, double value) { inline void matrix_set_scalar(matrix_t *self, size_t row_index, size_t col_index, double value) {
size_t offset = row_index * self->m + col_index; size_t offset = row_index * self->n + col_index;
double *values = self->values; self->values[offset] = value;
values[offset] = value; }
inline void matrix_add_scalar(matrix_t *self, size_t row_index, size_t col_index, double value) {
size_t offset = row_index * self->n + col_index;
self->values[offset] += value;
}
inline void matrix_sub_scalar(matrix_t *self, size_t row_index, size_t col_index, double value) {
size_t offset = row_index * self->n + col_index;
self->values[offset] -= value;
}
inline void matrix_mul_scalar(matrix_t *self, size_t row_index, size_t col_index, double value) {
size_t offset = row_index * self->n + col_index;
self->values[offset] *= value;
}
inline void matrix_div_scalar(matrix_t *self, size_t row_index, size_t col_index, double value) {
size_t offset = row_index * self->n + col_index;
self->values[offset] /= value;
} }
inline double matrix_get(matrix_t *self, size_t row_index, size_t col_index) { inline double matrix_get(matrix_t *self, size_t row_index, size_t col_index) {
@@ -155,7 +174,7 @@ void matrix_dot_vector(matrix_t *self, double *vec, double *result) {
} }
} }
bool matrix_dot_matrix(matrix_t *m1, matrix_t *m2, matrix_t *result) { inline bool matrix_dot_matrix(matrix_t *m1, matrix_t *m2, matrix_t *result) {
if (m1->n != m2->m || m1->m != result->m || m2->n != result->n) { if (m1->n != m2->m || m1->m != result->m || m2->n != result->n) {
return false; return false;
} }

4
src/matrix.h
View File

@@ -30,6 +30,10 @@ void matrix_set(matrix_t *self, double value);
void matrix_zero(matrix_t *self); void matrix_zero(matrix_t *self);
void matrix_set_row(matrix_t *self, size_t index, double *row); void matrix_set_row(matrix_t *self, size_t index, double *row);
void matrix_set_scalar(matrix_t *self, size_t row_index, size_t col_index, double value); void matrix_set_scalar(matrix_t *self, size_t row_index, size_t col_index, double value);
void matrix_add_scalar(matrix_t *self, size_t row_index, size_t col_index, double value);
void matrix_sub_scalar(matrix_t *self, size_t row_index, size_t col_index, double value);
void matrix_mul_scalar(matrix_t *self, size_t row_index, size_t col_index, double value);
void matrix_div_scalar(matrix_t *self, size_t row_index, size_t col_index, double value);
double matrix_get(matrix_t *self, size_t row_index, size_t col_index); double matrix_get(matrix_t *self, size_t row_index, size_t col_index);
double *matrix_get_row(matrix_t *self, size_t row_index); double *matrix_get_row(matrix_t *self, size_t row_index);