Merge pull request #213 from YvanGuifo/AddProductOfNDArray

Addition of matrix product

Author: SergeStinckwich

src/Math-Matrix/PMNDArray.class.st

@@ -39,10 +39,10 @@ ifTrue:[
 ]
 
 { #category : #comparing }
-PMNDArray >> = anArray [
+PMNDArray >> = aPMNDArray [
 
-	^ array = anArray array & (first = anArray first)
-	  & (strides = anArray strides) & (shape = anArray shape)
+	^ array = aPMNDArray asArray & (first = aPMNDArray first)
+	  & (strides = aPMNDArray strides) & (shape = aPMNDArray shape)
 ]
 
 { #category : #'as yet unclassified' }
@@ -97,6 +97,18 @@ PMNDArray >> fromNestedArray: aFlatArray withShape: aShape [
 	shape ifNotEmpty: [ self updateStrides]
 ]
 
+{ #category : #operation }
+PMNDArray >> hadamardProduct: aPMNDArray [
+	^ self with: aPMNDArray collect: [:a :b| a*b]
+	
+	
+]
+
+{ #category : #testing }
+PMNDArray >> hasSameShapeAs: aPMNDArray [
+	^ self shape = aPMNDArray shape
+]
+
 { #category : #accessing }
 PMNDArray >> rank [
 	^ shape size
@@ -156,3 +168,13 @@ PMNDArray >> viewWithShape: aNewShape [
 	^ PMNDArray new array: self asArray withShape: aNewShape
 
 ]
+
+{ #category : #operation }
+PMNDArray >> with: aPMNDArray collect: aBlock [
+	(self hasSameShapeAs: aPMNDArray)
+		ifFalse:[ShapeMismatch signal ].
+	^ self class new array: ((self asArray) with: (aPMNDArray asArray) collect: aBlock)
+		withShape: self shape.
+	
+	
+]

src/Math-Matrix/PMNDArrayTest.class.st

@@ -100,6 +100,58 @@ PMNDArrayTest >> testFromNestedArray [
 
 ]
 
+{ #category : #tests }
+PMNDArrayTest >> testHadamardProduct [
+|t1 t2 expectedHadamardProduct|
+
+ t1 := PMNDArray fromNestedArray:  #( 
+												#( 1 2 3 4 ) #( 5 6 7 8 ) 
+												).
+ t2 := PMNDArray fromNestedArray: #( 
+												#( 4 3 2 9 ) #( 9 7 6 5 ) 
+												).
+ expectedHadamardProduct :=  PMNDArray fromNestedArray:#( 
+																		#( 4 6 6 36 ) #( 45 42 42 40 )
+																		).
+												
+ self assert: (t1 hadamardProduct: t2) equals: expectedHadamardProduct.
+
+ t1 := PMNDArray fromNestedArray:
+				 #( 
+					#( #( 1 2 ) #( 3 4 )) 
+					#( #( 5 6 ) #( 7 8 ))
+					#( #( 9 10) #( 11 12))
+					).
+					
+ t2 := PMNDArray fromNestedArray:
+				 #( 
+					#( #( 1 3 ) #( 2 1)) 
+					#( #( 0 6 ) #( 3 8))
+					#( #( 3 5) #( 1 10))
+					).
+					
+ expectedHadamardProduct :=  PMNDArray fromNestedArray:#( 
+																			#( #( 1 6 ) #( 6 4 )) 
+																			#( #( 0 36 ) #( 21 64 ))
+																			#( #( 27 50 ) #( 11 120 ))).
+
+
+self assert: (t1 hadamardProduct: t2) equals: expectedHadamardProduct
+					
+				
+			
+		
+	
+]
+
+{ #category : #tests }
+PMNDArrayTest >> testHadamardProductWithDifferentShapesFails [
+|t1 t2|
+ t1 := PMNDArray fromNestedArray: #( #( 1 2) #(3 4) #(5 6) #(7 8)).
+ t2 := PMNDArray fromNestedArray: #( #( 4 3 2 9 ) #( 9 7 6 5 ) ).
+ self should: [t1 hadamardProduct: t2] raise: ShapeMismatch 
+]
+
 { #category : #tests }
 PMNDArrayTest >> testRank [
 

src/Math-Matrix/ShapeMismatch.class.st

@@ -15,5 +15,5 @@ ShapeMismatch >> messageText [
 ShapeMismatch >> standardMessageText [
 	"Generate a standard textual description"
 
-	^ 'Tensor shapes do not match'
+	^ 'NDArray shapes do not match'
 ]