Skip to content

Commit 95df1f6

Browse files
olekscodeolekscode
authored
Merge pull request #305 from jecisc/depend-on-polymath-datastructures
Depend on PolyMath-DataStructures
2 parents c0b6869 + cac9d33 commit 95df1f6

39 files changed

+49
-5490
lines changed

‎src/BaselineOfPolyMath/BaselineOfPolyMath.class.st‎

Lines changed: 42 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ BaselineOfPolyMath >> baseline: spec [
2121
spec
2222
for: #common
2323
do: [
24-
spec blessing: #baseline.
25-
spec repository: 'github://PolyMathOrg/PolyMath/src'.
26-
spec
27-
baseline: 'SMark'
28-
with: [ spec repository: 'github://smarr/SMark:v1.0.4' ];
29-
baseline: 'XMLWriter'
30-
with: [ spec
31-
repository: 'github://pharo-contributions/XML-XMLWriter:2.9.x/src' ].
24+
"External dependencies"
25+
self
26+
sMark: spec;
27+
xmlWriter: spec;
28+
polyMathDataStructures: spec.
29+
3230
spec
3331
package: 'ExtendedNumberParser';
3432
package: 'Math-Accuracy-Core';
@@ -37,30 +35,20 @@ BaselineOfPolyMath >> baseline: spec [
3735
package: 'Math-ArbitraryPrecisionFloat'
3836
with: [ spec requires: #('ExtendedNumberParser') ];
3937
package: 'Math-AutomaticDifferenciation'
40-
with: [ spec requires: #('Math-Numerical' 'Math-Matrix') ];
38+
with: [ spec requires: #('Math-Numerical' 'PolyMathDataStructures') ];
4139
package: 'Math-Benchmarks-KDTree'
4240
with: [ spec requires: #('Math-KDTree' 'SMark') ];
4341
package: 'Math-Benchmarks-ODE'
4442
with: [ spec requires: #('Math-ODE' 'SMark' 'XMLWriter') ];
45-
package: 'Math-Chromosome'
46-
with: [ spec requires: #('Math-Core') ];
47-
package: 'Math-Clustering'
48-
with:
49-
[ spec requires: #('Math-Numerical' 'Math-Core-Process' 'Math-Matrix') ];
43+
package: 'Math-Chromosome' with: [ spec requires: #('PolyMathDataStructures') ];
44+
package: 'Math-Clustering' with: [ spec requires: #('Math-Numerical' 'Math-Core-Process' 'PolyMathDataStructures') ];
5045
package: 'Math-Complex'
5146
with: [ spec requires: #('Math-Numerical' 'Math-Polynomials') ];
52-
package: 'Math-Core';
53-
package: 'Math-Core-Distribution'
54-
with: [ spec requires: #('Math-Core') ];
55-
package: 'Math-Core-Process';
56-
package: 'Math-Numerical'
57-
with: [ spec
58-
requires:
59-
#('Math-Core' 'Math-Core-Process' 'Math-Core-Distribution' 'Math-DistributionGamma' 'Math-DistributionBeta' 'Math-DistributionForHistogram' 'Math-StatisticalMoments' 'Math-Series') ];
60-
package: 'Math-Polynomials'
61-
with: [ spec
62-
requires:
63-
#('Math-Core' 'Math-Core-Process' 'Math-Core-Distribution' 'Math-DistributionGamma' 'Math-DistributionBeta' 'Math-DistributionForHistogram' 'Math-StatisticalMoments' 'Math-Series') ];
47+
package: 'Math-Helpers';
48+
package: 'Math-Core-Distribution' with: [ spec requires: #('PolyMathDataStructures') ];
49+
package: 'Math-Core-Process' with: [ spec requires: #('Math-Helpers') ];
50+
package: 'Math-Numerical' with: [ spec requires: #('PolyMathDataStructures' 'Math-Helpers' 'Math-Core-Process' 'Math-Core-Distribution' 'Math-DistributionGamma' 'Math-DistributionBeta' 'Math-DistributionForHistogram' 'Math-StatisticalMoments' 'Math-Series') ];
51+
package: 'Math-Polynomials' with: [ spec requires: #('PolyMathDataStructures' 'Math-Helpers' 'Math-Core-Process' 'Math-Core-Distribution' 'Math-DistributionGamma' 'Math-DistributionBeta' 'Math-DistributionForHistogram' 'Math-StatisticalMoments' 'Math-Series') ];
6452
package: 'Math-DistributionBeta'
6553
with: [ spec requires: #('Math-DistributionGamma') ];
6654
package: 'Math-DistributionForHistogram'
@@ -72,47 +60,32 @@ BaselineOfPolyMath >> baseline: spec [
7260
package: 'Math-FunctionFit'
7361
with: [ spec
7462
requires:
75-
#('Math-Numerical' 'Math-Chromosome' 'Math-Accuracy-Core' 'Math-Core' 'Math-Matrix' 'Math-Polynomials') ];
63+
#('Math-Numerical' 'Math-Chromosome' 'Math-Accuracy-Core' 'PolyMathDataStructures' 'Math-Helpers' 'Math-Polynomials') ];
7664
package: 'Math-KDTree';
77-
package: 'Math-KernelSmoothing'
78-
with: [ spec
79-
requires: #('Math-Quantile' 'Math-Numerical' 'Math-Polynomials') ];
65+
package: 'Math-KernelSmoothing' with: [ spec requires: #('Math-Quantile' 'Math-Numerical' 'Math-Polynomials') ];
8066
package: 'Math-KolmogorovSmirnov'
8167
with: [ spec requires: #('Math-Numerical' 'Math-Polynomials') ];
82-
package: 'Math-Matrix';
8368
package: 'Math-Number-Extensions';
84-
package: 'Math-ODE'
85-
with:
86-
[ spec requires: #('Math-Numerical' 'Math-Matrix' 'Math-Polynomials') ];
87-
package: 'Math-Permutation'
88-
with: [ spec requires: #('Math-Core' 'Math-Matrix' 'Math-Core-Process') ];
69+
package: 'Math-ODE' with: [ spec requires: #('Math-Numerical' 'PolyMathDataStructures' 'Math-Polynomials') ];
70+
package: 'Math-Permutation' with: [ spec requires: #('PolyMathDataStructures' 'Math-Core-Process') ];
8971
package: 'Math-Physics-Constants';
90-
package: 'Math-PrincipalComponentAnalysis'
91-
with:
92-
[ spec requires: #('Math-Numerical' 'Math-Matrix' 'Math-Polynomials') ];
72+
package: 'Math-PrincipalComponentAnalysis' with: [ spec requires: #('Math-Numerical' 'PolyMathDataStructures' 'Math-Polynomials') ];
9373
package: 'Math-Quantile';
9474
package: 'Math-Quaternion'
9575
with:
9676
[ spec requires: #('Math-Complex' 'Math-Numerical' 'Math-Polynomials') ];
9777
package: 'Math-Random';
9878
package: 'Math-Series';
99-
package: 'Math-StatisticalMoments'
100-
with: [ spec requires: #('Math-Core' 'Math-DistributionForHistogram') ];
79+
package: 'Math-StatisticalMoments' with: [ spec requires: #('Math-Helpers' 'Math-DistributionForHistogram') ];
10180
package: 'Math-TSNE';
10281
package: 'Math-Tests-Accuracy'
10382
with: [ spec requires: #('Math-Accuracy-Core') ];
10483
package: 'Math-Tests-ArbitraryPrecisionFloat'
10584
with: [ spec requires: #('Math-ArbitraryPrecisionFloat') ];
106-
package: 'Math-Tests-AutomaticDifferenciation'
107-
with: [ spec requires: #('Math-AutomaticDifferenciation' 'Math-Matrix') ];
108-
package: 'Math-Tests-Clustering'
109-
with: [ spec
110-
requires:
111-
#('Math-Clustering' 'Math-Core' 'Math-Core-Distribution' 'Math-UtilsDataServer') ];
85+
package: 'Math-Tests-AutomaticDifferenciation' with: [ spec requires: #('Math-AutomaticDifferenciation' 'PolyMathDataStructures') ];
86+
package: 'Math-Tests-Clustering' with: [ spec requires: #('Math-Clustering' 'Math-Core-Distribution' 'Math-UtilsDataServer') ];
11287
package: 'Math-Tests-Complex'
11388
with: [ spec requires: #('Math-Complex') ];
114-
package: 'Math-Tests-Core'
115-
with: [ spec requires: #('Math-Core') ];
11689
package: 'Math-Tests-Core-Distribution'
11790
with: [ spec requires: #('Math-Core-Distribution') ];
11891
package: 'Math-Tests-Core-Process'
@@ -130,10 +103,6 @@ BaselineOfPolyMath >> baseline: spec [
130103
package: 'Math-Tests-KolmogorovSmirnov'
131104
with: [ spec
132105
requires: #('Math-Numerical' 'Math-KolmogorovSmirnov' 'Math-Polynomials') ];
133-
package: 'Math-Tests-Matrix'
134-
with: [ spec
135-
requires:
136-
#('Math-Core' 'Math-Numerical' 'Math-StatisticalMoments' 'Math-Matrix' 'Math-Polynomials') ];
137106
package: 'Math-Tests-Number-Extensions'
138107
with: [ spec requires: #('Math-Number-Extensions') ];
139108
package: 'Math-Tests-ODE' with: [ spec requires: #('Math-ODE') ];
@@ -159,13 +128,13 @@ BaselineOfPolyMath >> baseline: spec [
159128
with: #('Math-Benchmarks-ODE' 'Math-Benchmarks-KDTree');
160129
group: 'Core'
161130
with:
162-
#('Math-Complex' 'Math-Quaternion' 'Math-Numerical' 'Math-Random' 'Math-KDTree' 'Math-ODE' 'Math-ArbitraryPrecisionFloat' 'Math-FastFourierTransform' 'ExtendedNumberParser' 'Math-Quantile' 'Math-Physics-Constants' 'Math-Polynomials' 'Math-TSNE' 'Math-Core-Process' 'Math-Core' 'Math-Core-Distribution');
131+
#('Math-Complex' 'Math-Quaternion' 'Math-Numerical' 'Math-Random' 'Math-KDTree' 'Math-ODE' 'Math-ArbitraryPrecisionFloat' 'Math-FastFourierTransform' 'ExtendedNumberParser' 'Math-Quantile' 'Math-Physics-Constants' 'Math-Polynomials' 'Math-TSNE' 'Math-Core-Process' 'Math-Helpers' 'PolyMathDataStructures' 'Math-Core-Distribution');
163132
group: 'Extensions'
164133
with:
165134
#('Math-Clustering' 'Math-Number-Extensions' 'Math-Chromosome' 'Math-PrincipalComponentAnalysis' 'Math-FunctionFit' 'Math-AutomaticDifferenciation' 'Math-KernelSmoothing' 'Math-Permutation' 'Math-KolmogorovSmirnov');
166135
group: 'Tests'
167136
with:
168-
#('Math-Tests-Matrix' 'Math-Tests-Clustering' 'Math-Tests-Numerical' 'Math-Tests-Complex' 'Math-Tests-Quaternion' 'Math-Tests-Random' 'Math-Tests-ODE' 'Math-Tests-KDTree' 'Math-Tests-FunctionFit' 'Math-Tests-AutomaticDifferenciation' 'Math-Tests-FastFourierTransform' 'Math-Tests-Accuracy' 'Math-Tests-ArbitraryPrecisionFloat' 'Math-Tests-KolmogorovSmirnov' 'Math-Tests-Quantile' 'Math-Tests-Polynomials' 'Math-Tests-PrincipalComponentAnalysis' 'Math-Tests-KernelSmoothing' 'Math-Tests-Number-Extensions' 'Math-Tests-Permutation' 'Math-Tests-TSNE' 'Math-Tests-Core-Process' 'Math-Tests-Core-Distribution' 'Math-Tests-Core');
137+
#('Math-Tests-Clustering' 'Math-Tests-Numerical' 'Math-Tests-Complex' 'Math-Tests-Quaternion' 'Math-Tests-Random' 'Math-Tests-ODE' 'Math-Tests-KDTree' 'Math-Tests-FunctionFit' 'Math-Tests-AutomaticDifferenciation' 'Math-Tests-FastFourierTransform' 'Math-Tests-Accuracy' 'Math-Tests-ArbitraryPrecisionFloat' 'Math-Tests-KolmogorovSmirnov' 'Math-Tests-Quantile' 'Math-Tests-Polynomials' 'Math-Tests-PrincipalComponentAnalysis' 'Math-Tests-KernelSmoothing' 'Math-Tests-Number-Extensions' 'Math-Tests-Permutation' 'Math-Tests-TSNE' 'Math-Tests-Core-Process' 'Math-Tests-Core-Distribution');
169138
group: 'default'
170139
with: #('Core' 'Extensions' 'Tests' 'Benchmarks' 'Accuracy') ].
171140

@@ -177,9 +146,27 @@ BaselineOfPolyMath >> baseline: spec [
177146
package: 'Math-CompatibilityUpToPharo11' ]
178147
]
179148

149+
{ #category : #dependencies }
150+
BaselineOfPolyMath >> polyMathDataStructures: spec [
151+
152+
spec baseline: 'PolyMathDataStructures' with: [ spec repository: 'github://PolyMathOrg/PolyMath-DataStructures:v1.x.x/src' ]
153+
]
154+
180155
{ #category : #accessing }
181156
BaselineOfPolyMath >> projectClass [
182157
^ [ self class environment at: #MetacelloCypressBaselineProject ]
183158
on: NotFound
184159
do: [ super projectClass ]
185160
]
161+
162+
{ #category : #dependencies }
163+
BaselineOfPolyMath >> sMark: spec [
164+
165+
spec baseline: 'SMark' with: [ spec repository: 'github://smarr/SMark:v1.0.4' ]
166+
]
167+
168+
{ #category : #dependencies }
169+
BaselineOfPolyMath >> xmlWriter: spec [
170+
171+
spec baseline: 'XMLWriter' with: [ spec repository: 'github://pharo-contributions/XML-XMLWriter:2.9.x/src' ]
172+
]

src/Math-Tests-Matrix/ManifestMathTestsMatrix.class.st renamed to src/Math-Chromosome/ManifestMathChromosome.class.st

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
Please describe the package using the class comment of the included manifest class. The manifest class also includes other additional metadata for the package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser
33
"
44
Class {
5-
#name : #ManifestMathTestsMatrix,
5+
#name : #ManifestMathChromosome,
66
#superclass : #PackageManifest,
7-
#category : #'Math-Tests-Matrix-Manifest'
7+
#category : #'Math-Chromosome-Manifest'
88
}
9-
10-
{ #category : #'meta-data - dependency analyser' }
11-
ManifestMathTestsMatrix class >> manuallyResolvedDependencies [
12-
^ #(#'Math-Core-Process')
13-
]

‎src/Math-Core/ArrayedCollection.extension.st‎

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

‎src/Math-Core/Collection.extension.st‎

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

‎src/Math-Core/ManifestMathCore.class.st‎

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

‎src/Math-Core/Number.extension.st‎

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

0 commit comments

Comments
 (0)