[fixing] fixing now saves the old constraint

This commit is contained in:
Max Zwiessele 2014-05-20 16:39:52 +01:00
parent c507cfe4ab
commit b520eb212c

View file

@ -324,6 +324,7 @@ class Indexable(Nameable, Observable):
self._default_constraint_ = default_constraint self._default_constraint_ = default_constraint
from index_operations import ParameterIndexOperations from index_operations import ParameterIndexOperations
self.constraints = ParameterIndexOperations() self.constraints = ParameterIndexOperations()
self._old_constraints = ParameterIndexOperations()
self.priors = ParameterIndexOperations() self.priors = ParameterIndexOperations()
if self._default_constraint_ is not None: if self._default_constraint_ is not None:
self.constrain(self._default_constraint_) self.constrain(self._default_constraint_)
@ -386,8 +387,10 @@ class Indexable(Nameable, Observable):
""" """
if value is not None: if value is not None:
self[:] = value self[:] = value
reconstrained = self.unconstrain()
index = self._add_to_index_operations(self.constraints, reconstrained, __fixed__, warning) index = self._raveled_index()
# reconstrained = self.unconstrain()
index = self._add_to_index_operations(self.constraints, index, __fixed__, warning)
self._highest_parent_._set_fixed(self, index) self._highest_parent_._set_fixed(self, index)
self.notify_observers(self, None if trigger_parent else -np.inf) self.notify_observers(self, None if trigger_parent else -np.inf)
return index return index