From 868b7141ddec306170a450bc0df4415f98f3a98a Mon Sep 17 00:00:00 2001
From: caron <j.caron@fz-juelich.de>
Date: Mon, 11 Dec 2017 15:12:32 +0100
Subject: [PATCH] regularisator: base class no longer abstract!
---
pyramid/diagnostics.py | 1 -
pyramid/regularisator.py | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/pyramid/diagnostics.py b/pyramid/diagnostics.py
index 1e84c3f..aad9615 100644
--- a/pyramid/diagnostics.py
+++ b/pyramid/diagnostics.py
@@ -576,7 +576,6 @@ class LCurve(object):
# TODO: Make sure to update ALL curvatures and search for new best EVERYWHERE!
# TODO: Distinguish regions of the L-Curve.
-
def plot(self, lambdas=None, axis=None, figsize=None):
# TODO: Docstring!
# Sort lists according to lambdas:
diff --git a/pyramid/regularisator.py b/pyramid/regularisator.py
index bb1d7b0..8088ccd 100644
--- a/pyramid/regularisator.py
+++ b/pyramid/regularisator.py
@@ -18,7 +18,7 @@ __all__ = ['NoneRegularisator', 'ZeroOrderRegularisator', 'FirstOrderRegularisat
'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.
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
_log = logging.getLogger(__name__ + '.Regularisator')
- @abc.abstractmethod
def __init__(self, norm, lam, add_params=0):
self._log.debug('Calling __init__')
self.norm = norm
--
GitLab