From 83250cee1deff04c34d5ed9ad2d9dbde09cadcf6 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Fri, 25 Aug 2017 17:04:44 +0100
Subject: minor changes

---
 src/Python/test_regularizers.py | 60 +++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/Python/test_regularizers.py b/src/Python/test_regularizers.py
index 755804a..d0bccaf 100644
--- a/src/Python/test_regularizers.py
+++ b/src/Python/test_regularizers.py
@@ -46,7 +46,9 @@ def nrmse(im1, im2):
 # u0 = Im + .05*randn(size(Im)); u0(u0 < 0) = 0;
 # u = SplitBregman_TV(single(u0), 10, 30, 1e-04);
 
-filename = r"C:\Users\ofn77899\Documents\GitHub\CCPi-FISTA_reconstruction\data\lena_gray_512.tif"
+#filename = r"C:\Users\ofn77899\Documents\GitHub\CCPi-FISTA_reconstruction\data\lena_gray_512.tif"
+filename = r"/home/ofn77899/Reconstruction/CCPi-FISTA_Reconstruction/data/lena_gray_512.tif"
+
 reader = vtk.vtkTIFFReader()
 reader.SetFileName(os.path.normpath(filename))
 reader.Update()
@@ -163,24 +165,24 @@ imgplot = plt.imshow(reg_output[-1][0])
 # #   u0 = Im + .03*randn(size(Im)); u0(u0<0) = 0; % adding noise
 # #   ImDen = PB_Regul_CPU(single(u0), 3, 1, 0.08, 0.05); 
 
-# out2 = Regularizer.PatchBased_Regul(input=u0, regularization_parameter=0.05,
-                          # searching_window_ratio=3,
-                          # similarity_window_ratio=1,
-                          # PB_filtering_parameter=0.08)
-# pars = out2[-2]
-# reg_output.append(out2)
+out2 = Regularizer.PatchBased_Regul(input=u0, regularization_parameter=0.05,
+                          searching_window_ratio=3,
+                          similarity_window_ratio=1,
+                          PB_filtering_parameter=0.08)
+pars = out2[-2]
+reg_output.append(out2)
 
-# a=fig.add_subplot(2,3,5)
+a=fig.add_subplot(2,3,5)
 
 
-# textstr = out2[-1]
+textstr = out2[-1]
 
-# # these are matplotlib.patch.Patch properties
-# props = dict(boxstyle='round', facecolor='wheat', alpha=0.5)
-# # place a text box in upper left in axes coords
-# a.text(0.05, 0.95, textstr, transform=a.transAxes, fontsize=14,
-        # verticalalignment='top', bbox=props)
-# imgplot = plt.imshow(reg_output[-1][0])
+# these are matplotlib.patch.Patch properties
+props = dict(boxstyle='round', facecolor='wheat', alpha=0.5)
+# place a text box in upper left in axes coords
+a.text(0.05, 0.95, textstr, transform=a.transAxes, fontsize=14,
+        verticalalignment='top', bbox=props)
+imgplot = plt.imshow(reg_output[-1][0])
 
 
 # ###################### TGV_PD #########################################
@@ -190,25 +192,25 @@ imgplot = plt.imshow(reg_output[-1][0])
 # #   u = PrimalDual_TGV(single(u0), 0.02, 1.3, 1, 550);
 
 
-# out2 = Regularizer.TGV_PD(input=u0, regularization_parameter=0.05,
-                          # first_order_term=1.3,
-                          # second_order_term=1,
-                          # number_of_iterations=550)
-# pars = out2[-2]
-# reg_output.append(out2)
+out2 = Regularizer.TGV_PD(input=u0, regularization_parameter=0.05,
+                          first_order_term=1.3,
+                          second_order_term=1,
+                          number_of_iterations=550)
+pars = out2[-2]
+reg_output.append(out2)
 
-# a=fig.add_subplot(2,3,6)
+a=fig.add_subplot(2,3,6)
 
 
-# textstr = out2[-1]
+textstr = out2[-1]
 
 
-# # these are matplotlib.patch.Patch properties
-# props = dict(boxstyle='round', facecolor='wheat', alpha=0.5)
-# # place a text box in upper left in axes coords
-# a.text(0.05, 0.95, textstr, transform=a.transAxes, fontsize=14,
-        # verticalalignment='top', bbox=props)
-# imgplot = plt.imshow(reg_output[-1][0])
+# these are matplotlib.patch.Patch properties
+props = dict(boxstyle='round', facecolor='wheat', alpha=0.5)
+# place a text box in upper left in axes coords
+a.text(0.05, 0.95, textstr, transform=a.transAxes, fontsize=14,
+        verticalalignment='top', bbox=props)
+imgplot = plt.imshow(reg_output[-1][0])
 
 
 plt.show()
-- 
cgit v1.2.3