summaryrefslogtreecommitdiffstats
path: root/Wrappers
diff options
context:
space:
mode:
authorDaniil Kazantsev <dkazanc@hotmail.com>2018-02-25 17:54:03 +0000
committerDaniil Kazantsev <dkazanc@hotmail.com>2018-02-25 17:54:03 +0000
commit0ebf1f949b7150692e356627c455e905b642af97 (patch)
tree9e05617567490e7d4d179858c98aa87c6479d1f6 /Wrappers
parentd4d12945f5396b10259fdeeb2b09f99b0e2c6afd (diff)
downloadregularization-0ebf1f949b7150692e356627c455e905b642af97.tar.gz
regularization-0ebf1f949b7150692e356627c455e905b642af97.tar.bz2
regularization-0ebf1f949b7150692e356627c455e905b642af97.tar.xz
regularization-0ebf1f949b7150692e356627c455e905b642af97.zip
updates to CPU/GPU core for ROF and demos
Diffstat (limited to 'Wrappers')
-rw-r--r--Wrappers/Python/demo/test_cpu_regularizers.py6
-rw-r--r--Wrappers/Python/test/test_cpu_vs_gpu_regularizers.py6
-rw-r--r--Wrappers/Python/test/test_gpu_regularizers.py6
3 files changed, 9 insertions, 9 deletions
diff --git a/Wrappers/Python/demo/test_cpu_regularizers.py b/Wrappers/Python/demo/test_cpu_regularizers.py
index d147b85..b08c418 100644
--- a/Wrappers/Python/demo/test_cpu_regularizers.py
+++ b/Wrappers/Python/demo/test_cpu_regularizers.py
@@ -284,9 +284,9 @@ start_time = timeit.default_timer()
pars = {'algorithm': ROF_TV , \
'input' : u0,\
- 'regularization_parameter':25,\
- 'marching_step': 0.001,\
- 'number_of_iterations': 350
+ 'regularization_parameter':0.04,\
+ 'marching_step': 0.0025,\
+ 'number_of_iterations': 300
}
rof = ROF_TV(pars['input'],
pars['number_of_iterations'],
diff --git a/Wrappers/Python/test/test_cpu_vs_gpu_regularizers.py b/Wrappers/Python/test/test_cpu_vs_gpu_regularizers.py
index 8c91c73..d742a7f 100644
--- a/Wrappers/Python/test/test_cpu_vs_gpu_regularizers.py
+++ b/Wrappers/Python/test/test_cpu_vs_gpu_regularizers.py
@@ -58,8 +58,8 @@ imgplot = plt.imshow(u0,cmap="gray")
# set parameters
pars = {'algorithm': ROF_TV , \
'input' : u0,\
- 'regularization_parameter':12,\
- 'time_marching_parameter': 0.001,\
+ 'regularization_parameter':0.04,\
+ 'time_marching_parameter': 0.0025,\
'number_of_iterations': 600
}
print ("#################ROF TV CPU#####################")
@@ -120,4 +120,4 @@ plt.title('{}'.format('Pixels larger threshold difference'))
if (diff_im.sum() > 1):
print ("Arrays do not match!")
else:
- print ("Arrays match") \ No newline at end of file
+ print ("Arrays match")
diff --git a/Wrappers/Python/test/test_gpu_regularizers.py b/Wrappers/Python/test/test_gpu_regularizers.py
index 29f5bad..c473270 100644
--- a/Wrappers/Python/test/test_gpu_regularizers.py
+++ b/Wrappers/Python/test/test_gpu_regularizers.py
@@ -154,9 +154,9 @@ start_time = timeit.default_timer()
pars = {
'algorithm' : GPU_ROF_TV , \
'input' : u0,
- 'regularization_parameter': 25,\
- 'time_marching_parameter': 0.001, \
- 'number_of_iterations':350
+ 'regularization_parameter': 0.04,\
+ 'time_marching_parameter': 0.0025, \
+ 'number_of_iterations':300
}
rof_tv = GPU_ROF_TV(pars['input'],