Compare commits

...
3 changed files with 38 additions and 4 deletions

No files matched your search

+7
View File
@@ -19,4 +19,11 @@ GrayScaleImageSeries *readImages(const char *path)
// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt // TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
void clearSeries(GrayScaleImageSeries *series) void clearSeries(GrayScaleImageSeries *series)
{ {
for(size_t i = GrayScaleImageSeries.count - 1; i >= 0; i--)
{
free(GrayScaleImageSeries.images+GrayScaleImageSeries.count*sizeof(GrayScaleImage)*i);
free(GrayScaleImageSeries.labels+GrayScaleImageSeries.count*sizeof(unsigned char)*i);
}
GrayScaleImageSeries.images = NULL;
GrayScaleImageSeries.labels = NULL;
} }
+30 -3
View File
@@ -1,5 +1,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#include "matrix.h" #include "matrix.h"
// TODO Matrix-Funktionen implementieren // TODO Matrix-Funktionen implementieren
@@ -13,12 +14,17 @@ typedef struct Matrix {
Matrix createMatrix(unsigned int rows, unsigned int cols) Matrix createMatrix(unsigned int rows, unsigned int cols)
{ {
Matrix newMatrix;
newMatrix.rows = rows;
newMatrix.cols = cols;
newMatrix.buffer = calloc(rows*cols, sizeof(MatrixType));
return newMatrix;
} }
void clearMatrix(Matrix *matrix) void clearMatrix(Matrix *matrix)
{ {
free(matrix->buffer);
matrix->buffer = NULL;
} }
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx) void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
@@ -49,7 +55,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
Matrix MatrixErgebnis = createMatrix(matrix1.rows, matrix1.cols); //Creating Result Matrix Matrix MatrixErgebnis = createMatrix(matrix1.rows, matrix1.cols); //Creating Result Matrix
if(matrix1.cols != matrix2.cols || matrix1.rows != matrix2.rows){ 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 printf("Matrix dimensions do not match\n"); //Error Message if dimensions of Input Matrixes are not identical
MatrixErgebnis = clearMatrix(MatrixErgebnis); clearMatrix(&MatrixErgebnis);
return MatrixErgebnis; return MatrixErgebnis;
} }
else{ else{
@@ -69,4 +75,25 @@ return MatrixErgebnis;
Matrix multiply(const Matrix matrix1, const Matrix matrix2) Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{ {
Matrix result;
result.rows = matrix1.rows;
result.cols = matrix2.cols;
if (matrix1.rows == matrix2.cols) {
result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
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.buffer[i * matrix1.cols + k] * matrix2.buffer[k * matrix2.cols + j];
}
result.buffer[i * matrix1.cols + j] = value;
}
}
return result;
}
printf("Die angegebenen Matrizen haben keine passenden Dimensionen für die Multiplikation");
return result;
} }
+1 -1
View File
@@ -7,7 +7,7 @@ typedef float MatrixType;
// TODO Matrixtyp definieren // TODO Matrixtyp definieren
typedef struct Matrix; typedef struct Matrix Matrix;