Implement the DDS algorithm for spotpy #195
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ectivefunction* support still open.
* master: Removed _algorithm.model, since it is not legal to call. Use _algorithm.simulate instead Removed all calls to self.model in non-funct samplers and replaced it with calls to _algorithm.simulate Accept List Parameter only for MC sampler Support for mixed paramter generation reactivated. List are not properly tested for different algos Removed unittests for mixed parameter generation. Drop of support Enable dealing with non class parameters Add missing default tuple Eanble the filtering of Constant Parameters in _algorithm.py Changed order of parameters to ensure test on Python < 3.6 Fixed thouska#175 and thouska#166 with extensive check to preserve the constants in sceua and developed a number of tests to ensure the constants stays constant in all samplers. Fixed thouska#175 and thouska#166 with extensive check to preserve the constants in sceua and developed a number of tests to ensure the constants stays constant in all samplers. Added tests for named parameters for all samplers. Fails for mle, sa and sceua Fixed Constant parameter usage for sceua (thouska#166 and thouska#175) and build test cases Added a mechanism to exclude parameter types from a sampler, especially List parameters from any sampler except mc and list Change default dbformat to ram
Closed
…ectivefunction* support still open.
… into New-Algorithm-DDS # Conflicts: # spotpy/algorithms/__init__.py # spotpy/tools/fixedrandom.py # spotpy/unittests/test_dds.py
Pull Request Test Coverage Report for Build 659
💛 - Coveralls |
…method to Parameteret
…method to ParameterSet
… into New-Algorithm-DDS # Conflicts: # spotpy/algorithms/dds.py
* master: (22 commits) Added missing lines to allow for starting dream proposal vectors Update Version number upload to pypi Fix bug under mpi use Updates version number corresponds to upload on pypi Removed test for <Python3.6 due to deprectaed numpy version remove parameter interaction test for python 2 Adopt test scripts to changes in examples Removed - sign from Rosenbrock example objectfivefunction Slight changes in sceua sampler and added corresponding tutorial Update _algorithm.py Work with None instead of np.NAN as this was not recognized Update __init__.py Update Version number, uploaded new pypi version Renamed keyword for saving switch Removes unfinished model runs from output file Enable automatic nan filtering for RMSE thouska#79 Added comment Further version compability test Force pytest_cov down to v2.6 Force decrease version of pytest_cov as v2.6.1 is deprecated ... # Conflicts: # .travis.yml
- new dds tutorial
|
Super nice work! Thank you very much for this large contribution, I think this the DDS algorithm is ready to merge now, as it has proven to provide the same results as the original matlab version. Good job :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a new PR based on: #185 where some mistakes are fixed.