Merge branch 'master' into feat/methods

Author: DurieuxPol

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
       PROJECT_NAME: MathVectorMatrix-${{ matrix.smalltalk }}
     strategy:
       matrix:
-        smalltalk: [ Pharo64-9.0, Pharo64-10, Pharo64-11 ]
+        smalltalk: [Pharo64-13, Pharo64-14]
     name: ${{ matrix.smalltalk }}
     steps:
       - uses: actions/checkout@v3
@@ -19,4 +19,4 @@ jobs:
           smalltalk-image: ${{ matrix.smalltalk }}
       - run: smalltalkci -s ${{ matrix.smalltalk }}
         shell: bash
-        timeout-minutes: 15
+        timeout-minutes: 15

README.md

@@ -1,5 +1,5 @@
 <p align="center"><img alt="PolyMath" src="https://raw.githubusercontent.com/PolyMathOrg/PolyMath/master/assets/logos/logo.png" style="width: 25%; height: 25%">
-<h1 align="center">[Vector Matrix]</h1>
+<h1 align="center">[PolyMath: Vector Matrix]</h1>
   <p align="center">
     Scientific Computing with Pharo
     <br>
@@ -18,7 +18,7 @@
 
 ## Description
 
-A project to manage the data structures of PolyMaths. It currently includes the Vector and Matrix Pharo implementation.
+A project to manage the data structures of PolyMath. It currently includes the Vector and Matrix Pharo implementation.
 
 ## Installation
 
@@ -28,9 +28,7 @@ You can load all the packages into a fresh Pharo image by going to the Playgroun
     Metacello new
         baseline: 'MathVectorMatrix';
         repository: 'github://PolyMathOrg/vector-matrix/src';
-	onWarningLog;
-	onConflictUseIncoming;
-        load ]
+	load
 ```
 
 This should load the default version of the project (you can also specify another version or branch).

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

@@ -352,14 +352,7 @@ PMMatrixTest >> testMatrixAddSizeMismatch [
 	self should: [ b transpose + a ] raise: SizeMismatch
 ]
 
-{ #category : 'comparing' }
-PMMatrixTest >> testMatrixCloseTo [
-	self assert: ((PMMatrix rows: #(#(1.00001 2.00002) #(3.00001 4.00002))) closeTo: (PMMatrix rows: #(#(1.00002 2.00001) #(3.00002 4.00001)))).
-	self assert: (PMMatrix rows: #(#(1.00001 2.00002) #(3.00001 4.00002))) closeTo: (PMMatrix rows: #(#(1.00002 2.00001) #(3.00002 4.00001))).	"Double check that the TestAsserter >> #assert:closeTo: functions properly here."
-		self deny: ((PMMatrix rows: #(#(1.00001 2.00004) #(3.00001 4.00004))) closeTo: (PMMatrix rows: #(#(1.00004 2.00001) #(3.00004 4.00001)))).
-]
-
-{ #category : 'comparing' }
+{ #category : #comparing }
 PMMatrixTest >> testMatrixCloseToPrecision [
 	| a b |
 	a := PMMatrix rows: #(#(1.2 2.4) #(1.2 2.4)).

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

@@ -31,6 +31,7 @@ PMQRTest >> assert: inverse isMoorePenroseInverseOf: aMatrix [
 { #category : 'tests' }
 PMQRTest >> testDecompositionOfMatrixCausingErraticFailure [
 
+	<expectedFailure>
 	| a qrDecomposition matricesAndPivot q r expectedMatrix pivot |
 	a := PMSymmetricMatrix rows:
 		     #( #( 0.41929313699681925 0.05975350554089691

src/Math-Vector-Tests/PMVectorTest.class.st

@@ -187,13 +187,6 @@ PMVectorTest >> testTensorProduct [
 	self assert: (b tensorProduct: a) equals: c transpose
 ]
 
-{ #category : #tests }
-PMVectorTest >> testVectorCloseTo [
-	self assert: (#(1.00001 2.00005) asPMVector closeTo: #(1.00005 2.00001) asPMVector).
-	self assert: #(1.00001 2.00005) asPMVector closeTo: #(1.00005 2.00001) asPMVector.	"Double check that the TestAsserter >> #assert:closeTo: functions properly here."
-	self deny: (#(1.00001 2.00007) asPMVector closeTo: #(1.00007 2.00001) asPMVector)
-]
-
 { #category : #tests }
 PMVectorTest >> testVectorCloseToPrecision [
 	| u v |
@@ -217,6 +210,21 @@ PMVectorTest >> testVectorCumulativeSum [
 	self assert: (w at: 3) equals: 6
 ]
 
+{ #category : #tests }
+PMVectorTest >> testVectorFirstNorm [
+
+	| v1 v2 v3 |
+	v1 := #( 1 0 ) asPMVector.
+	self assert: v1 firstNorm equals: 1.
+	v2 := #( 1 1 ) asPMVector.
+	self assert: v2 firstNorm equals: 2.
+	v3 := #( -1 1 ) asPMVector.
+	self assert: v3 firstNorm equals: 2.
+
+	self assert: (v1 + v2) firstNorm equals: 3.
+	self assert: (v2 + v3) firstNorm equals: 2
+]
+
 { #category : #tests }
 PMVectorTest >> testVectorGreater [
 

src/Math-Vector/PMVector.class.st

@@ -181,6 +181,13 @@ PMVector >> cumsum [
 
 ]
 
+{ #category : #operation }
+PMVector >> firstNorm [
+	"Answer the first norm of the receiver."
+
+	^ self inject: 0 into: [ :accu :e | accu + e abs ]
+]
+
 { #category : #operation }
 PMVector >> hadamardProduct: aVector [
 	"Answers the elementwise product of the receiver with aVector."
@@ -252,10 +259,12 @@ PMVector >> normalized [
 { #category : #operation }
 PMVector >> productWithVector: aVector [
 	"Answers the scalar product of aVector with the receiver."
+
 	| n |
 	n := 0.
-	^self inject: 0
-			into: [ :sum :each | n := n + 1. (aVector at: n) * each + sum]
+	^ self inject: 0 into: [ :sum :each |
+		n := n + 1.
+		(aVector at: n) * each + sum ]
 ]
 
 { #category : #operation }