generated from freudenreichan/info2Praktikum-NeuronalesNetz
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb8672e5a1 |
No files matched your search
+21
-7
@@ -8,6 +8,27 @@
|
|||||||
|
|
||||||
// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
|
// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
|
||||||
|
|
||||||
|
int checkString (FILE *file){ //Checks if String at the start of File equals expected Format (0 for wrong 1 for right)
|
||||||
|
if (file == NULL){ //returns 0 for empty file
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
char expectedString[] = FILE_HEADER_STRING;
|
||||||
|
char actualString[BUFFER_SIZE];
|
||||||
|
|
||||||
|
rewind(file);
|
||||||
|
size_t bytesRead = fread(actualString, 1,27 , file); //Stores Bytes of start of File to actualString
|
||||||
|
if (bytesRead != 27){
|
||||||
|
return 0;} //Returns 0 if File is to short
|
||||||
|
actualString[27] = '\0';
|
||||||
|
|
||||||
|
if (strcmp(actualString, expectedString) != 0){
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
|
// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
|
||||||
GrayScaleImageSeries *readImages(const char *path)
|
GrayScaleImageSeries *readImages(const char *path)
|
||||||
{
|
{
|
||||||
@@ -19,11 +40,4 @@ 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;
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
#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
|
||||||
@@ -17,14 +16,14 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
|
|||||||
Matrix newMatrix;
|
Matrix newMatrix;
|
||||||
newMatrix.rows = rows;
|
newMatrix.rows = rows;
|
||||||
newMatrix.cols = cols;
|
newMatrix.cols = cols;
|
||||||
newMatrix.buffer = calloc(rows*cols, sizeof(MatrixType));
|
newMatrix.buffer = calloc(rows*cols, sizeof(MatrixType))
|
||||||
return newMatrix;
|
return newMatrix;
|
||||||
}
|
}
|
||||||
|
|
||||||
void clearMatrix(Matrix *matrix)
|
void clearMatrix(Matrix *matrix)
|
||||||
{
|
{
|
||||||
free(matrix->buffer);
|
free(*matrix.buffer);
|
||||||
matrix->buffer = NULL;
|
*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)
|
||||||
@@ -55,7 +54,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
|
||||||
clearMatrix(&MatrixErgebnis);
|
MatrixErgebnis = clearMatrix(MatrixErgebnis);
|
||||||
return MatrixErgebnis;
|
return MatrixErgebnis;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
@@ -75,25 +74,4 @@ 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;
|
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user