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

checking model params and adding scaler-model combo pipeline #30

Merged
merged 8 commits into from
Jul 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conflict_model/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

__author__ = """Jannis M. Hoch"""
__email__ = 'j.m.hoch@uu.nl'
__version__ = '0.0.2b3'
__version__ = '0.0.2'
4 changes: 2 additions & 2 deletions data/run_setting.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[general]
input_dir=..\data
output_dir=..\data\OUT
input_dir=../data
output_dir=../data\OUT

[settings]
y_start=2000
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dependencies:
- netcdf4
- ConfigParser
- click
- seaborn
- pip
- pip:
- rasterstats>=0.14.0
Expand Down
890 changes: 224 additions & 666 deletions example/example_notebook.html

Large diffs are not rendered by default.

871 changes: 371 additions & 500 deletions example/example_notebook.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.0.2b3
current_version = 0.0.2
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
test_suite='tests',
tests_require=test_requirements,
url='https://github.com/JannisHoch/conflict_model',
version='0.0.2b3',
version='0.0.2',
zip_safe=False,
)