Merge pull request #30 from JannisHoch/leave_one_out

checking model params and adding scaler-model combo pipeline
JannisHoch · Jul 15, 2020 · 250d2ca · 250d2ca
2 parents 004a3bd + 94fc3ef
commit 250d2ca
Show file tree

Hide file tree

Showing 7 changed files with 601 additions and 1,171 deletions.
diff --git a/conflict_model/__init__.py b/conflict_model/__init__.py
@@ -7,4 +7,4 @@
 
 __author__ = """Jannis M. Hoch"""
 __email__ = 'j.m.hoch@uu.nl'
-__version__ = '0.0.2b3'
+__version__ = '0.0.2'
diff --git a/data/run_setting.cfg b/data/run_setting.cfg
@@ -1,6 +1,6 @@
 [general]
-input_dir=..\data
-output_dir=..\data\OUT
+input_dir=../data
+output_dir=../data\OUT
 
 [settings]
 y_start=2000

diff --git a/environment.yml b/environment.yml
@@ -24,6 +24,7 @@ dependencies:
   - netcdf4
   - ConfigParser
   - click
+  - seaborn
   - pip
   - pip:
     - rasterstats>=0.14.0

diff --git a/example/example_notebook.html b/example/example_notebook.html
diff --git a/example/example_notebook.ipynb b/example/example_notebook.ipynb
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.2b3
+current_version = 0.0.2
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
@@ -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,
 )