Compare commits

..
2 Commits
+8 -22
View File
@@ -13,12 +13,17 @@ typedef struct Matrix {
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)
{
free(*matrix.buffer);
*matrix.buffer = NULL;
}
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
@@ -38,24 +43,5 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
Matrix multiply(const Matrix matrix1, const Matrix matrix2)
{
if (matrix1.rows == matrix2.cols) {
Matrix result;
result.rows = matrix1.rows;
result.cols = matrix2.cols;
result.buffer = malloc(result.rows * result.cols * sizeof(MatrixType));
for(int i = 0; i < rows; i++) {
for(int j = 0; j < cols; j++) {
MatrixType value = 0;
for(int k = 0; k < matrix1.cols; k++) {
value += matrix1[i][k] * matrix2[k][j];
}
result.buffer[i][i] = value;
}
}
return result;
}
printf("Die angegebenen Matrizen haben keine passenden Dimensionen für die Multiplikation");
return NULL;
}