Merge branch 'master' into PADDS

* master:
  Update version number
  Add database folder to installation routine thouska#208
  Fix parameter trace plotting
  Bugfix for restart function

# Conflicts:
#	spotpy/__init__.py

.gitignore

@@ -10,6 +10,7 @@ __pycache__/
 *.out
 *.in
 *.png
+*.csv
 site/*
 mkdocs.yml
 

setup.py

@@ -5,7 +5,7 @@
 
 setup(
   name = 'spotpy',
-  version = '1.4.5',
+  version = '1.4.6',
   description = 'A Statistical Parameter Optimization Tool',
   long_description=open(os.path.join(os.path.dirname(__file__),
                                        "README.rst")).read(),
@@ -14,7 +14,8 @@
   url = 'http://www.uni-giessen.de/cms/faculties/f09/institutes/ilr/hydro/download/spotpy',
   license = 'MIT',
   packages = ["spotpy", "spotpy.examples", "spotpy.examples.hymod_python", "spotpy.examples.hymod_exe", 
-  "spotpy.examples.cmf_data", "spotpy.algorithms", "spotpy.parallel", "spotpy.gui", "spotpy.hydrology"],
+  "spotpy.examples.cmf_data", "spotpy.algorithms", "spotpy.parallel", "spotpy.gui", "spotpy.hydrology",
+  "spotpy.database"],
   package_data={
    'spotpy.examples.hymod_exe': ['*'],
    'spotpy.examples.hymod_python': ['*'],

spotpy/__init__.py

@@ -39,4 +39,4 @@
 from . import describe            # Contains some helper functions to describe smaplers and setups
 from .hydrology import signatures # Quantifies goodness of fit between simulation and evaluation data with hydrological signatures
 from . import unittests
-__version__ = '1.4.5'
+__version__ = '1.4.6'

spotpy/algorithms/fscabc.py

@@ -239,8 +239,8 @@ def sample(self, repetitions, eb=48, a=(1 / 10), peps=0.0001, kpow=5, ownlimit=F
 
             if self.breakpoint == 'write' or self.breakpoint == 'readandwrite'\
                     and icall >= lastbackup+self.backup_every_rep:
-                work = (icall, work, gnrng, r)
-                self.write_breakdata(self.dbname, work)
+                savework = (icall, work, gnrng, r)
+                self.write_breakdata(self.dbname, savework)
                 lastbackup = icall
             if icall >= repetitions:
                 print('*** OPTIMIZATION SEARCH TERMINATED BECAUSE THE LIMIT')

spotpy/analyser.py

@@ -598,17 +598,15 @@ def plot_objectivefunction(results,evaluation,limit=None,sort=True):
     else:
         plt.plot(bestlike)
 
-def plot_parametertrace_algorithms(results,algorithmnames=None,parameternames=None,xticks=[0,2000,4000]):
+def plot_parametertrace_algorithms(results,algorithmnames=None,parameternames=None):
     """Example Plot as seen in the SPOTPY Documentation"""
     import matplotlib.pyplot as plt
     from matplotlib import colors
-    cnames=list(colors.cnames)
     font = {'family' : 'calibri',
         'weight' : 'normal',
         'size'   : 20}
     plt.rc('font', **font)
     fig=plt.figure(figsize=(17,5))
-    rep=len(results[0])
     subplots=len(results)
     rows=2
     for j in range(rows):
@@ -627,22 +625,22 @@ def plot_parametertrace_algorithms(results,algorithmnames=None,parameternames=No
                 ax.set_xlabel(algorithmnames[i-subplots])
 
             ax.plot(data,'b-')
-            ax.plot([1]*rep,'r--')
-            ax.set_xlim(0,rep)
             ax.set_ylim(-50,50)
-            ax.xaxis.set_ticks(xticks)
             if i==0 and j==0:
                 ax.set_ylabel('x')
                 ax.yaxis.set_ticks([-50,0,50])
+                rep = len(data)
             if i==0 and j==1:
                 ax.set_ylabel('y')
                 ax.yaxis.set_ticks([-50,0,50])
             if j==0:
                 ax.xaxis.set_ticks([])
             if i>0:
                 ax.yaxis.set_ticks([])
-
-    plt.tight_layout()
+            ax.plot([1]*rep,'r--')
+            ax.set_xlim(0,rep)
+
+    #plt.tight_layout()
     fig.savefig('test2.png', bbox_inches='tight')