Merge branch 'PolyMathOrg:master' into master

SergeStinckwich · Jul 11, 2022 · 42c9dc9 · 42c9dc9
2 parents 232cfa7 + 7c07cd5
commit 42c9dc9
Show file tree

Hide file tree

Showing 16 changed files with 547 additions and 346 deletions.
diff --git a/src/Math-AutomaticDifferenciation/PMDualNumber.class.st b/src/Math-AutomaticDifferenciation/PMDualNumber.class.st
@@ -142,9 +142,10 @@ PMDualNumber >> closeTo: aDualNumber [
 
 { #category : #'mathematical functions' }
 PMDualNumber >> conjugated [
+
 	^ self class
-		value: self value conjugated
-		eps: self eps asComplex complexConjugate
+		  value: self value complexConjugate
+		  eps: self eps asComplex complexConjugate
 ]
 
 { #category : #'mathematical functions' }

diff --git a/src/Math-Complex/Number.extension.st b/src/Math-Complex/Number.extension.st
@@ -10,7 +10,7 @@ Number >> adaptToComplex: rcvr andSend: selector [
 Number >> asComplex [
 	"Answer a Complex number that represents value of the receiver."
 
-	^ PMComplex real: self imaginary: 0
+	^ PMComplexNumber real: self imaginary: 0
 ]
 
 { #category : #'*Math-Complex' }
@@ -25,7 +25,7 @@ Number >> complexConjugate [
 
 { #category : #'*Math-Complex' }
 Number >> i [
-	^ PMComplex real: 0 imaginary: self
+	^ PMComplexNumber real: 0 imaginary: self
 ]
 
 { #category : #'*Math-Complex' }
@@ -36,7 +36,7 @@ Number >> i: aNumber [
 	this is the same as (self + aNumber i) but a little bit more efficient."
 
 	aNumber isNumber ifFalse: [self error: 'Badly formed complex number'].
-	^PMComplex real: self imaginary: aNumber
+	^PMComplexNumber real: self imaginary: aNumber
 ]
 
 { #category : #'*Math-Complex' }