Merge pull request #206 from rakki-18/PMMatrix-negativeRows

handle negative values for shapes in PMMatrix

Author: SergeStinckwich

src/Math-Matrix/PMMatrix.class.st

@@ -107,10 +107,10 @@ PMMatrix class >> lupCRLCriticalDimension [
 ]
 
 { #category : #'instance creation' }
-PMMatrix class >> new: anInteger [
-	"Create an empty square matrix of dimension anInteger."
+PMMatrix class >> new: dimension [
+	"Create an empty square matrix of size dimension x dimension."
 
-	^ self new initialize: anInteger
+	^ self new initializeSquare: dimension
 ]
 
 { #category : #'instance creation' }
@@ -510,12 +510,6 @@ PMMatrix >> hash [
 	^ rows hash
 ]
 
-{ #category : #initialization }
-PMMatrix >> initialize: anInteger [
-	"Build empty components for a square matrix. No check is made: components are assumed to be orgainized in rows."
-	rows := (1 to: anInteger) asPMVector collect: [ :each | PMVector new: anInteger].
-]
-
 { #category : #initialization }
 PMMatrix >> initializeRows: anArrayOrVector [
 	"Defines the components of the recevier. No check is made: components are assumed to be orgainized in rows."
@@ -525,10 +519,17 @@ PMMatrix >> initializeRows: anArrayOrVector [
 { #category : #initialization }
 PMMatrix >> initializeRows: rowsInteger columns: columnsInteger [
 	"Build empty components for a matrix."
-		
+	self assert: [ rowsInteger  isInteger and: [ rowsInteger   > 0 ] ] description: 'Row size of a matrix must be a positive integer'.
+	self assert: [ columnsInteger  isInteger and: [ columnsInteger  > 0 ] ]  description: 'Column size of a matrix must be a positive integer'.
 	rows := (1 to: rowsInteger) asPMVector collect: [ :each | PMVector new: columnsInteger ].
 ]
 
+{ #category : #initialization }
+PMMatrix >> initializeSquare: dimension [
+	"Build empty components for a square matrix. No check is made: components are assumed to be orgainized in rows."
+	^ self initializeRows: dimension  columns: dimension 
+]
+
 { #category : #operation }
 PMMatrix >> inverse [
 	"Answer the inverse of the receiver."

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

@@ -485,11 +485,20 @@ PMMatrixTest >> testMatrixHash [
 ]
 
 { #category : #'linear algebra' }
-PMMatrixTest >> testMatrixInitialize [
-	| a |
-	a := PMMatrix new initialize: 2.
-	self assert: a numberOfRows equals: 2.
-	self assert: a numberOfColumns equals: 2
+PMMatrixTest >> testMatrixInitializationWithNegativeDimensions [
+	
+	" matrices with negative dimension and zero dimension should not be allowed."
+	self should: [ PMMatrix new: -2 ] raise: AssertionFailure .
+	self should: [ PMMatrix rows: 0 columns: 4 ] raise: AssertionFailure.
+]
+
+{ #category : #'linear algebra' }
+PMMatrixTest >> testMatrixInitializeSquare [
+	| aPMMatrix |
+	aPMMatrix := PMMatrix new initializeSquare: 2.
+	self assert: aPMMatrix numberOfRows equals: 2.
+	self assert: aPMMatrix numberOfColumns equals: 2.
+
 ]
 
 { #category : #'linear algebra' }
@@ -543,6 +552,15 @@ PMMatrixTest >> testMatrixMultiply [
 	self assert: ((c rowAt: 2) at: 3) equals: 4
 ]
 
+{ #category : #'linear algebra' }
+PMMatrixTest >> testMatrixNew [
+	| aPMMatrix |
+	aPMMatrix  := PMMatrix new: 3.
+	self assert: aPMMatrix numberOfRows equals: 3.
+	self assert: aPMMatrix numberOfColumns equals: 3.
+
+]
+
 { #category : #'linear algebra' }
 PMMatrixTest >> testMatrixPrincipalDiagonal [
 	| a |

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

@@ -637,11 +637,11 @@ PMNumericalMethodsTestCase >> testMatrixHash [
 ]
 
 { #category : #'linear algebra' }
-PMNumericalMethodsTestCase >> testMatrixInitialize [
-	| a |
-	a := PMMatrix new initialize: 2.
-	self assert: a numberOfRows equals: 2.
-	self assert: a numberOfColumns equals: 2
+PMNumericalMethodsTestCase >> testMatrixInitializeSquare [
+	| aPMMatrix |
+	aPMMatrix := PMMatrix new initializeSquare:  2.
+	self assert: aPMMatrix numberOfRows equals: 2.
+	self assert: aPMMatrix numberOfColumns equals: 2
 ]
 
 { #category : #'linear algebra' }