Try to make the correct solver into a local solver

As far as I can tell, it's worked! Hooray!

1 files changed, 34 insertions, 21 deletions

diff --git a/impl/VariableAssignment.hpp b/impl/VariableAssignment.hpp
index 2a63756..e074f6f 100644
--- a/impl/VariableAssignment.hpp
+++ b/impl/VariableAssignment.hpp
@@ -7,10 +7,7 @@
 template<typename Domain>
 struct VariableAssignment {
   virtual ~VariableAssignment() { }
-  virtual const Domain& operator[](const Variable<Domain>&) const = 0;
-  virtual const Domain& operator[](const Variable<Domain>& x) {
-    return (*const_cast<const VariableAssignment*>(this))[x];
-  }
+  virtual const Domain operator[](const Variable<Domain>& x) = 0;
 };
 
 #include "EquationSystem.hpp"
@@ -27,11 +24,13 @@ struct DynamicVariableAssignment : public VariableAssignment<Domain> {
   ) : _system(system),
       _strategy(strat),
       _values(system.variableCount(), value),
-      _stable(system.variableCount()),
+      _unstable(system.variableCount()),
       _influence(system.variableCount(),
                  IdSet<Variable<Domain> >(system.variableCount())),
-      _frozen(false)
-  { }
+      _frozen(false),
+      _changed(false)
+  {
+  }
 
   void freeze() {
     _frozen = true;
@@ -41,25 +40,37 @@ struct DynamicVariableAssignment : public VariableAssignment<Domain> {
     _frozen = false;
   }
 
-  bool is_frozen() {
+  bool is_frozen() const {
     return _frozen;
   }
 
-  const Domain& operator[](const Variable<Domain>& var) const {
-    return _values[var];
+  void has_changed(bool c) {
+    _changed = c;
+  }
+
+  bool has_changed() const {
+    return _changed;
   }
 
-  const Domain& operator[](const Variable<Domain>& var) {
+  const Domain operator[](const Variable<Domain>& var) {
     if (!_frozen)
       solve(var);
     return _values[var];
   }
 
+  void stabilise() {
+    if (!_unstable.empty()) {
+      Variable<Domain>& var = _system.variable(*_unstable.begin());
+      solve(var);
+    }
+  }
+
   void invalidate(const Variable<Domain>& x) {
     log::fixpoint << indent() << "Invalidating " << x << std::endl;
-    if (_stable.contains(x)) {
-      _stable.remove(x);
+    if (!_unstable.contains(x)) {
+      _unstable.insert(x);
       _values[x] = infinity<Domain>();
+      _changed = true;
      
       IdSet<Variable<Domain> > infl = _influence[x];
       _influence[x].clear();
@@ -76,13 +87,13 @@ struct DynamicVariableAssignment : public VariableAssignment<Domain> {
 private:
 
   void solve(const Variable<Domain>& x) {
-    if (!_stable.contains(x)) {
-      _stable.insert(x);
+    if (_unstable.contains(x)) {
+      _unstable.remove(x);
       log::fixpoint << indent() << "Stabilise " << x << std::endl;
 
       stack_depth++;
-      Domain val = _system[x]->eval(DependencyAssignment(*this, x),
-                                    _strategy);
+      DependencyAssignment assignment(*this, x);
+      Domain val = _system[x]->eval(assignment, _strategy);
       stack_depth--;
 
       if (val != _values[x]) {
@@ -91,10 +102,11 @@ private:
         IdSet<Variable<Domain> > oldInfluence = _influence[x];
         _influence[x].clear();
         _values[x] = val;
+	_changed = true;
 
         _strategy.invalidate(x);
 
-        _stable.filter(oldInfluence);
+        _unstable.absorb(oldInfluence);
 
         for (typename IdSet<Variable<Domain> >::iterator it = oldInfluence.begin();
              it != oldInfluence.end();
@@ -114,8 +126,8 @@ private:
   struct DependencyAssignment : public VariableAssignment<Domain> {
     DependencyAssignment(DynamicVariableAssignment& assignment, const Variable<Domain>& var)
       : _assignment(assignment), _var(var) { }
-    const Domain& operator[](const Variable<Domain>& x) const {
-      const Domain& result = _assignment[x];
+    const Domain operator[](const Variable<Domain>& x) {
+      const Domain result = _assignment[x];
       _assignment._influence[x].insert(_var);
       return result;
     }
@@ -127,9 +139,10 @@ private:
   const EquationSystem<Domain>& _system;
   DynamicMaxStrategy<Domain>& _strategy;
   IdMap<Variable<Domain>, Domain> _values;
-  IdSet<Variable<Domain> > _stable;
+  IdSet<Variable<Domain> > _unstable;
   IdMap<Variable<Domain>,IdSet<Variable<Domain> > > _influence;
   bool _frozen;
+  bool _changed;
 };
 
 #endif