From 5c29348984f2ee4da3296d555b358cf9eb4188d8 Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Sat, 4 Oct 2014 12:40:30 -0700 Subject: [PATCH] Minor updates to pointers in reg and invProb --- SimPEG/InvProblem.py | 2 ++ SimPEG/Regularization.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SimPEG/InvProblem.py b/SimPEG/InvProblem.py index ccc1164f..32a2195c 100644 --- a/SimPEG/InvProblem.py +++ b/SimPEG/InvProblem.py @@ -45,6 +45,8 @@ class BaseInvProblem(object): self.prob, self.survey = dmisfit.prob, dmisfit.survey #TODO: Remove: (and make iteration printers better!) self.opt.parent = self + self.reg.parent = self + self.dmisfit.parent = self @Utils.callHooks('startup') def startup(self, m0): diff --git a/SimPEG/Regularization.py b/SimPEG/Regularization.py index 0e231ab8..c758474b 100644 --- a/SimPEG/Regularization.py +++ b/SimPEG/Regularization.py @@ -40,7 +40,7 @@ class BaseRegularization(object): @property def inv(self): return self.parent.inv @property - def objFunc(self): return self.parent + def invProb(self): return self.parent @property def reg(self): return self @property