rawalcher/c-net
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/Development' into Development

Browse source
This commit is contained in:
Jakob Stornig 2023-09-21 10:19:35 +02:00
commit 8503687826
5 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
matrix.c
View file

@ -249,7 +249,6 @@ Matrix* transpose(Matrix* matrix) {
}
//file operations
void matrix_save(Matrix* matrix, char* file_string){
// open the file in append mode
@ -277,38 +276,40 @@ void matrix_save(Matrix* matrix, char* file_string){
}
Matrix* matrix_load(char* file_string){
FILE *fptr = fopen(file_string, "r");
if(!fptr){
printf("Could not open \"%s\"", file_string);
exit(1);
}
Matrix * m = load_next_matrix(fptr);
fclose(fptr);
return m;
}
Matrix * load_next_matrix(FILE *fptr){
Matrix* load_next_matrix(FILE *save_file){
char buffer[MAX_BYTES];
fgets(buffer, MAX_BYTES, fptr);
fgets(buffer, MAX_BYTES, save_file);
int rows = (int)strtol(buffer, NULL, 10);
fgets(buffer, MAX_BYTES, fptr);
fgets(buffer, MAX_BYTES, save_file);
int cols = (int)strtol(buffer, NULL, 10);
Matrix *matrix = matrix_create(rows, cols);
for(int i = 0; i < rows; i++){
for(int j = 0; j < cols; j++){
fgets(buffer, MAX_BYTES, fptr);
fgets(buffer, MAX_BYTES, save_file);
matrix->numbers[i][j] = strtod(buffer, NULL);
}
}
return matrix;
}
Matrix* matrix_flatten(Matrix* matrix, int axis) {
// Axis = 0 -> Column Vector, Axis = 1 -> Row Vector
Matrix* result_matrix;
@ -332,8 +333,6 @@ Matrix* matrix_flatten(Matrix* matrix, int axis) {
return result_matrix;
}
int matrix_argmax(Matrix* matrix) {
// Expects a Mx1 matrix
if (matrix->columns != 1){