forked from freudenreichan/info2Praktikum-NeuronalesNetz
data zu buffer umbenannt
This commit is contained in:
parent
ecbb95a6c0
commit
8e67db0dd0
14
matrix.c
14
matrix.c
@ -10,16 +10,16 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
|
|||||||
matrix.rows = rows;
|
matrix.rows = rows;
|
||||||
matrix.cols = cols;
|
matrix.cols = cols;
|
||||||
// Speicher erstellen und nullsetzen
|
// Speicher erstellen und nullsetzen
|
||||||
matrix.data = (double *)calloc(rows * cols, sizeof(double));
|
matrix.buffer = (int *)calloc(rows * cols, sizeof(double));
|
||||||
|
|
||||||
return matrix;
|
return matrix;
|
||||||
}
|
}
|
||||||
// Matrix Speicher freigeben
|
// Matrix Speicher freigeben
|
||||||
void clearMatrix(Matrix *matrix)
|
void clearMatrix(Matrix *matrix)
|
||||||
{
|
{
|
||||||
if (matrix != NULL && matrix->data != NULL) {
|
if (matrix != NULL && matrix->buffer != NULL) {
|
||||||
free(matrix->data);
|
free(matrix->buffer);
|
||||||
matrix->data = NULL;
|
matrix->buffer = NULL;
|
||||||
matrix->rows = 0;
|
matrix->rows = 0;
|
||||||
matrix->cols = 0;
|
matrix->cols = 0;
|
||||||
}
|
}
|
||||||
@ -29,12 +29,12 @@ void clearMatrix(Matrix *matrix)
|
|||||||
// um an entsprechende Speicheradresse zu kommen
|
// um an entsprechende Speicheradresse zu kommen
|
||||||
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
|
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
|
||||||
{
|
{
|
||||||
matrix.data[rowIdx * matrix.cols + colIdx] = value;
|
matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
|
MatrixType getMatrixAt(const Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
|
||||||
{
|
{
|
||||||
return matrix.data[rowIdx * matrix.cols + colIdx];
|
return matrix.buffer[rowIdx * matrix.cols + colIdx];
|
||||||
}
|
}
|
||||||
|
|
||||||
Matrix add(const Matrix matrix1, const Matrix matrix2)
|
Matrix add(const Matrix matrix1, const Matrix matrix2)
|
||||||
@ -44,7 +44,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
|
|||||||
|
|
||||||
// Alle Elemente einzeln addieren
|
// Alle Elemente einzeln addieren
|
||||||
for (unsigned int i = 0; i < matrix1.rows * matrix1.cols; i++) {
|
for (unsigned int i = 0; i < matrix1.rows * matrix1.cols; i++) {
|
||||||
result.data[i] = matrix1.data[i] + matrix2.data[i];
|
result.buffer[i] = matrix1.buffer[i] + matrix2.buffer[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user