Merge pull request #264 from olekscode/263-Remove-external-dependencies-of-Math-Tests-Matrix

Improved several test cases to reduce coupling and make the code cleaner

Author: olekscode

src/Math-Tests-Matrix/PMMatrixTest.class.st

@@ -157,34 +157,47 @@ PMMatrixTest >> testDimension [
 PMMatrixTest >> testEigenvalues [
 	"Code Example 8.15"
 
-	| m charPol roots eigenvalues finder |
-	m := PMMatrix rows: #(#(3 -2 0) #(-2 7 1) #(0 1 5)).
-	charPol := PMPolynomial coefficients: #(82 -66 15 -1).
-	roots := charPol roots asSortedCollection asArray reverse.
-	finder := PMJacobiTransformation matrix: m.
+	| matrix expectedEigenvalues eigenvalues finder |
+	
+	matrix := PMMatrix rows: #(
+		(3 -2 0) 
+		(-2 7 1)
+		(0 1 5)).
+		
+	expectedEigenvalues := #(8.105482616526306 4.776537928330764 2.1179794551429305).
+	
+	finder := PMJacobiTransformation matrix: matrix.
 	finder desiredPrecision: 1.0e-09.
+	
 	eigenvalues := finder evaluate.
-	self assert: eigenvalues size equals: 3.
-	self assert: ((roots at: 1) - (eigenvalues at: 1)) abs < 1.0e-09.
-	self assert: ((roots at: 2) - (eigenvalues at: 2)) abs < 1.0e-09.
-	self assert: ((roots at: 3) - (eigenvalues at: 3)) abs < 1.0e-09
+	
+	eigenvalues with: expectedEigenvalues do: [ :actual :expected |
+		self assert: actual closeTo: expected ].
 ]
 
 { #category : #'linear algebra' }
 PMMatrixTest >> testEigenvaluesLargest [
 	"Code Example 8.13"
 
-	| m charPol roots eigenvalue finder |
-	m := PMMatrix rows: #(#(3 -2 0) #(-2 7 1) #(0 1 5)).
-	charPol := PMPolynomial coefficients: #(82 -66 15 -1).
-	roots := charPol roots asSortedCollection asArray reverse.
-	finder := PMLargestEigenValueFinder matrix: m.
+	| matrix expectedEigenvalues firstEigenvalue secondEigenvalue finder |
+	
+	matrix := PMMatrix rows: #(
+		(3 -2 0)
+		(-2 7 1)
+		(0 1 5)).
+		
+	expectedEigenvalues := #(8.105482616526306 4.776537928330764 2.1179794551429305).
+	
+	finder := PMLargestEigenValueFinder matrix: matrix.
 	finder desiredPrecision: 1.0e-08.
-	eigenvalue := finder evaluate.
-	self assert: ((roots at: 1) - eigenvalue) abs < 1.0e-08.
+	
+	firstEigenvalue := finder evaluate.
+	
 	finder := finder nextLargestEigenValueFinder.
-	eigenvalue := finder evaluate.
-	self assert: ((roots at: 2) - eigenvalue) abs < 1.0e-08
+	secondEigenvalue := finder evaluate.
+	
+	self assert: firstEigenvalue closeTo: expectedEigenvalues first.
+	self assert: secondEigenvalue closeTo: expectedEigenvalues second.
 ]
 
 { #category : #tests }
@@ -215,6 +228,30 @@ PMMatrixTest >> testIdentityMatrix [
 	self assert: identityMatrix equals: expectedIdentityMatrix.
 ]
 
+{ #category : #'linear algebra' }
+PMMatrixTest >> testInversePureCRLSingularMatrixError [
+
+	self
+		should: [ (PMSymmetricMatrix rows: #((1 2 3)(2 2 2)(3 2 1))) inversePureCRL ]
+		raise: PMSingularMatrixError.
+]
+
+{ #category : #'linear algebra' }
+PMMatrixTest >> testInversePureLUPSingularMatrixError [
+
+	self
+		should: [ (PMSymmetricMatrix rows: #((1 2 3)(2 2 2)(3 2 1))) inversePureLUP ]
+		raise: PMSingularMatrixError.
+]
+
+{ #category : #'linear algebra' }
+PMMatrixTest >> testInverseSingularMatrixError [
+
+	self
+		should: [ (PMMatrix rows: #((1 2 3)(3 4 6))) inverse ]
+		raise: PMSingularMatrixError.
+]
+
 { #category : #tests }
 PMMatrixTest >> testIsRealOnComplexMatrix [
 	| matrix |
@@ -757,22 +794,6 @@ PMMatrixTest >> testSimpleMatrixOperations [
 	self assert: m transpose * m equals: m squared
 ]
 
-{ #category : #'linear algebra' }
-PMMatrixTest >> testSingularMatrixError [
-|h f|
-h:=PMHistogram new.
-h freeExtent: true.
-1 to: 3 do:  [:i| h accumulate: i ].
-f:=PMLeastSquareFit histogram: h distributionClass: PMTriangularDistribution.
-self should: [ f evaluate ] raise: PMSingularMatrixError .
-"and not something completely incomprehensible"
-"also here:"
-self should: [ f errorMatrix ] raise: PMSingularMatrixError .
-self should: [(PMMatrix rows: #((1 2 3)(3 4 6)))inverse] raise: PMSingularMatrixError .
-self should: [(PMSymmetricMatrix rows: #((1 2 3)(2 2 2)(3 2 1)))inversePureLUP] raise: PMSingularMatrixError.
-self should: [(PMSymmetricMatrix rows: #((1 2 3)(2 2 2)(3 2 1)))inversePureCRL] raise: PMSingularMatrixError.
-]
-
 { #category : #tests }
 PMMatrixTest >> testSkalarMultiplication [
 	| a r |

src/Math-Tests-Numerical/PMNumericalMethodsTestCase.class.st

@@ -391,6 +391,24 @@ PMNumericalMethodsTestCase >> testLeastSquarePolynomial [
 				< (estimation error: 7.15)
 ]
 
+{ #category : #'iterative algorithms' }
+PMNumericalMethodsTestCase >> testLeastSquaresSingularMatrixError [
+	| histogram leastSquares |
+	
+	histogram := PMHistogram new
+		freeExtent: true;
+		yourself.
+		
+	1 to: 3 do: [:i| histogram accumulate: i ].
+	
+	leastSquares := PMLeastSquareFit
+		histogram: histogram
+		distributionClass: PMTriangularDistribution.
+		
+	self should: [ leastSquares evaluate ] raise: PMSingularMatrixError.
+	self should: [ leastSquares errorMatrix ] raise: PMSingularMatrixError .
+]
+
 { #category : #'iterative algorithms' }
 PMNumericalMethodsTestCase >> testLineSearch1 [
 	"Test line searh for an initial step of Newton solver for equation
@@ -852,22 +870,6 @@ PMNumericalMethodsTestCase >> testOptimizeSimplex [
 	self assert: (result at: 3) abs < 1.0e-6
 ]
 
-{ #category : #'linear algebra' }
-PMNumericalMethodsTestCase >> testSingularMatrixError [
-|h f|
-h:=PMHistogram new.
-h freeExtent: true.
-1 to: 3 do:  [:i| h accumulate: i ].
-f:=PMLeastSquareFit histogram: h distributionClass: PMTriangularDistribution.
-self should: [ f evaluate ] raise: PMSingularMatrixError .
-"and not something completely incomprehensible"
-"also here:"
-self should: [ f errorMatrix ] raise: PMSingularMatrixError .
-self should: [(PMMatrix rows: #((1 2 3)(3 4 6)))inverse] raise: PMSingularMatrixError .
-self should: [(PMSymmetricMatrix rows: #((1 2 3)(2 2 2)(3 2 1)))inversePureLUP] raise: PMSingularMatrixError.
-self should: [(PMSymmetricMatrix rows: #((1 2 3)(2 2 2)(3 2 1)))inversePureCRL] raise: PMSingularMatrixError.
-]
-
 { #category : #statistics }
 PMNumericalMethodsTestCase >> testStatisticalMoments [
 	"comment"