daviddoji/Kalman-and-Bayesian-Filters-in-Python
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #150 from dschuler/master

Browse Source 
Add 'Estimates' to legend

I added a comment header to the plotting routine, and renamed `retval` to `lines` (I prefer meaningful names whenever possible.
This commit is contained in:
Roger Labbe 2017-06-12 08:15:43 -07:00 committed by GitHub
commit 7fda1ccd01
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kf_book/book_plots.py
View File

@ -528,20 +528,18 @@ def plot_track(xs, ys=None, label='Track', c='k', lw=2, **kwargs):
def plot_filter(xs, ys=None, c='#013afe', label='Filter', var=None, **kwargs):
#def plot_filter(xs, ys=None, c='#6d904f', label='Filter', vars=None, **kwargs):
""" plot result of KF with color `c`, optionally displaying the variance
of `xs`. Returns the list of lines generated by plt.plot()"""
if ys is None:
ys = xs
xs = range(len(ys))
plt.plot(xs, ys, color=c, label=label, **kwargs)
lines = plt.plot(xs, ys, color=c, label=label, **kwargs)
if var is None:
return
return lines
var = np.asarray(var)
std = np.sqrt(var)
std_top = ys+std
std_btm = ys-std
@ -551,6 +549,8 @@ def plot_filter(xs, ys=None, c='#013afe', label='Filter', var=None, **kwargs):
plt.fill_between(xs, std_btm, std_top,
facecolor='yellow', alpha=0.2)
return lines
@ -625,4 +625,4 @@ if __name__ == "__main__":
'''p = [0.2245871, 0.06288015, 0.06109133, 0.0581008, 0.09334062, 0.2245871,
0.06288015, 0.06109133, 0.0581008, 0.09334062]*2
bar_plot(p)
plot_measurements(p)'''
plot_measurements(p)'''

4
kf_book/gh_internal.py
View File

@ -54,13 +54,13 @@ def plot_gh_results(weights, estimates, predictions, time_step=0):
plt.gcf().canvas.draw()
time.sleep(time_step)
book_plots.plot_filter(xs[:i+1], estimates[:i+1], marker='o')
est, = book_plots.plot_filter(xs[:i+1], estimates[:i+1], marker='o')
plt.xlim([-1, n+1])
plt.ylim([156.0, 173])
plt.gcf().canvas.draw()
time.sleep(time_step)
plt.legend([act, scale, pred], ['Actual Weight', 'Measurement', 'Predictions'], loc=4)
plt.legend([act, scale, est, pred], ['Actual Weight', 'Measurement', 'Estimates', 'Predictions'], loc=4)
book_plots.set_labels(x='day', y='weight (lbs)')