From b9fafd363d1d181a4a8b42ea4038924097207913 Mon Sep 17 00:00:00 2001
From: Daniil Kazantsev <dkazanc@hotmail.com>
Date: Mon, 9 Apr 2018 13:41:06 +0100
Subject: major renaming and new  3D demos for Matlab

---
 Wrappers/Python/ccpi/filters/regularisers.py | 44 ++++++++++++++++++++++++++++
 Wrappers/Python/ccpi/filters/regularizers.py | 44 ----------------------------
 2 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 Wrappers/Python/ccpi/filters/regularisers.py
 delete mode 100644 Wrappers/Python/ccpi/filters/regularizers.py

(limited to 'Wrappers/Python/ccpi')

diff --git a/Wrappers/Python/ccpi/filters/regularisers.py b/Wrappers/Python/ccpi/filters/regularisers.py
new file mode 100644
index 0000000..039daab
--- /dev/null
+++ b/Wrappers/Python/ccpi/filters/regularisers.py
@@ -0,0 +1,44 @@
+"""
+script which assigns a proper device core function based on a flag ('cpu' or 'gpu')
+"""
+
+from ccpi.filters.cpu_regularisers_cython import TV_ROF_CPU, TV_FGP_CPU
+from ccpi.filters.gpu_regularisers import TV_ROF_GPU, TV_FGP_GPU
+
+def ROF_TV(inputData, regularisation_parameter, iterations,
+                     time_marching_parameter,device='cpu'):
+    if device == 'cpu':
+        return TV_ROF_CPU(inputData,
+                     regularisation_parameter,
+                     iterations, 
+                     time_marching_parameter)
+    elif device == 'gpu':
+        return TV_ROF_GPU(inputData,
+                     regularisation_parameter,
+                     iterations, 
+                     time_marching_parameter)
+    else:
+        raise ValueError('Unknown device {0}. Expecting gpu or cpu'\
+                         .format(device))
+
+def FGP_TV(inputData, regularisation_parameter,iterations,
+                     tolerance_param, methodTV, nonneg, printM, device='cpu'):
+    if device == 'cpu':
+        return TV_FGP_CPU(inputData,
+                     regularisation_parameter,
+                     iterations, 
+                     tolerance_param,
+                     methodTV,
+                     nonneg,
+                     printM)
+    elif device == 'gpu':
+        return TV_FGP_GPU(inputData,
+                     regularisation_parameter,
+                     iterations, 
+                     tolerance_param,
+                     methodTV,
+                     nonneg,
+                     printM)
+    else:
+        raise ValueError('Unknown device {0}. Expecting gpu or cpu'\
+                         .format(device))
diff --git a/Wrappers/Python/ccpi/filters/regularizers.py b/Wrappers/Python/ccpi/filters/regularizers.py
deleted file mode 100644
index d6dfa8c..0000000
--- a/Wrappers/Python/ccpi/filters/regularizers.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""
-script which assigns a proper device core function based on a flag ('cpu' or 'gpu')
-"""
-
-from ccpi.filters.cpu_regularizers_cython import TV_ROF_CPU, TV_FGP_CPU
-from ccpi.filters.gpu_regularizers import TV_ROF_GPU, TV_FGP_GPU
-
-def ROF_TV(inputData, regularization_parameter, iterations,
-                     time_marching_parameter,device='cpu'):
-    if device == 'cpu':
-        return TV_ROF_CPU(inputData,
-                     regularization_parameter,
-                     iterations, 
-                     time_marching_parameter)
-    elif device == 'gpu':
-        return TV_ROF_GPU(inputData,
-                     regularization_parameter,
-                     iterations, 
-                     time_marching_parameter)
-    else:
-        raise ValueError('Unknown device {0}. Expecting gpu or cpu'\
-                         .format(device))
-
-def FGP_TV(inputData, regularization_parameter,iterations,
-                     tolerance_param, methodTV, nonneg, printM, device='cpu'):
-    if device == 'cpu':
-        return TV_FGP_CPU(inputData,
-                     regularization_parameter,
-                     iterations, 
-                     tolerance_param,
-                     methodTV,
-                     nonneg,
-                     printM)
-    elif device == 'gpu':
-        return TV_FGP_GPU(inputData,
-                     regularization_parameter,
-                     iterations, 
-                     tolerance_param,
-                     methodTV,
-                     nonneg,
-                     printM)
-    else:
-        raise ValueError('Unknown device {0}. Expecting gpu or cpu'\
-                         .format(device))
\ No newline at end of file
-- 
cgit v1.2.3