visualization/matplotlib-matrix.cc: check with is_inf + fix vmin/vmax

roboptim · Jun 26, 2015 · 4ffe992 · 4ffe992
1 parent e915061
commit 4ffe992
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/visualization/matplotlib-matrix.cc b/src/visualization/matplotlib-matrix.cc
@@ -96,8 +96,8 @@ namespace roboptim
             ss << set_cmap
                << "cmap.set_bad('w',1.)\n"
                << "log_data = np.log10(abs(data))\n"
-               << "masked_data = np.ma.array (log_data, mask=np.isnan(log_data))\n"
-               << "crange = log_data.max()\n"
+               << "masked_data = np.ma.array (log_data, mask=np.isinf(log_data))\n"
+               << "crange = abs(masked_data).max()\n"
                << "im = plt.imshow(masked_data, interpolation='nearest', cmap=cmap, vmin=-crange, vmax=crange)\n"
                << "cbar = plt.colorbar(im)\n"
                << "cbar.draw_all()\n";
@@ -153,8 +153,8 @@ namespace roboptim
             ss << set_cmap
                << "cmap.set_bad('w',1.)\n"
                << "log_data = np.log10(abs(data))\n"
-               << "masked_data = np.ma.array (log_data, mask=np.isnan(log_data))\n"
-               << "crange = log_data.max()\n"
+               << "masked_data = np.ma.array (log_data, mask=np.isinf(log_data))\n"
+               << "crange = abs(masked_data).max()\n"
                << "im = plt.imshow(masked_data, interpolation='nearest', cmap=cmap, vmin=-crange, vmax=crange)\n"
                << "cbar = plt.colorbar(im)\n"
                << "cbar.draw_all()\n";

diff --git a/tests/visualization-matplotlib-matrix.stdout b/tests/visualization-matplotlib-matrix.stdout
@@ -84,8 +84,8 @@ cmap = matplotlib.colors.LinearSegmentedColormap.from_list(
                   (1, 0, 0)])
 cmap.set_bad('w',1.)
 log_data = np.log10(abs(data))
-masked_data = np.ma.array (log_data, mask=np.isnan(log_data))
-crange = log_data.max()
+masked_data = np.ma.array (log_data, mask=np.isinf(log_data))
+crange = abs(masked_data).max()
 im = plt.imshow(masked_data, interpolation='nearest', cmap=cmap, vmin=-crange, vmax=crange)
 cbar = plt.colorbar(im)
 cbar.draw_all()
@@ -125,8 +125,8 @@ cmap = matplotlib.colors.LinearSegmentedColormap.from_list(
                   (1, 0, 0)])
 cmap.set_bad('w',1.)
 log_data = np.log10(abs(data))
-masked_data = np.ma.array (log_data, mask=np.isnan(log_data))
-crange = log_data.max()
+masked_data = np.ma.array (log_data, mask=np.isinf(log_data))
+crange = abs(masked_data).max()
 im = plt.imshow(masked_data, interpolation='nearest', cmap=cmap, vmin=-crange, vmax=crange)
 cbar = plt.colorbar(im)
 cbar.draw_all()