summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2018-09-21 09:25:19 +0100
committerGitHub <noreply@github.com>2018-09-21 09:25:19 +0100
commit3948cb31f4de56b91010e70cacdbe117972785e7 (patch)
tree6a54ba9541b0fb098690ac1a721eca8eecf002cf
parent4f7b325602e113db8e8ecb4431675b78e4e578dc (diff)
downloadframework-plugins-3948cb31f4de56b91010e70cacdbe117972785e7.tar.gz
framework-plugins-3948cb31f4de56b91010e70cacdbe117972785e7.tar.bz2
framework-plugins-3948cb31f4de56b91010e70cacdbe117972785e7.tar.xz
framework-plugins-3948cb31f4de56b91010e70cacdbe117972785e7.zip
inherit from Function
closes #15
-rw-r--r--Wrappers/Python/ccpi/plugins/regularisers.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Wrappers/Python/ccpi/plugins/regularisers.py b/Wrappers/Python/ccpi/plugins/regularisers.py
index 29d4397..774107d 100644
--- a/Wrappers/Python/ccpi/plugins/regularisers.py
+++ b/Wrappers/Python/ccpi/plugins/regularisers.py
@@ -25,7 +25,7 @@ from ccpi.optimisation.ops import Operator
import numpy as np
-class ROF_TV(Operator):
+class ROF_TV(Function):
def __init__(self,lambdaReg,iterationsTV,tolerance,time_marchstep,device):
# set parameters
self.lambdaReg = lambdaReg
@@ -49,7 +49,7 @@ class ROF_TV(Operator):
pars['time_marching_parameter'], self.device)
return DataContainer(out)
-class FGP_TV(Operator):
+class FGP_TV(Function):
def __init__(self,lambdaReg,iterationsTV,tolerance,methodTV,nonnegativity,printing,device):
# set parameters
self.lambdaReg = lambdaReg
@@ -83,7 +83,7 @@ class FGP_TV(Operator):
return DataContainer(out)
-class SB_TV(Operator):
+class SB_TV(Function):
def __init__(self,lambdaReg,iterationsTV,tolerance,methodTV,printing,device):
# set parameters
self.lambdaReg = lambdaReg