generated from freudenreichan/info2Praktikum-NeuronalesNetz
Started bugfixing, V1
This commit is contained in:
parent
5d31d4e490
commit
0c19c17d68
18
matrix.c
18
matrix.c
@ -1,5 +1,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include "matrix.h"
|
||||
|
||||
// TODO Matrix-Funktionen implementieren
|
||||
@ -16,14 +17,14 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
|
||||
Matrix newMatrix;
|
||||
newMatrix.rows = rows;
|
||||
newMatrix.cols = cols;
|
||||
newMatrix.buffer = calloc(rows*cols, sizeof(MatrixType))
|
||||
newMatrix.buffer = calloc(rows*cols, sizeof(MatrixType));
|
||||
return newMatrix;
|
||||
}
|
||||
|
||||
void clearMatrix(Matrix *matrix)
|
||||
{
|
||||
free(*matrix.buffer);
|
||||
*matrix.buffer = NULL;
|
||||
free(matrix.buffer);
|
||||
matrix.buffer = NULL;
|
||||
}
|
||||
|
||||
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
|
||||
@ -54,7 +55,8 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
|
||||
Matrix MatrixErgebnis = createMatrix(matrix1.rows, matrix1.cols); //Creating Result Matrix
|
||||
if(matrix1.cols != matrix2.cols || matrix1.rows != matrix2.rows){
|
||||
printf("Matrix dimensions do not match\n"); //Error Message if dimensions of Input Matrixes are not identical
|
||||
MatrixErgebnis = clearMatrix(MatrixErgebnis);
|
||||
clearMatrix(MatrixErgebnis);
|
||||
MatrixErgebnis = NULL;
|
||||
return MatrixErgebnis;
|
||||
}
|
||||
else{
|
||||
@ -80,13 +82,13 @@ Matrix multiply(const Matrix matrix1, const Matrix matrix2)
|
||||
|
||||
result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
|
||||
|
||||
for(int i = 0; i < rows; i++) {
|
||||
for(int j = 0; j < cols; j++) {
|
||||
for(int i = 0; i < result.rows; i++) {
|
||||
for(int j = 0; j < result.cols; j++) {
|
||||
MatrixType value = 0;
|
||||
for(int k = 0; k < matrix1.cols; k++) {
|
||||
value += matrix1[i][k] * matrix2[k][j];
|
||||
value += matrix1.buffer[i][k] * matrix2.buffer[k][j];
|
||||
}
|
||||
result.buffer[i][i] = value;
|
||||
result.buffer[i][j] = value;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user