Skip to content
Snippets Groups Projects
Commit 868b7141 authored by Jan Caron's avatar Jan Caron
Browse files

regularisator: base class no longer abstract!

parent 9df761b4
No related branches found
No related tags found
No related merge requests found
...@@ -576,7 +576,6 @@ class LCurve(object): ...@@ -576,7 +576,6 @@ class LCurve(object):
# TODO: Make sure to update ALL curvatures and search for new best EVERYWHERE! # TODO: Make sure to update ALL curvatures and search for new best EVERYWHERE!
# TODO: Distinguish regions of the L-Curve. # TODO: Distinguish regions of the L-Curve.
def plot(self, lambdas=None, axis=None, figsize=None): def plot(self, lambdas=None, axis=None, figsize=None):
# TODO: Docstring! # TODO: Docstring!
# Sort lists according to lambdas: # Sort lists according to lambdas:
......
...@@ -18,7 +18,7 @@ __all__ = ['NoneRegularisator', 'ZeroOrderRegularisator', 'FirstOrderRegularisat ...@@ -18,7 +18,7 @@ __all__ = ['NoneRegularisator', 'ZeroOrderRegularisator', 'FirstOrderRegularisat
'ComboRegularisator'] 'ComboRegularisator']
class Regularisator(object, metaclass=abc.ABCMeta): # TODO: Does this have to be abstract?? class Regularisator(object):
"""Class for providing a regularisation term which implements additional constraints. """Class for providing a regularisation term which implements additional constraints.
Represents a certain constraint for the 3D magnetization distribution whose cost is to minimize Represents a certain constraint for the 3D magnetization distribution whose cost is to minimize
...@@ -42,7 +42,6 @@ class Regularisator(object, metaclass=abc.ABCMeta): # TODO: Does this have to b ...@@ -42,7 +42,6 @@ class Regularisator(object, metaclass=abc.ABCMeta): # TODO: Does this have to b
_log = logging.getLogger(__name__ + '.Regularisator') _log = logging.getLogger(__name__ + '.Regularisator')
@abc.abstractmethod
def __init__(self, norm, lam, add_params=0): def __init__(self, norm, lam, add_params=0):
self._log.debug('Calling __init__') self._log.debug('Calling __init__')
self.norm = norm self.norm = norm
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment