Skip to content

Commit ac10202

Browse files
SergeStinckwichSergeStinckwich
authored
Merge pull request #464 from SergeStinckwich/master
Tests are green again
2 parents 56522ff + cce584c commit ac10202

File tree

4 files changed

+82
-48
lines changed

4 files changed

+82
-48
lines changed

‎src/BaselineOfKendrick/BaselineOfKendrick.class.st

+67-46
Original file line numberDiff line numberDiff line change
@@ -21,56 +21,77 @@ BaselineOfKendrick >> baseline: spec [
2121
spec
2222
baseline: 'PolyMath' with: [
2323
spec
24-
repository: 'github://PolyMathOrg/PolyMath';
24+
repository: 'github://PolyMathOrg/PolyMath:v1.0.4';
2525
loads: 'Core' ];
2626
baseline: 'DataFrame'
2727
with: [ spec repository: 'github://PolyMathOrg/DataFrame:v2.0' ].
2828

29-
spec group: 'default' with: #( #Kendrick ) ].
30-
31-
spec for: #'pharo8.x' do: [
3229
spec
33-
baseline: 'PetitParser2Core'
34-
with: [ spec repository: 'github://kursjan/petitparser2' ];
35-
baseline: 'PetitParser'
36-
with: [
37-
spec repository: 'github://moosetechnology/PetitParser/src' ];
38-
baseline: 'Ston'
39-
with: [ spec repository: 'github://svenvc/ston/repository' ];
40-
baseline: 'Roassal3'
41-
with: [ spec repository: 'github://ObjectProfile/Roassal3' ];
42-
baseline: 'Roassal3Exporters'
43-
with: [
44-
spec repository: 'github://ObjectProfile/Roassal3Exporters' ];
45-
baseline: 'MooseAlgos'
46-
with: [
47-
spec repository: 'github://moosetechnology/MooseAlgos:v1.1.8' ].
30+
group: 'Core' with: #( 'Kendrick-Core' );
31+
group: 'Examples' with: #( 'Kendrick-Examples' );
32+
group: 'DSL' with: #( 'Kendrick-DSL' );
33+
group: 'Tests' with: #( 'Kendrick-Tests' );
34+
group: 'default' with: #( 'Core' 'Examples' 'DSL' 'Tests' ) ].
35+
36+
spec
37+
for: #'pharo8.x' do: [
38+
spec
39+
baseline: 'PetitParser2Core'
40+
with: [ spec repository: 'github://kursjan/petitparser2' ];
41+
baseline: 'PetitParser'
42+
with: [
43+
spec repository: 'github://moosetechnology/PetitParser/src' ];
44+
baseline: 'Ston'
45+
with: [ spec repository: 'github://svenvc/ston/repository' ];
46+
baseline: 'Roassal3'
47+
with: [ spec repository: 'github://ObjectProfile/Roassal3' ];
48+
baseline: 'Roassal3Exporters'
49+
with: [
50+
spec repository: 'github://ObjectProfile/Roassal3Exporters' ];
51+
baseline: 'MooseAlgos'
52+
with: [
53+
spec repository: 'github://moosetechnology/MooseAlgos:v1.1.8' ].
54+
55+
spec package: 'Kendrick-Core' with: [
56+
spec requires:
57+
#( 'DataFrame' 'PolyMath' 'Ston' 'PetitParser' 'Roassal3'
58+
'Roassal3Exporters' 'MooseAlgos' ) ] ];
59+
package: 'Kendrick-DSL'
60+
with: [ spec requires: #( 'Kendrick-Core' ) ];
61+
package: 'Kendrick-Tests'
62+
with: [ spec requires: #( 'Kendrick-Core' 'Kendrick-DSL' ) ];
63+
package: 'Kendrick-Examples'
64+
with: [ spec requires: #( 'Kendrick-Core' 'Kendrick-DSL' ) ].
65+
66+
spec
67+
for: #( 'pharo9.x' 'pharo10.x' ) do: [
68+
spec
69+
baseline: 'PetitParser2Core'
70+
with: [ spec repository: 'github://kursjan/petitparser2' ];
71+
baseline: 'PetitParser'
72+
with: [
73+
spec repository: 'github://moosetechnology/PetitParser/src' ];
74+
baseline: 'Ston'
75+
with: [ spec repository: 'github://svenvc/ston/repository' ];
76+
baseline: 'Roassal3Exporters'
77+
with: [
78+
spec repository: 'github://ObjectProfile/Roassal3Exporters' ];
79+
baseline: 'CollectionExtensions' with: [
80+
spec repository:
81+
'github://pharo-contributions/CollectionExtensions:v1.x.x/src' ];
82+
baseline: 'AIGraphAlgorithms' with: [
83+
spec
84+
repository: 'github://pharo-ai/graph-algorithms:v1.0.0';
85+
loads: 'GraphGeneratorsTests' ].
86+
spec package: 'Kendrick-Core' with: [
87+
spec requires:
88+
#( 'DataFrame' 'PolyMath' 'Ston' 'PetitParser' 'CollectionExtensions'
89+
'AIGraphAlgorithms' 'Roassal3Exporters' ) ] ];
90+
package: 'Kendrick-DSL'
91+
with: [ spec requires: #( 'Kendrick-Core' ) ];
92+
package: 'Kendrick-Tests'
93+
with: [ spec requires: #( 'Kendrick-Core' 'Kendrick-DSL' ) ];
94+
package: 'Kendrick-Examples'
95+
with: [ spec requires: #( 'Kendrick-Core' 'Kendrick-DSL' ) ].
4896

49-
spec package: 'Kendrick' with: [
50-
spec requires:
51-
#( 'DataFrame' 'PolyMath' 'Ston' 'PetitParser' 'Roassal3'
52-
'Roassal3Exporters' 'MooseAlgos' ) ] ].
53-
spec for: #('pharo9.x' 'pharo10.x') do: [
54-
spec
55-
baseline: 'PetitParser2Core'
56-
with: [ spec repository: 'github://kursjan/petitparser2' ];
57-
baseline: 'PetitParser'
58-
with: [
59-
spec repository: 'github://moosetechnology/PetitParser/src' ];
60-
baseline: 'Ston'
61-
with: [ spec repository: 'github://svenvc/ston/repository' ];
62-
baseline: 'Roassal3Exporters'
63-
with: [
64-
spec repository: 'github://ObjectProfile/Roassal3Exporters' ];
65-
baseline: 'CollectionExtensions' with: [
66-
spec repository:
67-
'github://pharo-contributions/CollectionExtensions:v1.x.x/src' ];
68-
baseline: 'AIGraphAlgorithms' with: [
69-
spec
70-
repository: 'github://pharo-ai/graph-algorithms:v1.0.0';
71-
loads: 'GraphGeneratorsTests' ].
72-
spec package: 'Kendrick' with: [
73-
spec requires:
74-
#( 'DataFrame' 'PolyMath' 'Ston' 'PetitParser' 'CollectionExtensions'
75-
'AIGraphAlgorithms' 'Roassal3Exporters' ) ] ]
7697
]

‎src/Kendrick-Core/KEGraphFromCompartments.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Build a graph of compartments from a KEModel
33
"
44
Class {
55
#name : #KEGraphFromCompartments,
6-
#superclass : #MalGraphAlgorithm,
6+
#superclass : #AIGraphAlgorithm,
77
#instVars : [
88
'model'
99
],

‎src/Kendrick-Core/String.extension.st

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Extension { #name : #String }
2+
3+
{ #category : #'*Kendrick-Core' }
4+
String >> parseAsAnEquation [
5+
6+
^PPODEParser parse: self
7+
]
8+
9+
{ #category : #'*Kendrick-Core' }
10+
String >> parseAsAnExpression [
11+
12+
^PPODEParser parse: self
13+
]

‎src/Kendrick-DSL/KendrickUI.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Class {
22
#name : #KendrickUI,
3-
#superclass : #GTInspector,
3+
#superclass : #EyeInspector,
44
#category : #'Kendrick-DSL-Internal'
55
}
66

0 commit comments

Comments
 (0)