klmp200/LO27
1
0
Fork 0
mirror of https://gitlab.com/klmp200/LO27.git synced 2024-11-26 01:14:15 +00:00
Code Issues Releases Wiki Activity

Merge branch 'NaejBranch' into 'master'

Browse Source 
corrigé de la merde

See merge request !15
This commit is contained in:
Antoine Bartuccio 2016-12-27 22:12:41 +00:00
commit 45749bc690
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LibAutomaton/matrix.c
View File

@ -342,11 +342,11 @@ Matrix opMatrix(Matrix matrix1,Matrix matrix2,bool (operator)(bool, bool)){
} }
Matrix sumMatrix(Matrix matrix1,Matrix matrix2){ Matrix sumMatrix(Matrix matrix1,Matrix matrix2){
opMatrix(matrix1,matrix2,OR); return opMatrix(matrix1,matrix2,OR);
} }
Matrix mulMatrix(Matrix matrix1,Matrix matrix2){ Matrix mulMatrix(Matrix matrix1,Matrix matrix2){
opMatrix(matrix1,matrix2,AND); return opMatrix(matrix1,matrix2,AND);
} }

2
LibAutomaton/matrix.h
View File

@ -231,7 +231,7 @@ Matrix andRowSequenceOnMatrix(Matrix m);
*/ */
Matrix orRowSequenceOnMatrix(Matrix m); Matrix orRowSequenceOnMatrix(Matrix m);
Matrix sumMatrix(Matrix matrix1,Matrix matrix2); Matrix sumMatrix(Matrix matrix1,Matrix matrix2);
Matrix mulMatrix(Matrix matrix1,Matrix matrix2);
#endif #endif