Sync form PolyMath

Author: jecisc

src/Math-Core/ManifestMathCore.class.st

@@ -0,0 +1,13 @@
+"
+Please describe the package using the class comment of the included manifest class. The manifest class also includes other additional metadata for the package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser
+"
+Class {
+	#name : #ManifestMathCore,
+	#superclass : #PackageManifest,
+	#category : #'Math-Core-Manifest'
+}
+
+{ #category : #'meta-data - dependency analyser' }
+ManifestMathCore class >> manuallyResolvedDependencies [
+	^ #(#'Transcript-Core' #'Math-Operations-Extensions')
+]

src/Math-Core/Number.extension.st

@@ -1,11 +1,5 @@
 Extension { #name : #Number }
 
-{ #category : #'*Math-Core' }
-Number >> addWithRegularMatrix: aMatrix [
-	"Adds itself to every row of the matrix"
-	^ PMMatrix rows: (aMatrix rowsCollect: [ :row | row + self ])
-]
-
 { #category : #'*Math-Core' }
 Number >> addWithVector: aVector [
 	"Adds itself to each element of the vector"

src/Math-Core/PMVector.class.st

@@ -27,8 +27,12 @@ Class {
 PMVector class >> new: size random: maxRandomNumber [ 
 	"Answer an instance of me, with number of elements equal to size, each 
 	a randomNumber lower than maxRandomNumber ."
+	
+	| random |
+	random := Random new.
 
-	^self newFrom:  ( (1 to: size ) collect: [:e|maxRandomNumber random ]  )
+	^ self newFrom: ((1 to: size ) collect: [ :each |
+		random nextBetween: 0 and: maxRandomNumber ]).
 ]
 
 { #category : #private }
@@ -43,10 +47,14 @@ PMVector class >> ones: anInteger [
 { #category : #private }
 PMVector class >> randomSize: anInteger maxNumber: aMaxNumber [
 	"Creates a vector of rand numbers from 0 to aMaxNumber."
-	|a|
-	a := PMVector new: anInteger.
-	1 to: a size do: [ :n | a at: n put: (aMaxNumber random)].
-	^a
+	| random vector |
+	random := Random new.
+	
+	vector := PMVector new: anInteger.
+	1 to: vector size do: [ :i |
+		vector at: i put: (random nextBetween: 0 and: aMaxNumber)].
+	
+	^ vector
 ]
 
 { #category : #private }
@@ -207,9 +215,8 @@ PMVector >> householder [
 ]
 
 { #category : #testing }
-PMVector >> isReal [
-	"Answer true if all values of the vector are real numbers"
-	^ self allSatisfy: [ :each | each isRealNumber ].
+PMVector >> isZero [
+ ^ self allSatisfy: [ :element | element = 0 ]
 ]
 
 { #category : #operation }
@@ -240,12 +247,6 @@ PMVector >> normalized [
 	^ (1 / self norm) * self
 ]
 
-{ #category : #operation }
-PMVector >> productWithMatrix: aMatrix [
-	"Answers the product of aMatrix with the receiver."
-	^aMatrix rowsCollect: [ :each | each * self]
-]
-
 { #category : #operation }
 PMVector >> productWithVector: aVector [
 	"Answers the scalar product of aVector with the receiver."
@@ -255,17 +256,6 @@ PMVector >> productWithVector: aVector [
 			into: [ :sum :each | n := n + 1. (aVector at: n) * each + sum]
 ]
 
-{ #category : #'as yet unclassified' }
-PMVector >> reshapeWithDimensions: dimensionArray [
-	| computedRows rowNum colNum |
-	self checkDimensionalCompatibility: dimensionArray.
-	rowNum := dimensionArray at: 1.
-	colNum := dimensionArray at: 2.
-	computedRows := ((1 to: rowNum) collect: [ :i | (1 to: colNum) collect: [ :j | self at: (i-1*colNum)+j ] ]).
-	
-	^PMMatrix rows: computedRows
-]
-
 { #category : #operation }
 PMVector >> scalarProduct: aVector [
 

src/Math-Core/SequenceableCollection.extension.st

@@ -1,9 +1,20 @@
 Extension { #name : #SequenceableCollection }
 
+{ #category : #'*Math-Core' }
+SequenceableCollection >> closeTo: aSequenceableCollection [
+
+	self
+		with: aSequenceableCollection
+		do: [ :a :b | (a closeTo: b) ifFalse: [ ^ false ] ].
+	^ true
+]
+
 { #category : #'*Math-Core' }
 SequenceableCollection >> equalsTo: aSequenceableCollection [
+	
+	self
+		deprecated: 'Use closeTo: instead'
+		transformWith: '`@rec equalsTo: `@arg' -> '`@rec closeTo: `@arg'.
 
-"^ self = aSequenceableCollection "
-self with: aSequenceableCollection do: [:a :b| (a equalsTo: b) ifFalse: [^false]   ].
-^true
+	^ self closeTo: aSequenceableCollection
 ]

src/Math-Matrix/ManifestMathMatrix.class.st

@@ -0,0 +1,13 @@
+"
+Please describe the package using the class comment of the included manifest class. The manifest class also includes other additional metadata for the package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser
+"
+Class {
+	#name : #ManifestMathMatrix,
+	#superclass : #PackageManifest,
+	#category : #'Math-Matrix-Manifest'
+}
+
+{ #category : #'meta-data - dependency analyser' }
+ManifestMathMatrix class >> manuallyResolvedDependencies [
+	^ #(#'Collections-Streams' #'Math-Operations-Extensions')
+]

src/Math-Matrix/Number.extension.st

@@ -1,5 +1,23 @@
 Extension { #name : #Number }
 
+{ #category : #'*Math-Matrix' }
+Number >> addWithRegularMatrix: aMatrix [
+	"Adds itself to every row of the matrix"
+	^ PMMatrix rows: (aMatrix rowsCollect: [ :row | row + self ])
+]
+
+{ #category : #'*Math-Matrix' }
+Number >> complexConjugate [
+	"The complex conjugate of a complex number (a + bi) is another complex number (a - bi).
+	Every real number x is also a complex number with imaginary part equal to 0.
+	In other words, x = x + 0i and x = x - 0i.
+	Therefore, the complex conjugate of a real number is the same real number"
+	
+	"Maintenance note: This method is related to complexes but is packaged in Matrix because the version on Number is not dependant of Complexe and is used by matrix algos."
+	
+	^ self
+]
+
 { #category : #'*Math-Matrix' }
 Number >> productWithMatrix: aMatrix [
 ^aMatrix class rows: (aMatrix rowsCollect: [:r| self productWithVector: r])

src/Math-Matrix/PMMatrix.class.st

@@ -145,15 +145,17 @@ PMMatrix class >> rows: nRows columns: nCols  element: fillElement [
 
 ]
 
-{ #category : #'as yet unclassified' }
-PMMatrix class >> rows: rows columns: columns random: aMaxNumber [
+{ #category : #'instance creation' }
+PMMatrix class >> rows: aNumberOfRows columns: aNumberOfColumns random: aMaxNumber [
 	"Answer a new Matrix of the given dimensions filled with random numbers"
-	|a b|
-	a:=	(1 to: rows) collect: [:row |b:=PMVector new:columns .
-		1 to: columns do: [:column |
-			b  at: column put: (aMaxNumber random)].
-		b].
-	^PMMatrix rows: a
+	| random rows |
+	random := Random new.
+	
+	rows := (1 to: aNumberOfRows) collect: [ :i |
+		(1 to: aNumberOfColumns) collect: [ :j |
+			random nextBetween: 0 and: aMaxNumber ] ].
+	
+	^ self rows: rows
 ]
 
 { #category : #'instance creation' }
@@ -407,6 +409,12 @@ PMMatrix >> columnAt: anInteger [
 	^ rows collect: [ :each | each at: anInteger ]
 ]
 
+{ #category : #'cell accessing' }
+PMMatrix >> columnVectorAt: col size: dimension [
+
+	^ (self columnAt: col) copyFrom: col to: dimension 
+]
+
 { #category : #iterators }
 PMMatrix >> columnsCollect: aBlock [
 	"Perform the collect: operation on the rows of the receiver."
@@ -483,10 +491,12 @@ PMMatrix >> elementwiseProductWithMatrix: aMatrix [
 
 { #category : #'as yet unclassified' }
 PMMatrix >> equalsTo: aMatrix [
-	self rows 
-			with: aMatrix rows  
-			do: [:a :b| (a equalsTo: b) ifFalse: [ ^false ] ].
-	^ true 
+
+	self
+		deprecated: 'Use closeTo: instead'
+		transformWith: '`@rec equalsTo: `@arg' -> '`@rec closeTo: `@arg'.
+	
+	^ self closeTo: aMatrix
 ]
 
 { #category : #'as yet unclassified' }
@@ -650,6 +660,14 @@ PMMatrix >> lupInverse [
 		ifNotNil: [ :i | ^ self class rows: i ]
 ]
 
+{ #category : #operation }
+PMMatrix >> minor: rowIndex and: columnIndex [
+
+	^ PMMatrix rows:
+		  ((self rows allButFirst: columnIndex) collect: [ :aRow | 
+			   aRow allButFirst: rowIndex ])
+]
+
 { #category : #'as yet unclassified' }
 PMMatrix >> mpInverse [
 	"Moore Penrose Inverse. "
@@ -746,35 +764,16 @@ PMMatrix >> productWithVector: aVector [
 
 { #category : #'as yet unclassified' }
 PMMatrix >> qrFactorization [
-	|identMat q r hh colSize i|
-	self numberOfRows < self numberOfColumns ifTrue:[ self error: 'numberOfRows<numberOfColumns' ]. 
-	r :=PMMatrix rows: (rows deepCopy).
-	colSize := self numberOfRows.
-	q := PMSymmetricMatrix identity: colSize.  
-	identMat := q deepCopy.
-	1 to: self numberOfColumns do: [:col| 
-		hh := ((r columnAt: col) copyFrom: col to: colSize) householder.
-		i := (PMVector new: col-1withAll: 0) , (hh at:2 ).
-		q := q* (identMat - ((hh at: 1)*i tensorProduct: i ))."not really necessary, should be simplified"
-		i := PMMatrix rows:  ( (r rows allButFirst: (col -1)) collect: [:aRow| aRow allButFirst: (col -1)]  ).
-		i := i - ((hh at: 2) tensorProduct: ( (hh at: 1)*(hh at: 2)*i  ) ) .
-		i rows withIndexDo: [ :aRow :index |
-			aRow  withIndexDo: [ :n :c| r rowAt: (col + index -1) columnAt: (col +c -1) put: ((n equalsTo: 0) ifTrue: [0] ifFalse:  [n]  )  ]  ] .
-	"col <colSize ifTrue: [i :=(hh at: 2) copyFrom: 2 to: colSize -col +1.  i withIndexDo: [:n :index| r rowAt: col columnAt: index put: n  ]  ]""and this part is not correct, dont uncomment before the bug is corrected! useful if q is not explicitely necessary" ].
-"r rows allButFirst withIndexDo: [:aRow :ri|1 to: (ri min: self numberOfColumns ) do: [:ci|aRow at: ci put:0  ]   ]  ""not necessary with equalsTo:0"  
-	i :=0.
-	[(r rowAt: colSize) allSatisfy: [:n| n=0]  ]whileTrue: [i :=i+1.colSize :=colSize -1].
-	i>0 ifTrue: [ r :=PMMatrix rows: (r rows copyFrom: 1 to:  colSize). 
-					i := q numberOfColumns - i. 
-					q := PMMatrix rows:  ( q rows collect: [:row| row copyFrom: 1 to: i]) ].  
-	^Array with: q with: r
+
+	^ (PMQRDecomposition of: self) decompose
 ]
 
 { #category : #'as yet unclassified' }
 PMMatrix >> qrFactorizationWithPivoting [
+
 	| identMat q r hh colSize i lengthArray rank mx pivot |
-	self numberOfRows < self numberOfColumns
-		ifTrue: [ self error: 'numberOfRows<numberOfColumns' ].
+	self numberOfRows < self numberOfColumns ifTrue: [ 
+		self error: 'numberOfRows<numberOfColumns' ].
 	lengthArray := self columnsCollect: [ :col | col * col ].
 	mx := lengthArray indexOf: lengthArray max.
 	pivot := Array new: lengthArray size.
@@ -791,41 +790,41 @@ PMMatrix >> qrFactorizationWithPivoting [
 	hh := ((r columnAt: rank) copyFrom: rank to: colSize) householder.
 	i := (PMVector new: rank - 1 withAll: 0) , (hh at: 2).
 	q := q * (identMat - ((hh at: 1) * i tensorProduct: i)).
-	i := PMMatrix rows: ((r rows allButFirst: rank - 1) collect: [ :aRow | aRow allButFirst: rank - 1 ]).
+	i := PMMatrix rows:
+		     ((r rows allButFirst: rank - 1) collect: [ :aRow | 
+			      aRow allButFirst: rank - 1 ]).
 	i := i - ((hh at: 2) tensorProduct: (hh at: 1) * (hh at: 2) * i).
-	i rows
-		withIndexDo: [ :aRow :index | 
-			aRow
-				withIndexDo: [ :n :c | 
-					r
-						rowAt: rank + index - 1
-						columnAt: rank + c - 1
-						put:
-							((n equalsTo: 0)
-								ifTrue: [ 0 ]
-								ifFalse: [ n ]) ] ].
-	rank + 1 to: lengthArray size do: [ :ind | lengthArray at: ind put: (lengthArray at: ind) - (r rowAt: rank columnAt: ind) squared ].
+	i rows withIndexDo: [ :aRow :index | 
+		aRow withIndexDo: [ :n :c | 
+			r
+				rowAt: rank + index - 1
+				columnAt: rank + c - 1
+				put: ((n closeTo: 0)
+						 ifTrue: [ 0 ]
+						 ifFalse: [ n ]) ] ].
+	rank + 1 to: lengthArray size do: [ :ind | 
+		lengthArray
+			at: ind
+			put: (lengthArray at: ind) - (r rowAt: rank columnAt: ind) squared ].
 	rank < lengthArray size
 		ifTrue: [ 
 			mx := (lengthArray copyFrom: rank + 1 to: lengthArray size) max.
-			(mx equalsTo: 0)
-				ifTrue: [ mx := 0 ].
+			(mx closeTo: 0) ifTrue: [ mx := 0 ].
 			mx := mx > 0
-				ifTrue: [ lengthArray indexOf: mx startingAt: rank + 1 ]
-				ifFalse: [ 0 ] ]
+				      ifTrue: [ lengthArray indexOf: mx startingAt: rank + 1 ]
+				      ifFalse: [ 0 ] ]
 		ifFalse: [ mx := 0 ].
 	mx > 0 ] whileTrue.
 	i := 0.
-	[ (r rowAt: colSize) allSatisfy: [ :n | n = 0 ] ]
-		whileTrue: [ 
-			i := i + 1.
-			colSize := colSize - 1 ].
-	i > 0
-		ifTrue: [ 
-			r := PMMatrix rows: (r rows copyFrom: 1 to: colSize).
-			i := q numberOfColumns - i.
-			pivot := pivot copyFrom: 1 to: i.
-			q := PMMatrix rows: (q rows collect: [ :row | row copyFrom: 1 to: i ]) ].
+	[ (r rowAt: colSize) allSatisfy: [ :n | n = 0 ] ] whileTrue: [ 
+		i := i + 1.
+		colSize := colSize - 1 ].
+	i > 0 ifTrue: [ 
+		r := PMMatrix rows: (r rows copyFrom: 1 to: colSize).
+		i := q numberOfColumns - i.
+		pivot := pivot copyFrom: 1 to: i.
+		q := PMMatrix rows:
+			     (q rows collect: [ :row | row copyFrom: 1 to: i ]) ].
 	^ Array with: q with: r with: pivot
 ]
 
@@ -892,6 +891,12 @@ PMMatrix >> rowsDo: aBlock [
 	^ rows do: aBlock
 ]
 
+{ #category : #iterators }
+PMMatrix >> rowsWithIndexDo: aBlock [
+
+	^ rows withIndexDo: aBlock
+]
+
 { #category : #transformation }
 PMMatrix >> scaleBy: aNumber [