mirror of
				https://gitlab.com/klmp200/LO27.git
				synced 2025-10-30 13:23:52 +00:00 
			
		
		
		
	Merge branch 'NaejBranch' into 'master'
corrigé de la merde See merge request !15
This commit is contained in:
		| @@ -342,11 +342,11 @@ Matrix opMatrix(Matrix matrix1,Matrix matrix2,bool (operator)(bool, bool)){ | ||||
| } | ||||
|  | ||||
| Matrix sumMatrix(Matrix matrix1,Matrix matrix2){ | ||||
| 	opMatrix(matrix1,matrix2,OR); | ||||
| 	return opMatrix(matrix1,matrix2,OR); | ||||
| } | ||||
|  | ||||
| Matrix mulMatrix(Matrix matrix1,Matrix matrix2){ | ||||
| 	opMatrix(matrix1,matrix2,AND); | ||||
| 	return opMatrix(matrix1,matrix2,AND); | ||||
| } | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -231,7 +231,7 @@ Matrix andRowSequenceOnMatrix(Matrix m); | ||||
| */ | ||||
| Matrix orRowSequenceOnMatrix(Matrix m); | ||||
| Matrix sumMatrix(Matrix matrix1,Matrix matrix2); | ||||
|  | ||||
| Matrix mulMatrix(Matrix matrix1,Matrix matrix2); | ||||
|  | ||||
| #endif | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user