From cfcc4be4413f65a0b9c4ef197687e3a167eff0e8 Mon Sep 17 00:00:00 2001
From: Daniil Kazantsev <dkazanc@hotmail.com>
Date: Wed, 6 Mar 2019 23:34:55 +0000
Subject: cont1

---
 demos/SoftwareX_supp/Demo_VolumeDenoise.py | 44 ++++++++++++++++--------------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'demos/SoftwareX_supp')

diff --git a/demos/SoftwareX_supp/Demo_VolumeDenoise.py b/demos/SoftwareX_supp/Demo_VolumeDenoise.py
index 17cdf4d..6e7ea46 100644
--- a/demos/SoftwareX_supp/Demo_VolumeDenoise.py
+++ b/demos/SoftwareX_supp/Demo_VolumeDenoise.py
@@ -120,19 +120,21 @@ print("ROF-TV (gpu) ____ RMSE: {}, MMSIM: {}, run time: {} sec".format(RMSE_rof,
 #%%
 print ("#############FGP TV CPU####################")
 # set parameters
-pars = {'algorithm':FGP_TV, \
+pars =  {'algorithm' : FGP_TV, \
         'input' : phantom_noise,\
-        'regularisation_parameter':0.04,\
-        'number_of_iterations': 300,\
-        'time_marching_parameter': 0.0025,\
-        'tolerance_constant':1e-05,\
-        }
+        'regularisation_parameter':0.05, \
+        'number_of_iterations' :100 ,\
+        'tolerance_constant':1e-04,\
+        'methodTV': 0 ,\
+        'nonneg': 0}
 
 tic=timeit.default_timer()
-fgp_cpu3D = FGP_TV(pars['input'],
-             pars['regularisation_parameter'],
-             pars['number_of_iterations'],
-             pars['time_marching_parameter'],'cpu')
+(fgp_cpu3D, infoFGP) = FGP_TV(pars['input'], 
+              pars['regularisation_parameter'],
+              pars['number_of_iterations'],
+              pars['tolerance_constant'], 
+              pars['methodTV'],
+              pars['nonneg'],'cpu')
 toc=timeit.default_timer()
 
 Run_time_fgp = toc - tic
@@ -149,19 +151,21 @@ print("FGP-TV (cpu) ____ RMSE: {}, MMSIM: {}, run time: {} sec".format(RMSE_rof,
 #%%
 print ("#############FGP TV GPU####################")
 # set parameters
-pars = {'algorithm':FGP_TV, \
+pars = {'algorithm' : FGP_TV, \
         'input' : phantom_noise,\
-        'regularisation_parameter':0.04,\
-        'number_of_iterations': 300,\
-        'time_marching_parameter': 0.0025,\
-        'tolerance_constant':1e-05,\
-        }
+        'regularisation_parameter':0.05, \
+        'number_of_iterations' :80 ,\
+        'tolerance_constant':1e-04,\
+        'methodTV': 0 ,\
+        'nonneg': 0}
 
 tic=timeit.default_timer()
-fgp_gpu3D = FGP_TV(pars['input'],
-             pars['regularisation_parameter'],
-             pars['number_of_iterations'],
-             pars['time_marching_parameter'],'gpu')
+(fgp_gpu3D)  = FGP_TV(pars['input'], 
+              pars['regularisation_parameter'],
+              pars['number_of_iterations'],
+              pars['tolerance_constant'], 
+              pars['methodTV'],
+              pars['nonneg'],'gpu')
 toc=timeit.default_timer()
 
 Run_time_fgp = toc - tic
-- 
cgit v1.2.3