Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pcse2: irrigation challenge #1341

Merged
merged 23 commits into from
Mar 2, 2022
Merged

Pcse2: irrigation challenge #1341

merged 23 commits into from
Mar 2, 2022

Conversation

teytaud
Copy link
Contributor

@teytaud teytaud commented Jan 20, 2022

Types of changes

  • Docs change / refactoring / dependency upgrade
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Motivation and Context / Related issue

The previous crop management tool was cool, but rather preliminary: this was about hyperparameter optimization. The present challenge is about optimizing the irrigation of crops,
making the problem higher-dimensional and more impactful.

How Has This Been Tested (if it applies)

Checklist

  • The documentation is up-to-date with the changes I made.
  • I have read the CONTRIBUTING document and completed the CLA (see CLA).
  • All tests passed, and additional code has been covered with new tests.

@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Jan 20, 2022
@teytaud teytaud changed the base branch from main to pcse January 20, 2022 18:17
@teytaud teytaud mentioned this pull request Jan 24, 2022
Closed
jrapin
jrapin reviewed Jan 26, 2022
View reviewed changes
nevergrad/functions/irrigation/data/soil/ec3.soil Outdated
@@ -0,0 +1,55 @@
** $Id: ec3.new 1.2 1997/09/18 17:33:54 LEM release $
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the license with the data files? This is dangereous

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://joinup.ec.europa.eu/collection/eupl/matrix-eupl-compatible-open-source-licences suggests that it is ok: we have incorporation rights.

That said you know license stuff 1000x beter than me :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's really unclear to me, from what I understand of this matrix it means that it's possible to include MIT licenses code into EUPL, but we're doing the reverse, and I can't find the information

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Workaround: download from www.

@teytaud teytaud merged commit 1691eaa into pcse Mar 2, 2022
@teytaud teytaud deleted the pcse2 branch March 2, 2022 19:08
teytaud added a commit that referenced this pull request Aug 8, 2022
@teytaud
ZZPcse2: irrigation challenge (#1341)
e466891 
* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix
teytaud added a commit that referenced this pull request Dec 12, 2022
@teytaud
Pcse2: irrigation challenge (#1341)
5569d69 
* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix
teytaud added a commit that referenced this pull request Dec 12, 2022
@teytaud
ZZPcse2: irrigation challenge (#1341)
efdcdcb 
* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix
teytaud added a commit that referenced this pull request Dec 12, 2022
@teytaud
Pcse2: irrigation challenge (#1341)
fd6b068 
* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix
teytaud added a commit that referenced this pull request Dec 12, 2022
@teytaud
ZZPcse2: irrigation challenge (#1341)
d2b6273 
* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix
teytaud added a commit that referenced this pull request Dec 12, 2022
@teytaud @jrapin
Ccmerge (#1483)
e3f6891 
* merge

* pcse

* pcse

* fix

* pcse

* fix

* nlopt

* nlopt

* nlopt

* fix

* fix

* po

* to

* fix

* Update experiments.py

* Update nevergrad/optimization/optimizerlib.py

Co-authored-by: Jérémy Rapin <[email protected]>

* Update test_optimizerlib.py

* Update pcse.py

* Update experiments.py

* Pcse2: irrigation challenge (#1341)

* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix

* fix

* pcse_license

* fix_details

* fix

* dependencies

* dependencies

* dependencies

* dependencies

* dependencies

* pcse

* Update pcse.py

* pcse

* fix

* fix

* fix

* fix

* fix

* fix

* Adding tabu lists (#1456)

* fix

* fix

* fix

* fix

* fix

* fix

* Update core.py

* Fix typing

* Dict now

* fix

* fix

* fix

* fix

* Simulated Annealing (#1455)

* sa

* black

* Register DiscreteDE (#1454)

This is one of the best algorithms ever for hyperparameter tuning so let us register it.

* fix

* fix

* fix

* Fix type

* fix

* ZZAdding tabu lists (#1456)

* fix

* fix

* fix

* fix

* fix

* fix

* Update core.py

* Fix typing

* Dict now

* fix

* fix

* fix

* fix

* ZZmerge

* fix

* fix

* Fix num params

* Remive duplicate

* Update test_callbacks.py

* Update test_callbacks.py

* fix

* fix

* fix

* fix

* Update optimizerlib.py

* Update optimizer_groups.txt

* Update optimizerlib.py

* Update test_tabu.py

* Update experiments.py

* Update optimizerlib.py

* test_sa

* fix

* Update test_suggest.py

* Update test_tabu.py

* pcse

* ZZfix

* nlopt

* ZZnlopt

* ZZPcse2: irrigation challenge (#1341)

* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix

* ZZUpdate bench.txt

* fix

* pcse

* benin

* fix

* Optimizing simultaneously variety, irrigation and crop (#1467)

* fix

* Adding costs in dollars per kg for various crops, and weird operations by Lev distance (#1468)

* fix

* Support for choosing the year(s) in PCSE stuff (#1469)

* fix

* o

* fix

* merge_and_small_fix

* merge

* fix_december

* fix

* fix

* ccmerge

* fix

Co-authored-by: Jérémy Rapin <[email protected]>
teytaud added a commit that referenced this pull request Dec 12, 2022
@teytaud
Pcse2: irrigation challenge (#1341)
cb62a22 
* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix
teytaud added a commit that referenced this pull request Dec 12, 2022
@teytaud
ZZPcse2: irrigation challenge (#1341)
c50fa85 
* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix
teytaud added a commit that referenced this pull request Dec 12, 2022
@teytaud
Pcse2: irrigation challenge (#1341)
292fdc1 
* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix
teytaud added a commit that referenced this pull request Dec 12, 2022
@teytaud
ZZPcse2: irrigation challenge (#1341)
cdb657b 
* irrigation_challenge

* flute

* fix

* Update __init__.py

* Update experiments.py

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix_gym

* fix_gym

* fix_gym

* fix

* fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrapin jrapin jrapin left review comments

Assignees
No one assigned
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@teytaud @jrapin @facebook-github-bot