Demos fixed for Diff4th

TomographicImaging · Feb 7, 2019 · 88a818c · 88a818c
1 parent 49b2f86
commit 88a818c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/Wrappers/Python/demos/demo_cpu_regularisers.py b/Wrappers/Python/demos/demo_cpu_regularisers.py
@@ -12,7 +12,7 @@
 import numpy as np
 import os
 import timeit
-from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, TNV, NDF, DIFF4th
+from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, TNV, NDF, Diff4th
 from ccpi.filters.regularisers import PatchSelect, NLTV
 from qualitymetrics import rmse
 ###############################################################################
@@ -358,23 +358,23 @@ def printParametersToString(pars):
 
 ## plot 
 fig = plt.figure()
-plt.suptitle('Performance of DIFF4th regulariser using the CPU')
+plt.suptitle('Performance of Diff4th regulariser using the CPU')
 a=fig.add_subplot(1,2,1)
 a.set_title('Noisy Image')
 imgplot = plt.imshow(u0,cmap="gray")
 
 # set parameters
-pars = {'algorithm' : DIFF4th, \
+pars = {'algorithm' : Diff4th, \
         'input' : u0,\
         'regularisation_parameter':3.5, \
         'edge_parameter':0.02,\
         'number_of_iterations' :500 ,\
         'time_marching_parameter':0.0015
         }
 
-print ("#############DIFF4th CPU################")
+print ("#############Diff4th CPU################")
 start_time = timeit.default_timer()
-diff4_cpu = DIFF4th(pars['input'], 
+diff4_cpu = Diff4th(pars['input'], 
               pars['regularisation_parameter'],
               pars['edge_parameter'], 
               pars['number_of_iterations'],

diff --git a/Wrappers/Python/demos/demo_cpu_regularisers3D.py b/Wrappers/Python/demos/demo_cpu_regularisers3D.py
@@ -12,7 +12,7 @@
 import numpy as np
 import os
 import timeit
-from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, LLT_ROF, FGP_dTV, NDF, DIFF4th
+from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, LLT_ROF, FGP_dTV, NDF, Diff4th
 from qualitymetrics import rmse
 ###############################################################################
 def printParametersToString(pars):
@@ -322,17 +322,17 @@ def printParametersToString(pars):
 imgplot = plt.imshow(noisyVol[10,:,:],cmap="gray")
 
 # set parameters
-pars = {'algorithm' : DIFF4th, \
+pars = {'algorithm' : Diff4th, \
         'input' : noisyVol,\
         'regularisation_parameter':3.5, \
         'edge_parameter':0.02,\
         'number_of_iterations' :300 ,\
         'time_marching_parameter':0.0015
         }
 
-print ("#############DIFF4th CPU################")
+print ("#############Diff4th CPU################")
 start_time = timeit.default_timer()
-diff4th_cpu3D = DIFF4th(pars['input'], 
+diff4th_cpu3D = Diff4th(pars['input'], 
               pars['regularisation_parameter'],
               pars['edge_parameter'], 
               pars['number_of_iterations'],

diff --git a/Wrappers/Python/demos/demo_cpu_vs_gpu_regularisers.py b/Wrappers/Python/demos/demo_cpu_vs_gpu_regularisers.py
@@ -12,7 +12,7 @@
 import numpy as np
 import os
 import timeit
-from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, NDF, DIFF4th
+from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, NDF, Diff4th
 from ccpi.filters.regularisers import PatchSelect
 from qualitymetrics import rmse
 ###############################################################################
@@ -570,7 +570,7 @@ def printParametersToString(pars):
 imgplot = plt.imshow(u0,cmap="gray")
 
 # set parameters
-pars = {'algorithm' : DIFF4th, \
+pars = {'algorithm' : Diff4th, \
         'input' : u0,\
         'regularisation_parameter':3.5, \
         'edge_parameter':0.02,\
@@ -580,7 +580,7 @@ def printParametersToString(pars):
 
 print ("#############Diff4th CPU####################")
 start_time = timeit.default_timer()
-diff4th_cpu = DIFF4th(pars['input'], 
+diff4th_cpu = Diff4th(pars['input'], 
               pars['regularisation_parameter'],
               pars['edge_parameter'], 
               pars['number_of_iterations'],
@@ -604,15 +604,15 @@ def printParametersToString(pars):
 
 print ("##############Diff4th GPU##################")
 start_time = timeit.default_timer()
-diff4th_gpu = DIFF4th(pars['input'], 
+diff4th_gpu = Diff4th(pars['input'], 
               pars['regularisation_parameter'],
               pars['edge_parameter'], 
               pars['number_of_iterations'],
               pars['time_marching_parameter'], 'gpu')
 
 rms = rmse(Im, diff4th_gpu)
 pars['rmse'] = rms
-pars['algorithm'] = DIFF4th
+pars['algorithm'] = Diff4th
 txtstr = printParametersToString(pars)
 txtstr += "%s = %.3fs" % ('elapsed time',timeit.default_timer() - start_time)
 print (txtstr)

diff --git a/Wrappers/Python/demos/demo_gpu_regularisers.py b/Wrappers/Python/demos/demo_gpu_regularisers.py
@@ -12,7 +12,7 @@
 import numpy as np
 import os
 import timeit
-from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, NDF, DIFF4th
+from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, NDF, Diff4th
 from ccpi.filters.regularisers import PatchSelect, NLTV
 from qualitymetrics import rmse
 ###############################################################################
@@ -355,13 +355,13 @@ def printParametersToString(pars):
 
 ## plot 
 fig = plt.figure()
-plt.suptitle('Performance of DIFF4th regulariser using the GPU')
+plt.suptitle('Performance of Diff4th regulariser using the GPU')
 a=fig.add_subplot(1,2,1)
 a.set_title('Noisy Image')
 imgplot = plt.imshow(u0,cmap="gray")
 
 # set parameters
-pars = {'algorithm' : DIFF4th, \
+pars = {'algorithm' : Diff4th, \
         'input' : u0,\
         'regularisation_parameter':3.5, \
         'edge_parameter':0.02,\
@@ -371,7 +371,7 @@ def printParametersToString(pars):
 
 print ("#############DIFF4th CPU################")
 start_time = timeit.default_timer()
-diff4_gpu = DIFF4th(pars['input'], 
+diff4_gpu = Diff4th(pars['input'], 
               pars['regularisation_parameter'],
               pars['edge_parameter'], 
               pars['number_of_iterations'],

diff --git a/Wrappers/Python/demos/demo_gpu_regularisers3D.py b/Wrappers/Python/demos/demo_gpu_regularisers3D.py
@@ -12,7 +12,7 @@
 import numpy as np
 import os
 import timeit
-from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, LLT_ROF, FGP_dTV, NDF, DIFF4th
+from ccpi.filters.regularisers import ROF_TV, FGP_TV, SB_TV, LLT_ROF, FGP_dTV, NDF, Diff4th
 from qualitymetrics import rmse
 ###############################################################################
 def printParametersToString(pars):
@@ -326,7 +326,7 @@ def printParametersToString(pars):
 imgplot = plt.imshow(noisyVol[10,:,:],cmap="gray")
 
 # set parameters
-pars = {'algorithm' : DIFF4th, \
+pars = {'algorithm' : Diff4th, \
         'input' : noisyVol,\
         'regularisation_parameter':3.5, \
         'edge_parameter':0.02,\
@@ -336,7 +336,7 @@ def printParametersToString(pars):
 
 print ("#############DIFF4th CPU################")
 start_time = timeit.default_timer()
-diff4_gpu3D = DIFF4th(pars['input'], 
+diff4_gpu3D = Diff4th(pars['input'], 
               pars['regularisation_parameter'],
               pars['edge_parameter'], 
               pars['number_of_iterations'],