Skip to content

Commit 0af624f

Browse files
Merge branch 'development' into master
2 parents d269822 + c45ca91 commit 0af624f

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

CONTRIBUTING.md

+9-3
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,30 @@
33
This file is currently not complete but will be improve step by step.
44

55
# Contributing code
6+
Use last version of Pharo 7.0 in order to use Iceberg.
67
## Fork the Pharo repository
78

89
All changes you'll do will be versionned in your own fork of the [PolyMath repository](https://github.com/PolyMathOrg/PolyMath). Then, from your fork you'll be able to issue pull requests to PolyMath, where they will be reviewed, and luckily, integrated.
910

1011
Go to PolyMath github's repository and click on the fork button on the top right. Yes, this means that you'll need a github account to contribute to PolyMath, yes.
1112

1213
## Load last dev version of PolyMath
13-
In a fresh Pharo, load last development version of Polymath :
14+
In a fresh Pharo 7.0 image, load last development version of Polymath :
1415

1516
```Smalltalk
1617
Metacello new
17-
githubUser: 'PolyMathOrg' project: 'PolyMath' commitish: 'master' path: 'src';
18+
githubUser: 'XXX' project: 'PolyMath' commitish: 'development' path: 'src';
1819
baseline: 'PolyMath';
1920
load
2021
```
22+
where you replace XXX with your github user name.
2123

2224
## Setup Iceberg
23-
Open Iceberg tool
25+
You need an ssh key in order to commit on github. Open Iceberg tool, and then click on the settings. Check the box : "Use custom SSH keys".
26+
27+
## Send the PR to github
28+
After doing the modification in your image, open Iceberg tool, commit the changes in your PolyMath repository. Cherry-pick the modifications that you want to include in your commit. In the github interface, create a Pull Request from your commit.
29+
Send the PR to PolyMath main repository.
2430

2531
## Cleanups
2632
Ounce your pull request is integrated, some cleanups are required:

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
44
[![Build Status](https://travis-ci.org/PolyMathOrg/PolyMath.svg?branch=master)](https://travis-ci.org/PolyMathOrg/PolyMath)
5-
[![Build status](https://ci.appveyor.com/api/projects/status/t4o6by4psutfpmp7?svg=true)](https://ci.appveyor.com/project/SergeStinckwich/polymath)
5+
[![Build status](https://ci.appveyor.com/api/projects/status/3tvarh2xi22max8h?svg=true)](https://ci.appveyor.com/project/SergeStinckwich/polymath-88bea)
66
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/PolyMathOrg/PolyMath/master/LICENSE)
77

88
You can load the code in a fresh Pharo 6.1 image with:
@@ -29,7 +29,7 @@ PolyMath is a Smalltalk project, similar to existing scientific libraries like N
2929
A book about PolyMath called "Numerical Methods" is available online: https://github.com/SquareBracketAssociates/NumericalMethods/releases/tag/snapshot-2016-01-17
3030

3131
Some documentation (to be cleaned and reorganized) about PolyMath is available on the Wiki here:
32-
https://github.com/SergeStinckwich/SciSmalltalk/wiki
32+
https://github.com/PolyMathOrg/PolyMath/wiki
3333

3434
Natalia wrote some explanation about benchmarking PolyMath in the Pharo For Enterprise Book: https://github.com/SquareBracketAssociates/PharoForTheEnterprise-english/blob/ae40e7ab6f7651f6e7c271869eb1efc4e531e774/ComparingSolutions/ComparingSolutions.pier
3535

src/BaselineOfPolyMath/BaselineOfPolyMath.class.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ BaselineOfPolyMath >> baseline: spec [
8585
spec
8686
group: 'Accuracy' with: #('Math-Accuracy-ODE' 'Math-Accuracy-Core');
8787
group: 'Benchmarks' with: #('Math-Benchmarks-ODE' 'Math-Benchmarks-KDTree');
88-
group: 'Core' with: #('Math-Complex' 'Math-Quaternion' 'Math-DHB-Numerical' 'Math-Random' 'Math-KDTree' 'Math-ODE' 'Math-ArbitraryPrecisionFloat' 'Math-FastFourierTransform' 'ExtendedNumberParser' 'Math-Quantile' 'Math-Physics-Constants' 'Math-Polynomials');
88+
group: 'Core' with: #('Math-Complex' 'Math-Quaternion' 'Math-DHB-Numerical' 'Math-Random' 'Math-KDTree' 'Math-ODE' 'Math-ArbitraryPrecisionFloat' 'Math-FastFourierTransform' 'ExtendedNumberParser' 'Math-Quantile' 'Math-Physics-Constants' 'Math-Polynomials' 'Math-TSNE');
8989
group: 'Extensions' with: #('Math-Clustering' 'Math-Number-Extensions' 'Math-Chromosome' 'Math-PrincipalComponentAnalysis' 'Math-FunctionFit' 'Math-AutomaticDifferenciation' 'Math-KernelSmoothing' 'Math-RandomDistributionBased' 'Math-KolmogorovSmirnov');
9090
group: 'Tests' with: #('Math-Tests-Matrix' 'Math-Tests-Clustering' 'Math-Tests-DHB-Numerical' 'Math-Tests-Complex' 'Math-Tests-Quaternion' 'Math-Tests-Random' 'Math-Tests-ODE' 'Math-Tests-KDTree' 'Math-Tests-DHB-wk' 'Math-Tests-FunctionFit' 'Math-Tests-AutomaticDifferenciation' 'Math-Tests-FastFourierTransform' 'Math-Tests-Accuracy' 'Math-Tests-ArbitraryPrecisionFloat' 'Math-Tests-KolmogorovSmirnov' 'Math-Tests-Quantile' 'Math-Tests-Polynomials');
9191
group: 'default' with: #('Core' 'Extensions' 'Tests' 'Benchmarks' 'Accuracy') ]

src/Math-DHB-Numerical/PMMinimizingPoint.class.st

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ PMMinimizingPoint class >> vector: aVector function: aFunction [
1919
]
2020

2121
{ #category : #comparing }
22-
PMMinimizingPoint >> =aMPoint [
23-
"only for testing purposes"
24-
^(value = aMPoint value)& (position = aMPoint position)
22+
PMMinimizingPoint >> = aMPoint [
23+
"only for testing purposes"
24+
25+
^ value = aMPoint value & (position = aMPoint position)
2526
]
2627

2728
{ #category : #information }

0 commit comments

Comments
 (0)