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

Variogram fitting update #78

Merged
merged 32 commits into from
Apr 21, 2020
Merged

Variogram fitting update #78

merged 32 commits into from
Apr 21, 2020

Conversation

MuellerSeb
Copy link
Member

@MuellerSeb MuellerSeb commented Apr 14, 2020 •
edited
Loading

This PR introduces an updated variogram fitting routine:

  • fixing sill possible now
  • loss is now selectable for smoother handling of outliers
  • r2 score can now be returned to get an impression of the goodness of fitting
  • weights can be passed
  • instead of deselecting parameters, one can also give fix values for each parameter

Also:

  • minor doc fixes
  • skip travis builds for PRs from our own repo
  • better setting of bounds in CovModel

MuellerSeb added 20 commits March 28, 2020 17:34
@MuellerSeb
CovModel: set default default_values for opt-args to 0
178298b
@MuellerSeb
covmodel: better check for opt-args in init
b878826
@MuellerSeb
tests: blackened again
f4d7f99
@MuellerSeb
Examples: add example to find best variogram model
d6fd0cb
@MuellerSeb
examples: blackened again
2eb23be
@MuellerSeb
covmodels: add formula for integral scale of rational and stable models
bcd0836
@MuellerSeb
covmodel: update the fitting routine; more finetuning possible now; c…
0fb9b11 
…alc r2 score possible
@MuellerSeb
examples: update best model example with auto calc r2
50e2a52
@MuellerSeb
variogram: fix cressie bug
0649e61
@MuellerSeb
tests: fix cressie tests
cbcef65
@MuellerSeb
tests: better plotting for sphinx [skip ci]
309428a
@MuellerSeb
covmodel: separate function to check if arg in bounds of model
7d4bc26
@MuellerSeb
covmodel fit: allow fixing the sill of the model during estimation
b17b476
@MuellerSeb
covmodel fit: better flag name if sill is constrained
2ddd396
@MuellerSeb
covmodel fit: allow specifying fixed values for each parameter
651b817
@MuellerSeb
covmodel plot: determine plot range by len_scale not int_scale
912b641
@MuellerSeb
covmodel: saver calculation of spectral_rad_pdf by taking abs values …
5cc4abd 
…of spec_dens
@MuellerSeb
variogram: updated DOC (cressie correction)
fad698b
@MuellerSeb
covmodel.tools: better setting for angles
15e2d80
@MuellerSeb
RNG.sample_sphere: allow arbitrary dim; better check for passed size
a856ea2
@MuellerSeb MuellerSeb added enhancement New feature or request Refactoring Code-Refactoring needed here labels Apr 14, 2020
@MuellerSeb MuellerSeb added this to the 1.3 milestone Apr 14, 2020
@MuellerSeb MuellerSeb requested a review from LSchueler April 14, 2020 16:21
@MuellerSeb MuellerSeb self-assigned this Apr 14, 2020
@MuellerSeb MuellerSeb changed the title Vario fit update Variogram fitting update Apr 14, 2020
MuellerSeb
MuellerSeb commented Apr 20, 2020
View reviewed changes
Copy link
Member Author

@MuellerSeb MuellerSeb left a comment

Choose a reason for hiding this comment

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

I am fine.

@MuellerSeb
Copy link
Member Author

@LSchueler : When you are ok with that, I would merge.

LSchueler
LSchueler approved these changes Apr 20, 2020
View reviewed changes
Copy link
Member

@LSchueler LSchueler left a comment

Choose a reason for hiding this comment

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

The fit_variogram function is veeery long. If you promise to refactor it some time, then I'm fine with a merge right now ;-)

gstools/covmodel/fit.py Show resolved Hide resolved
gstools/covmodel/fit.py Show resolved Hide resolved
@MuellerSeb
Copy link
Member Author

The fit_variogram function is veeery long. If you promise to refactor it some time, then I'm fine with a merge right now ;-)

Refactored. You were totally right!

MuellerSeb
MuellerSeb commented Apr 21, 2020
View reviewed changes
Copy link
Member Author

@MuellerSeb MuellerSeb left a comment

Choose a reason for hiding this comment

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

Finally. Merging when CI is fine.

@MuellerSeb MuellerSeb merged commit d8b5a3f into develop Apr 21, 2020
@MuellerSeb MuellerSeb deleted the vario_fit_update branch April 29, 2020 17:11
@MuellerSeb MuellerSeb mentioned this pull request Apr 7, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LSchueler LSchueler LSchueler approved these changes

Assignees

@MuellerSeb MuellerSeb

Labels
enhancement New feature or request Refactoring Code-Refactoring needed here
Projects
None yet
Milestone
1.3
Development

Successfully merging this pull request may close these issues.
2 participants
@MuellerSeb @LSchueler