diff --git a/Notizen.c b/Notizen.c new file mode 100644 index 0000000..42f1576 --- /dev/null +++ b/Notizen.c @@ -0,0 +1,13 @@ +//neuralNetwork.c - BalckBox - Erkennung der Zahlen + + +//ImageInput.c - // TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei + // TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen + // TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt + +// Patric Viebcodet + +// matrix.c - // TODO Matrix-Funktionen implementieren - Sven die letzen 3, Felix die ersten 3 +// + +// \ No newline at end of file diff --git a/matrix.c b/matrix.c index ad00628..7e20f8b 100644 --- a/matrix.c +++ b/matrix.c @@ -6,30 +6,146 @@ Matrix createMatrix(unsigned int rows, unsigned int cols) { - + Matrix m; + + if (rows == 0 || cols == 0) + { + m.rows = 0; + m.cols = 0; + m.buffer = NULL; + return m; + } + + m.rows = rows; + m.cols = cols; + m.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType)); + + return m; } void clearMatrix(Matrix *matrix) { - + if (matrix != NULL) + { + if (matrix->buffer != NULL) + { + free(matrix->buffer); + matrix->buffer = NULL; + } + + matrix->rows = 0; + matrix->cols = 0; + } } void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) { - + if (matrix.buffer != NULL) + { + if (rowIdx < matrix.rows && colIdx < matrix.cols) + { + matrix.buffer[rowIdx * matrix.cols + colIdx] = value; + } + } } MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) { - + if (matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols) + { + return UNDEFINED_MATRIX_VALUE; + } + + return matrix.buffer[rowIdx * matrix.cols + colIdx]; } Matrix add(const Matrix matrix1, const Matrix matrix2) { - + Matrix result; + + if (matrix1.buffer == NULL || matrix2.buffer == NULL || matrix1.rows != matrix2.rows) + { + result.rows = 0; + result.cols = 0; + result.buffer = NULL; + return result; + } + + if (matrix1.cols == matrix2.cols) + { + result = createMatrix(matrix1.rows, matrix1.cols); + for (int i = 0; i < matrix1.rows; i++) + { + for (int j = 0; j < matrix1.cols; j++) + { + MatrixType value = getMatrixAt(matrix1, i, j) + getMatrixAt(matrix2, i, j); + setMatrixAt(value, result, i, j); + } + } + return result; + } + + if (matrix1.cols == 1 && matrix2.cols > 1) + { + result = createMatrix(matrix1.rows, matrix2.cols); + for (int i = 0; i < matrix1.rows; i++) + { + for (int j = 0; j < matrix2.cols; j++) + { + MatrixType value = getMatrixAt(matrix1, i, 0) + getMatrixAt(matrix2, i, j); + setMatrixAt(value, result, i, j); + } + } + return result; + } + else if (matrix2.cols == 1 && matrix1.cols > 1) + { + result = createMatrix(matrix1.rows, matrix1.cols); + for (int i = 0; i < matrix1.rows; i++) + { + for (int j = 0; j < matrix1.cols; j++) + { + MatrixType value = getMatrixAt(matrix1, i, j) + getMatrixAt(matrix2, i, 0); + setMatrixAt(value, result, i, j); + } + } + return result; + } + + //Fall: Unterschiedliche Spaltenanzahl, beide ungleich 1 + result.rows = 0; + result.cols = 0; + result.buffer = NULL; + return result; } Matrix multiply(const Matrix matrix1, const Matrix matrix2) { - -} \ No newline at end of file + Matrix result; + + if (matrix1.buffer == NULL || matrix2.buffer == NULL || matrix1.cols != matrix2.rows) + { + result.rows = 0; + result.cols = 0; + result.buffer = NULL; + return result; + } + + result = createMatrix(matrix1.rows, matrix2.cols); + + for (int i = 0; i < matrix1.rows; i++) + { + for (int j = 0; j < matrix2.cols; j++) + { + MatrixType sum = 0; + + for (int k = 0; k < matrix1.cols; k++) + { + sum += getMatrixAt(matrix1, i, k) * getMatrixAt(matrix2, k, j); + } + setMatrixAt(sum, result, i, j); + } + } + + return result; +} diff --git a/matrix.h b/matrix.h index cc640d1..96b0df6 100644 --- a/matrix.h +++ b/matrix.h @@ -1,13 +1,19 @@ + + #ifndef MATRIX_H #define MATRIX_H #define UNDEFINED_MATRIX_VALUE 0 - typedef float MatrixType; -// TODO Matrixtyp definieren - +// Definition des Matrix-Typs +typedef struct { + unsigned int rows; + unsigned int cols; + MatrixType *buffer; // dynamisch allokiertes Array +} Matrix; +// Funktionsdeklarationen Matrix createMatrix(unsigned int rows, unsigned int cols); void clearMatrix(Matrix *matrix); void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx); @@ -15,5 +21,4 @@ MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int co Matrix add(const Matrix matrix1, const Matrix matrix2); Matrix multiply(const Matrix matrix1, const Matrix matrix2); - -#endif +#endif \ No newline at end of file diff --git a/matrix_neu.c b/matrix_neu.c new file mode 100644 index 0000000..7e20f8b --- /dev/null +++ b/matrix_neu.c @@ -0,0 +1,151 @@ +#include +#include +#include "matrix.h" + +// TODO Matrix-Funktionen implementieren + +Matrix createMatrix(unsigned int rows, unsigned int cols) +{ + Matrix m; + + if (rows == 0 || cols == 0) + { + m.rows = 0; + m.cols = 0; + m.buffer = NULL; + return m; + } + + m.rows = rows; + m.cols = cols; + m.buffer = (MatrixType *)calloc(rows * cols, sizeof(MatrixType)); + + return m; +} + +void clearMatrix(Matrix *matrix) +{ + if (matrix != NULL) + { + if (matrix->buffer != NULL) + { + free(matrix->buffer); + matrix->buffer = NULL; + } + + matrix->rows = 0; + matrix->cols = 0; + } +} + +void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) +{ + if (matrix.buffer != NULL) + { + if (rowIdx < matrix.rows && colIdx < matrix.cols) + { + matrix.buffer[rowIdx * matrix.cols + colIdx] = value; + } + } +} + +MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) +{ + if (matrix.buffer == NULL || rowIdx >= matrix.rows || colIdx >= matrix.cols) + { + return UNDEFINED_MATRIX_VALUE; + } + + return matrix.buffer[rowIdx * matrix.cols + colIdx]; +} + +Matrix add(const Matrix matrix1, const Matrix matrix2) +{ + Matrix result; + + if (matrix1.buffer == NULL || matrix2.buffer == NULL || matrix1.rows != matrix2.rows) + { + result.rows = 0; + result.cols = 0; + result.buffer = NULL; + return result; + } + + if (matrix1.cols == matrix2.cols) + { + result = createMatrix(matrix1.rows, matrix1.cols); + for (int i = 0; i < matrix1.rows; i++) + { + for (int j = 0; j < matrix1.cols; j++) + { + MatrixType value = getMatrixAt(matrix1, i, j) + getMatrixAt(matrix2, i, j); + setMatrixAt(value, result, i, j); + } + } + return result; + } + + if (matrix1.cols == 1 && matrix2.cols > 1) + { + result = createMatrix(matrix1.rows, matrix2.cols); + for (int i = 0; i < matrix1.rows; i++) + { + for (int j = 0; j < matrix2.cols; j++) + { + MatrixType value = getMatrixAt(matrix1, i, 0) + getMatrixAt(matrix2, i, j); + setMatrixAt(value, result, i, j); + } + } + return result; + } + else if (matrix2.cols == 1 && matrix1.cols > 1) + { + result = createMatrix(matrix1.rows, matrix1.cols); + for (int i = 0; i < matrix1.rows; i++) + { + for (int j = 0; j < matrix1.cols; j++) + { + MatrixType value = getMatrixAt(matrix1, i, j) + getMatrixAt(matrix2, i, 0); + setMatrixAt(value, result, i, j); + } + } + return result; + } + + //Fall: Unterschiedliche Spaltenanzahl, beide ungleich 1 + result.rows = 0; + result.cols = 0; + result.buffer = NULL; + return result; +} + +Matrix multiply(const Matrix matrix1, const Matrix matrix2) +{ + Matrix result; + + if (matrix1.buffer == NULL || matrix2.buffer == NULL || matrix1.cols != matrix2.rows) + { + result.rows = 0; + result.cols = 0; + result.buffer = NULL; + return result; + } + + result = createMatrix(matrix1.rows, matrix2.cols); + + for (int i = 0; i < matrix1.rows; i++) + { + for (int j = 0; j < matrix2.cols; j++) + { + MatrixType sum = 0; + + for (int k = 0; k < matrix1.cols; k++) + { + sum += getMatrixAt(matrix1, i, k) * getMatrixAt(matrix2, k, j); + } + setMatrixAt(sum, result, i, j); + } + } + + return result; +} diff --git a/test.c b/test.c new file mode 100644 index 0000000..f0eefd0 --- /dev/null +++ b/test.c @@ -0,0 +1,107 @@ +#include +#include +#include "matrix.h" + Matrix createMatrix(unsigned int rows, unsigned int cols) { + Matrix m; + if (rows == 0 || cols == 0) { + m.rows = 0; + m.cols = 0; + m.buffer = NULL; + return m; + } + + m.rows = rows; + m.cols = cols; + m.buffer = (MatrixType *)malloc(rows * cols * sizeof(MatrixType)); + if (m.buffer == NULL) { + fprintf(stderr, "Fehler: Speicher konnte nicht allokiert werden.\n"); + m.rows = m.cols = 0; + } else { + for (unsigned int i = 0; i < rows * cols; i++) { + m.buffer[i] = UNDEFINED_MATRIX_VALUE; + } + } + return m; + } + + void clearMatrix(Matrix *matrix) { + if (matrix->buffer != NULL) { + free(matrix->buffer); + matrix->buffer = NULL; + } + matrix->rows = 0; + matrix->cols = 0; + } + + void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) { + if (rowIdx < matrix.rows && colIdx < matrix.cols) { + matrix.buffer[rowIdx * matrix.cols + colIdx] = value; + } + } + + MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx) { + if (rowIdx < matrix.rows && colIdx < matrix.cols) { + return matrix.buffer[rowIdx * matrix.cols + colIdx]; + } + return UNDEFINED_MATRIX_VALUE; + } + + Matrix add(const Matrix matrix1, const Matrix matrix2) { + Matrix result = {0, 0, NULL}; + + // Prüfe Dimensionen und Broadcasting + if ((matrix1.rows == matrix2.rows && matrix1.cols == matrix2.cols) || + (matrix1.rows == matrix2.rows && matrix2.cols == 1) || + (matrix1.cols == matrix2.cols && matrix2.rows == 1) || + (matrix2.rows == matrix1.rows && matrix1.cols == 1) || + (matrix2.cols == matrix1.cols && matrix1.rows == 1)) { + + result = createMatrix(matrix1.rows, matrix1.cols); + + for (unsigned int i = 0; i < matrix1.rows; i++) { + for (unsigned int j = 0; j < matrix1.cols; j++) { + MatrixType val1 = getMatrixAt(matrix1, i, j); + MatrixType val2; + + // Broadcasting + if (matrix2.rows == matrix1.rows && matrix2.cols == matrix1.cols) { + val2 = getMatrixAt(matrix2, i, j); + } else if (matrix2.rows == matrix1.rows && matrix2.cols == 1) { + val2 = getMatrixAt(matrix2, i, 0); + } else if (matrix2.rows == 1 && matrix2.cols == matrix1.cols) { + val2 = getMatrixAt(matrix2, 0, j); + } else if (matrix1.rows == matrix2.rows && matrix1.cols == 1) { + val2 = getMatrixAt(matrix2, i, 0); + } else if (matrix1.rows == 1 && matrix1.cols == matrix2.cols) { + val2 = getMatrixAt(matrix2, 0, j); + } else { + val2 = UNDEFINED_MATRIX_VALUE; + } + + setMatrixAt(val1 + val2, result, i, j); + } + } + } + return result; + } + + Matrix multiply(const Matrix matrix1, const Matrix matrix2) { + Matrix result = {0, 0, NULL}; + + if (matrix1.cols != matrix2.rows) { + return result; // inkompatible Dimensionen + } + + result = createMatrix(matrix1.rows, matrix2.cols); + + for (unsigned int i = 0; i < matrix1.rows; i++) { + for (unsigned int j = 0; j < matrix2.cols; j++) { + MatrixType sum = 0; + for (unsigned int k = 0; k < matrix1.cols; k++) { + sum += getMatrixAt(matrix1, i, k) * getMatrixAt(matrix2, k, j); + } + setMatrixAt(sum, result, i, j); + } + } + return result; + } \ No newline at end of file diff --git a/test.h b/test.h new file mode 100644 index 0000000..96b0df6 --- /dev/null +++ b/test.h @@ -0,0 +1,24 @@ + + +#ifndef MATRIX_H +#define MATRIX_H + +#define UNDEFINED_MATRIX_VALUE 0 +typedef float MatrixType; + +// Definition des Matrix-Typs +typedef struct { + unsigned int rows; + unsigned int cols; + MatrixType *buffer; // dynamisch allokiertes Array +} Matrix; + +// Funktionsdeklarationen +Matrix createMatrix(unsigned int rows, unsigned int cols); +void clearMatrix(Matrix *matrix); +void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx); +MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx); +Matrix add(const Matrix matrix1, const Matrix matrix2); +Matrix multiply(const Matrix matrix1, const Matrix matrix2); + +#endif \ No newline at end of file