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.

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

[WIP] DDS new algorithm #185

Closed
wants to merge 14 commits into from
Closed

Conversation

bees4ever
Copy link
Contributor

Pull request, first version, for discuss. Please do not merge immediately.

* 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
@coveralls
Copy link

coveralls commented Sep 21, 2018

Pull Request Test Coverage Report for Build 601

  • 233 of 248 (93.95%) changed or added relevant lines in 7 files are covered.
  • 20 unchanged lines in 6 files lost coverage.
  • Overall coverage increased (+0.4%) to 90.538%

Changes Missing Coverage Covered Lines Changed/Added Lines %
spotpy/unittests/test_dds.py 70 73 95.89%
spotpy/tools/fixedrandom.py 44 49 89.8%
spotpy/algorithms/dds.py 115 122 94.26%
Files with Coverage Reduction New Missed Lines %
spotpy/database.py 1 88.04%
spotpy/algorithms/_algorithm.py 2 85.88%
spotpy/algorithms/demcz.py 3 91.99%
spotpy/describe.py 4 90.22%
spotpy/parameter.py 4 97.07%
spotpy/algorithms/dream.py 6 92.0%
Totals Coverage Status
Change from base Build 588: 0.4%
Covered Lines: 4995
Relevant Lines: 5517

💛 - Coveralls

if i_left <= 0:
raise ValueError('# Initialization samples >= Max # function evaluations.')

starting_generator = (
Copy link
Collaborator

Choose a reason for hiding this comment

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

Use self.parameter() distribution function. Maybe we need to write a parameter.Discrete distribution

@bees4ever
Copy link
Contributor Author

I messed up a commit, so I started a new PR, see: #195.

@philippkraft philippkraft changed the title DDS new algorithm [WIP] DDS new algorithm Nov 1, 2018
@bees4ever bees4ever closed this Nov 6, 2018
@bees4ever bees4ever deleted the DDS_new_algorithm branch November 11, 2018 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants