diff options
author | Jakob Jorgensen, WS at HMXIF <jakob.jorgensen@manchester.ac.uk> | 2019-05-21 15:44:59 +0100 |
---|---|---|
committer | Jakob Jorgensen, WS at HMXIF <jakob.jorgensen@manchester.ac.uk> | 2019-05-21 15:44:59 +0100 |
commit | 97a45ae06f9bc95f9df640158e16f522d356392d (patch) | |
tree | 7c4650cddae92f91ce4d5f1f653e13461fbecf96 /Wrappers | |
parent | 376e12c567f045169119f87f82efc196570753ad (diff) | |
download | framework-97a45ae06f9bc95f9df640158e16f522d356392d.tar.gz framework-97a45ae06f9bc95f9df640158e16f522d356392d.tar.bz2 framework-97a45ae06f9bc95f9df640158e16f522d356392d.tar.xz framework-97a45ae06f9bc95f9df640158e16f522d356392d.zip |
Fix upper/lower case inconsistency to allow astra demo to run
Diffstat (limited to 'Wrappers')
-rwxr-xr-x | Wrappers/Python/ccpi/optimisation/functions/Norm2Sq.py | 4 | ||||
-rw-r--r-- | Wrappers/Python/ccpi/optimisation/functions/__init__.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/functions/Norm2Sq.py b/Wrappers/Python/ccpi/optimisation/functions/Norm2Sq.py index b553d7c..0b6bb0b 100755 --- a/Wrappers/Python/ccpi/optimisation/functions/Norm2Sq.py +++ b/Wrappers/Python/ccpi/optimisation/functions/Norm2Sq.py @@ -21,7 +21,7 @@ import numpy import warnings # Define a class for squared 2-norm -class Norm2sq(Function): +class Norm2Sq(Function): ''' f(x) = c*||A*x-b||_2^2 @@ -38,7 +38,7 @@ class Norm2sq(Function): ''' def __init__(self,A,b,c=1.0,memopt=False): - super(Norm2sq, self).__init__() + super(Norm2Sq, self).__init__() self.A = A # Should be an operator, default identity self.b = b # Default zero DataSet? diff --git a/Wrappers/Python/ccpi/optimisation/functions/__init__.py b/Wrappers/Python/ccpi/optimisation/functions/__init__.py index a82ee3e..c0eab31 100644 --- a/Wrappers/Python/ccpi/optimisation/functions/__init__.py +++ b/Wrappers/Python/ccpi/optimisation/functions/__init__.py @@ -10,4 +10,4 @@ from .FunctionOperatorComposition import FunctionOperatorComposition from .MixedL21Norm import MixedL21Norm from .IndicatorBox import IndicatorBox from .KullbackLeibler import KullbackLeibler -from .Norm2Sq import Norm2sq +from .Norm2Sq import Norm2Sq |