From 1e1cb09adf07f0351557d3bf8011c9fc3e1b4628 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 27 Nov 2019 10:31:23 +0100 Subject: Fix #150 axes has no attribute colorbar --- src/python/gudhi/persistence_graphical_tools.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/python') diff --git a/src/python/gudhi/persistence_graphical_tools.py b/src/python/gudhi/persistence_graphical_tools.py index c9dab323..7d232c85 100644 --- a/src/python/gudhi/persistence_graphical_tools.py +++ b/src/python/gudhi/persistence_graphical_tools.py @@ -369,7 +369,6 @@ def plot_persistence_density( persistence_dim = read_persistence_intervals_in_dimension( persistence_file=persistence_file, only_this_dim=dimension ) - print(persistence_dim) else: print("file " + persistence_file + " not found.") return None @@ -417,10 +416,10 @@ def plot_persistence_density( zi = k(np.vstack([xi.flatten(), yi.flatten()])) # Make the plot - axes.pcolormesh(xi, yi, zi.reshape(xi.shape), cmap=cmap) + img = axes.pcolormesh(xi, yi, zi.reshape(xi.shape), cmap=cmap) if legend: - axes.colorbar() + plt.colorbar(img, ax=axes) axes.set_xlabel("Birth") axes.set_ylabel("Death") -- cgit v1.2.3 From ae13d5bbcd83baa9b814b061c04b50c5c31bfc78 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 27 Nov 2019 14:01:56 +0100 Subject: Fix #112 density side by side with its diagram --- src/python/doc/persistence_graphical_tools_user.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/python') diff --git a/src/python/doc/persistence_graphical_tools_user.rst b/src/python/doc/persistence_graphical_tools_user.rst index 2de99252..e4419bc1 100644 --- a/src/python/doc/persistence_graphical_tools_user.rst +++ b/src/python/doc/persistence_graphical_tools_user.rst @@ -67,10 +67,17 @@ If you want more information on a specific dimension, for instance: import matplotlib.pyplot as plot import gudhi - # rips_on_tore3D_1307.pers obtained from write_persistence_diagram method persistence_file=gudhi.__root_source_dir__ + \ '/data/persistence_diagram/rips_on_tore3D_1307.pers' - gudhi.plot_persistence_density(persistence_file=persistence_file, - max_intervals=0, dimension=1, legend=True) + birth_death = gudhi.read_persistence_intervals_in_dimension( + persistence_file=persistence_file, + only_this_dim=1) + pers_diag = [(1, (elt[0], elt[1])) for elt in birth_death] + # Use subplots to display diagram and density side by side + fig, axes = plot.subplots(nrows=1, ncols=2, figsize=(12, 5)) + gudhi.plot_persistence_diagram(persistence=pers_diag, + axes=axes[0]) + gudhi.plot_persistence_density(persistence=pers_diag, + dimension=1, legend=True, axes=axes[1]) plot.show() -- cgit v1.2.3 From dbb5183230e4b16bd36c5d582ef82e880741f149 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 27 Nov 2019 21:53:31 +0100 Subject: Code review : for loop simplification --- src/python/doc/persistence_graphical_tools_user.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/python') diff --git a/src/python/doc/persistence_graphical_tools_user.rst b/src/python/doc/persistence_graphical_tools_user.rst index e4419bc1..f41a926b 100644 --- a/src/python/doc/persistence_graphical_tools_user.rst +++ b/src/python/doc/persistence_graphical_tools_user.rst @@ -73,7 +73,7 @@ If you want more information on a specific dimension, for instance: birth_death = gudhi.read_persistence_intervals_in_dimension( persistence_file=persistence_file, only_this_dim=1) - pers_diag = [(1, (elt[0], elt[1])) for elt in birth_death] + pers_diag = [(1, elt) for elt in birth_death] # Use subplots to display diagram and density side by side fig, axes = plot.subplots(nrows=1, ncols=2, figsize=(12, 5)) gudhi.plot_persistence_diagram(persistence=pers_diag, -- cgit v1.2.3