forked from freudenreichan/info2Praktikum-NeuronalesNetz
Compare commits
No commits in common. "801abc1b66cdae346f65db0a88f2dc4db4529a7a" and "98dd7896804b82ae9588acecad6c1f50c61ae2f7" have entirely different histories.
801abc1b66
...
98dd789680
3
.gitignore
vendored
3
.gitignore
vendored
@ -2,6 +2,3 @@ mnist
|
||||
runTests
|
||||
*.o
|
||||
*.exe
|
||||
.vscode/c_cpp_properties.json
|
||||
.vscode/launch.json
|
||||
.vscode/settings.json
|
||||
|
||||
18
.vscode/c_cpp_properties.json
vendored
18
.vscode/c_cpp_properties.json
vendored
@ -1,18 +0,0 @@
|
||||
{
|
||||
"configurations": [
|
||||
{
|
||||
"name": "windows-gcc-x64",
|
||||
"includePath": [
|
||||
"${workspaceFolder}/**"
|
||||
],
|
||||
"compilerPath": "C:/ProgramData/mingw64/mingw64/bin/gcc.exe",
|
||||
"cStandard": "${default}",
|
||||
"cppStandard": "${default}",
|
||||
"intelliSenseMode": "windows-gcc-x64",
|
||||
"compilerArgs": [
|
||||
""
|
||||
]
|
||||
}
|
||||
],
|
||||
"version": 4
|
||||
}
|
||||
24
.vscode/launch.json
vendored
24
.vscode/launch.json
vendored
@ -1,24 +0,0 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "C/C++ Runner: Debug Session",
|
||||
"type": "cppdbg",
|
||||
"request": "launch",
|
||||
"args": [],
|
||||
"stopAtEntry": false,
|
||||
"externalConsole": true,
|
||||
"cwd": "c:/Users/Max-R/I2Pr/repoKachelto/I2-Pr_neuronalesNetz/info2Praktikum-NeuronalesNetz",
|
||||
"program": "c:/Users/Max-R/I2Pr/repoKachelto/I2-Pr_neuronalesNetz/info2Praktikum-NeuronalesNetz/build/Debug/outDebug",
|
||||
"MIMode": "gdb",
|
||||
"miDebuggerPath": "gdb",
|
||||
"setupCommands": [
|
||||
{
|
||||
"description": "Enable pretty-printing for gdb",
|
||||
"text": "-enable-pretty-printing",
|
||||
"ignoreFailures": true
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
58
.vscode/settings.json
vendored
58
.vscode/settings.json
vendored
@ -1,59 +1,3 @@
|
||||
{
|
||||
"C_Cpp_Runner.cCompilerPath": "gcc",
|
||||
"C_Cpp_Runner.cppCompilerPath": "g++",
|
||||
"C_Cpp_Runner.debuggerPath": "gdb",
|
||||
"C_Cpp_Runner.cStandard": "",
|
||||
"C_Cpp_Runner.cppStandard": "",
|
||||
"C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat",
|
||||
"C_Cpp_Runner.useMsvc": false,
|
||||
"C_Cpp_Runner.warnings": [
|
||||
"-Wall",
|
||||
"-Wextra",
|
||||
"-Wpedantic",
|
||||
"-Wshadow",
|
||||
"-Wformat=2",
|
||||
"-Wcast-align",
|
||||
"-Wconversion",
|
||||
"-Wsign-conversion",
|
||||
"-Wnull-dereference"
|
||||
],
|
||||
"C_Cpp_Runner.msvcWarnings": [
|
||||
"/W4",
|
||||
"/permissive-",
|
||||
"/w14242",
|
||||
"/w14287",
|
||||
"/w14296",
|
||||
"/w14311",
|
||||
"/w14826",
|
||||
"/w44062",
|
||||
"/w44242",
|
||||
"/w14905",
|
||||
"/w14906",
|
||||
"/w14263",
|
||||
"/w44265",
|
||||
"/w14928"
|
||||
],
|
||||
"C_Cpp_Runner.enableWarnings": true,
|
||||
"C_Cpp_Runner.warningsAsError": false,
|
||||
"C_Cpp_Runner.compilerArgs": [],
|
||||
"C_Cpp_Runner.linkerArgs": [],
|
||||
"C_Cpp_Runner.includePaths": [],
|
||||
"C_Cpp_Runner.includeSearch": [
|
||||
"*",
|
||||
"**/*"
|
||||
],
|
||||
"C_Cpp_Runner.excludeSearch": [
|
||||
"**/build",
|
||||
"**/build/**",
|
||||
"**/.*",
|
||||
"**/.*/**",
|
||||
"**/.vscode",
|
||||
"**/.vscode/**"
|
||||
],
|
||||
"C_Cpp_Runner.useAddressSanitizer": false,
|
||||
"C_Cpp_Runner.useUndefinedSanitizer": false,
|
||||
"C_Cpp_Runner.useLeakSanitizer": false,
|
||||
"C_Cpp_Runner.showCompilationTime": false,
|
||||
"C_Cpp_Runner.useLinkTimeOptimization": false,
|
||||
"C_Cpp_Runner.msvcSecureNoWarnings": false
|
||||
"makefile.configureOnOpen": false
|
||||
}
|
||||
@ -18,7 +18,6 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
GrayScaleImageSeries *series = NULL;
|
||||
FILE *file = fopen("mnist_test.info2","rb");
|
||||
char headOfFile;
|
||||
series = malloc();
|
||||
return series;
|
||||
}
|
||||
|
||||
|
||||
14
makefile
14
makefile
@ -57,10 +57,12 @@ imageInputTests: imageInput.o imageInputTests.c $(unityfolder)/unity.c
|
||||
# --------------------------
|
||||
# Clean
|
||||
# --------------------------
|
||||
#clean:
|
||||
#ifeq ($(OS),Windows_NT)
|
||||
# del /f *.o *.exe
|
||||
#else
|
||||
# rm -f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests
|
||||
#endif
|
||||
# clean für windows
|
||||
clean:
|
||||
ifeq ($(OS),Windows_NT)
|
||||
del /f *.o *.exe
|
||||
else
|
||||
rm -f *.o mnist runMatrixTests runNeuralNetworkTests runImageInputTests
|
||||
endif
|
||||
|
||||
rm -f *.o *.exe
|
||||
151
matrix.c
151
matrix.c
@ -8,10 +8,6 @@
|
||||
MatrixType *buffer; //Zeiger auf Speicherbereich Reihen*Spalten
|
||||
} Matrix;*/
|
||||
Matrix createMatrix(unsigned int rows, unsigned int cols) {
|
||||
if (cols == 0 || rows == 0){
|
||||
Matrix errorMatrix = {0, 0, NULL};
|
||||
return errorMatrix;
|
||||
}
|
||||
MatrixType *buffer =
|
||||
malloc(rows * cols * sizeof(MatrixType)); // Speicher reservieren, malloc
|
||||
// liefert Zeiger auf Speicher
|
||||
@ -28,12 +24,8 @@ void setMatrixAt(const MatrixType value, Matrix matrix,
|
||||
const unsigned int rowIdx, // Kopie der Matrix wird übergeben
|
||||
const unsigned int colIdx) {
|
||||
|
||||
if (rowIdx >= matrix.rows || colIdx >= matrix.cols) {
|
||||
// Speichergröße nicht überschreiten
|
||||
return;
|
||||
}
|
||||
matrix.buffer[rowIdx * matrix.cols + colIdx] = value;
|
||||
// rowIdx * matrix.cols -> Beginn der Zeile colIdx ->Spalte
|
||||
matrix.buffer[rowIdx * matrix.cols + colIdx] =
|
||||
value; // rowIdx * matrix.cols -> Beginn der Zeile colIdx ->Spalte
|
||||
// innerhalb der Zeile
|
||||
}
|
||||
MatrixType getMatrixAt(const Matrix matrix,
|
||||
@ -48,144 +40,29 @@ MatrixType getMatrixAt(const Matrix matrix,
|
||||
|
||||
return value;
|
||||
}
|
||||
Matrix broadcastingCols(const Matrix matrix, const unsigned int cols){
|
||||
Matrix copy1 = createMatrix(matrix.rows, cols);
|
||||
for (int r= 0; r < matrix.rows; r++){
|
||||
MatrixType valueMatrix1 = getMatrixAt(matrix, r, 0);
|
||||
for (int c=0; c < cols; c++){
|
||||
setMatrixAt(valueMatrix1, copy1,r,c);
|
||||
}
|
||||
}
|
||||
return copy1;
|
||||
}
|
||||
Matrix broadcastingRows(const Matrix matrix, const unsigned int rows){
|
||||
Matrix copy1 = createMatrix(rows, matrix.cols);
|
||||
for (int c= 0; c < matrix.cols; c++){
|
||||
MatrixType valueMatrix1 = getMatrixAt(matrix, 0, c);
|
||||
for (int r=0; r < rows; r++){
|
||||
setMatrixAt(valueMatrix1, copy1,r,c);
|
||||
}
|
||||
}
|
||||
return copy1;
|
||||
|
||||
}
|
||||
Matrix add(const Matrix matrix1, const Matrix matrix2) {
|
||||
|
||||
// Ergebnismatrix
|
||||
Matrix result;
|
||||
const int cols1 = matrix1.cols;
|
||||
const int rows1 = matrix1.rows;
|
||||
const int cols2 = matrix2.cols;
|
||||
const int rows2 = matrix2.rows;
|
||||
|
||||
|
||||
const int rowsEqual = (matrix1.rows==matrix2.rows) ? 1: 0;
|
||||
const int colsEqual = (matrix1.cols==matrix2.cols) ? 1: 0;
|
||||
|
||||
// Broadcasting nur bei Vektor und Matrix, Fehlermeldung bei zwei unpassender
|
||||
// Matrix
|
||||
if (rowsEqual == 1 && colsEqual == 1){
|
||||
const int colsEqu = (matrix1.cols == matrix2.cols) ? 1 : 0;
|
||||
const int rowsEqu = (matrix1.rows == matrix2.rows) ? 1 : 0;
|
||||
if(colsEqu && rowsEqu)
|
||||
{
|
||||
Matrix result = createMatrix(matrix1.rows, matrix1.cols);
|
||||
for (int i = 0; i< rows1; i++) {
|
||||
for (int j= 0; j< cols1; j++){
|
||||
int valueM1= getMatrixAt(matrix1, i, j);
|
||||
int valueM2= getMatrixAt(matrix2, i, j);
|
||||
for(int i = 0; i < rows1; i++)
|
||||
{
|
||||
for (int j = 0; j < cols1; j++)
|
||||
{
|
||||
int valueM1 = getMatrixAt(matrix1, i, j);
|
||||
int valueM2 =getMatrixAt(matrix2, i, j);
|
||||
int sum = valueM1 + valueM2;
|
||||
setMatrixAt(sum, result, i, j);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
else if (rowsEqual ==1 && (cols1 ==1 || cols2 ==1)){
|
||||
if (cols1==1){ //broadcasting von vektor 1 zu matrix 1, add
|
||||
Matrix newMatrix = broadcastingCols(matrix1, cols2);
|
||||
//add
|
||||
Matrix result = createMatrix(newMatrix.rows, newMatrix.cols);
|
||||
for (int i = 0; i< rows1; i++) {
|
||||
for (int j= 0; j< cols2; j++){
|
||||
int valueM1= getMatrixAt(newMatrix, i, j);
|
||||
int valueM2= getMatrixAt(matrix2, i, j);
|
||||
int sum = valueM1 + valueM2;
|
||||
setMatrixAt(sum, result, i, j);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
else{
|
||||
Matrix newMatrix2 = broadcastingCols(matrix2, cols1);
|
||||
//add
|
||||
Matrix result = createMatrix(newMatrix2.rows, newMatrix2.cols);
|
||||
for (int i = 0; i< rows1; i++) {
|
||||
for (int j= 0; j< cols1; j++){
|
||||
int valueM1= getMatrixAt(matrix1, i, j);
|
||||
int valueM2= getMatrixAt(newMatrix2, i, j);
|
||||
int sum = valueM1 + valueM2;
|
||||
setMatrixAt(sum, result, i, j);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
setMatrixAt(sum, result,i,j);
|
||||
}
|
||||
}
|
||||
|
||||
else if ((rows1 ==1 || rows2 ==1) && colsEqual == 1){
|
||||
if (rows1==1){
|
||||
Matrix newMatrix = broadcastingRows(matrix1, rows2);
|
||||
//add
|
||||
Matrix result = createMatrix(newMatrix.rows, newMatrix.cols);
|
||||
for (int i = 0; i< rows2; i++) {
|
||||
for (int j= 0; j< cols1; j++){
|
||||
int valueM1= getMatrixAt(newMatrix, i, j);
|
||||
int valueM2= getMatrixAt(matrix2, i, j);
|
||||
int sum = valueM1 + valueM2;
|
||||
setMatrixAt(sum, result, i, j);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
else{
|
||||
Matrix newMatrix2 = broadcastingRows(matrix2, rows1);
|
||||
//add
|
||||
Matrix result = createMatrix(newMatrix2.rows, newMatrix2.cols);
|
||||
for (int i = 0; i< rows1; i++) {
|
||||
for (int j= 0; j< cols1; j++){
|
||||
int valueM1= getMatrixAt(matrix1, i, j);
|
||||
int valueM2= getMatrixAt(newMatrix2, i, j);
|
||||
int sum = valueM1 + valueM2;
|
||||
setMatrixAt(sum, result, i, j);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// kein add möglich
|
||||
Matrix errorMatrix = {0, 0, NULL};
|
||||
return errorMatrix;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
Matrix multiply(const Matrix matrix1, const Matrix matrix2) {
|
||||
//Spalten1 müssen gleich zeilen2 sein! dann multiplizieren
|
||||
if (matrix1.cols == matrix2.rows){
|
||||
Matrix multMatrix = createMatrix(matrix1.rows,matrix2.cols);
|
||||
//durch neue matrix iterieren
|
||||
for (int r=0; r< matrix1.rows; r++){
|
||||
for (int c=0; c< matrix2.cols; c++){
|
||||
MatrixType sum = 0.0;
|
||||
//skalarprodukte berechnen, k damit die ganze zeile mal die ganze spalte genommen wird quasi
|
||||
for (int k=0; k< matrix1.cols; k++){
|
||||
//sum+= matrix1.buffer[r*matrix1.cols+k]*matrix2.buffer[k*matrix2.cols+c];
|
||||
sum += getMatrixAt(matrix1, r, k)*getMatrixAt(matrix2, k, c);
|
||||
}
|
||||
//Ergebnisse in neue matrix speichern
|
||||
setMatrixAt(sum, multMatrix, r, c);
|
||||
}
|
||||
}
|
||||
return multMatrix;
|
||||
}
|
||||
//sonst fehler, kein multiply möglich
|
||||
else{
|
||||
Matrix errorMatrix = {0, 0, NULL};
|
||||
return errorMatrix;
|
||||
}
|
||||
}
|
||||
Matrix multiply(const Matrix matrix1, const Matrix matrix2) { return matrix1; }
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user