Skip to content

Commit 76699bc

Browse files
committed
Merge branch 'master' into Pharo-12-compatibility
2 parents b775400 + fbf281b commit 76699bc

File tree

6 files changed

+69
-44
lines changed

6 files changed

+69
-44
lines changed

.github/workflows/release.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: CI
2+
3+
env:
4+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5+
6+
on:
7+
release:
8+
types: [created, edited]
9+
10+
jobs:
11+
build:
12+
strategy:
13+
matrix:
14+
smalltalk: [ Pharo64-9.0, Pharo64-10 ]
15+
os: [ macos-latest, windows-latest, ubuntu-latest]
16+
runs-on: ${{ matrix.os }}
17+
name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
18+
env:
19+
PROJECT_NAME: PolyMath-${{ matrix.smalltalk }}
20+
steps:
21+
- uses: actions/checkout@v2
22+
- uses: hpi-swa/setup-smalltalkCI@v1
23+
with:
24+
smalltalk-version: ${{ matrix.smalltalk }}
25+
- run: smalltalkci -s ${{ matrix.smalltalk }}
26+
shell: bash
27+
timeout-minutes: 15

.github/workflows/smalltalk-ci.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
1-
name: CI matrix
1+
name: CI
2+
3+
env:
4+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25

36
on:
47
push:
5-
branches: [ master ]
8+
branches:
9+
- '**'
610
pull_request:
7-
branches: [ master ]
8-
9-
# Allows you to run this workflow manually from the Actions tab
10-
workflow_dispatch:
11+
types: [assigned, opened, synchronize, reopened]
1112

12-
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1313
jobs:
1414
build:
15+
runs-on: ubuntu-latest
16+
env:
17+
PROJECT_NAME: PolyMath-${{ matrix.smalltalk }}
1518
strategy:
1619
matrix:
17-
os: [ macos-latest, windows-latest, ubuntu-latest]
18-
smalltalk: [ Pharo64-9.0, Pharo64-10]
19-
runs-on: ${{ matrix.os }}
20-
name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
20+
smalltalk: [ Pharo64-9.0, Pharo64-10 ]
21+
name: ${{ matrix.smalltalk }}
2122
steps:
2223
- uses: actions/checkout@v2
23-
- name: Setup smalltalkCI
24-
uses: hpi-swa/setup-smalltalkCI@v1
24+
- uses: hpi-swa/setup-smalltalkCI@v1
2525
with:
26-
smalltalk-image: ${{ matrix.smalltalk }}
27-
- name: Load Image and Run Tests
28-
run: smalltalkci -s ${{ matrix.smalltalk }}
29-
env:
30-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31-
timeout-minutes: 15
26+
smalltalk-version: ${{ matrix.smalltalk }}
27+
- run: smalltalkci -s ${{ matrix.smalltalk }}
28+
shell: bash
29+
timeout-minutes: 15

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/.DS_STORE

src/Math-Tests-Complex/PMComplexNumberTest.class.st

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,18 @@ PMComplexNumberTest >> testIsRealNumberOnReal [
438438
self assert: 0.5 isRealNumber
439439
]
440440

441+
{ #category : #tests }
442+
PMComplexNumberTest >> testIsRealOnComplexMatrix [
443+
| matrix |
444+
445+
matrix := PMMatrix rows: {
446+
{ 1 . 3 + 4i . 0 } .
447+
{ 1 - 2i . 2 . -4 } .
448+
{ -8 + 0i . 5 . -1 } }.
449+
450+
self deny: matrix isReal
451+
]
452+
441453
{ #category : #tests }
442454
PMComplexNumberTest >> testIsRealOnComplexVector [
443455

@@ -446,6 +458,18 @@ PMComplexNumberTest >> testIsRealOnComplexVector [
446458
self deny: vector isReal
447459
]
448460

461+
{ #category : #tests }
462+
PMComplexNumberTest >> testIsRealOnRealMatrix [
463+
464+
| matrix |
465+
matrix := PMMatrix rows: #(
466+
#( 1 3 0 )
467+
#( 1 2 -4 )
468+
#( -8 5 -1 ) ).
469+
470+
self assert: matrix isReal
471+
]
472+
449473
{ #category : #tests }
450474
PMComplexNumberTest >> testIsRealOnRealVector [
451475

src/Math-Tests-Complex/PMMatrixTest.extension.st

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -252,18 +252,6 @@ PMMatrixTest >> testInverseSingularMatrixError [
252252
raise: PMSingularMatrixError.
253253
]
254254

255-
{ #category : #tests }
256-
PMMatrixTest >> testIsRealOnRealMatrix [
257-
| matrix |
258-
259-
matrix := PMMatrix rows: #(
260-
(1 3 0)
261-
(1 2 -4)
262-
(-8 5 -1)).
263-
264-
self assert: matrix isReal.
265-
]
266-
267255
{ #category : #tests }
268256
PMMatrixTest >> testLUPDecomposition [
269257
"Code Example 8.10"

0 commit comments

Comments
 (0)