Merge pull request #10 from pastas/dev

Release 0.2.0

metran/kalmanfilter.py

@@ -579,12 +579,16 @@ def decompose(self, observation_matrix, method="smoother"):
         for t, _ in enumerate(means):
             sdf_means.append(np.dot(observation_matrix[:, :nsdf],
                                     means[t, :nsdf]))
-        cdf_means = [[]] * ncdf
+
+        cdf_means = []
         for k in range(ncdf):
             idx = nsdf + k
+            cdf_means_cdf = []
             for t, _ in enumerate(means):
-                cdf_means[k].append(np.dot(observation_matrix[:, idx],
+                cdf_means_cdf.append(np.dot(observation_matrix[:, idx],
                                            means[t, idx]))
+
+            cdf_means.append(cdf_means_cdf)
         return (sdf_means, cdf_means)
 
     def set_observations(self, oseries):

metran/plots.py

@@ -2,7 +2,12 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from pandas import Timestamp
-from pastas.plots import _get_height_ratios
+from pastas import __version__ as psversion
+
+if psversion < '0.19.0':
+    from pastas.plots import _get_height_ratios
+else:
+    from pastas.modelplots import _get_height_ratios
 
 
 class MetranPlot:
@@ -25,7 +30,7 @@ def scree_plot(self):
         ax.plot(n_ev, self.mt.eigval, marker="o", ms=7, mfc="none", c="C3")
         ax.bar(n_ev, self.mt.eigval, facecolor="none",
                edgecolor="C0", linewidth=2)
-        ax.grid(b=True)
+        ax.grid(visible=True)
         ax.set_xticks(n_ev)
         ax.set_ylabel("eigenvalue")
         ax.set_xlabel("eigenvalue number")
@@ -94,7 +99,7 @@ def state_means(self, tmin=None, tmax=None, adjust_height=True):
 
             states.loc[:, col].plot(ax=iax, label=lbl, color=c)
             iax.legend(loc=(0, 1), ncol=3, frameon=False, numpoints=3)
-            iax.grid(b=True)
+            iax.grid(visible=True)
 
             if adjust_height:
                 iax.set_ylim(ylims[i])
@@ -149,7 +154,7 @@ def simulation(self, name, alpha=0.05, tmin=None, tmax=None, ax=None):
             ax.fill_between(sim.index, sim["lower"], sim["upper"], color="gray",
                             alpha=0.5, label="95%-confidence interval")
         ax.legend(loc=(0, 1), ncol=3, frameon=False, numpoints=3)
-        ax.grid(b=True)
+        ax.grid(visible=True)
         ax.set_xlim(tmin, tmax)
 
         if ax is None:
@@ -277,7 +282,7 @@ def decomposition(self, name, tmin=None, tmax=None, ax=None,
             iax.plot(s.index, s, label=f"{col} {name}", color=c, zorder=zorder)
 
             # grid and legend
-            iax.grid(b=True)
+            iax.grid(visible=True)
             iax.legend(loc=(0, 1), ncol=3, frameon=False, numpoints=3)
 
             # set ylimits

metran/version.py

@@ -1,3 +1,3 @@
 # This is the only location where the version will be written and changed.
 # Based on https://packaging.python.org/single_source_version/
-__version__ = '0.1.2'
+__version__ = '0.2.0'