From 6f49860389b973bf0ec58cdefc63cda41f432d1c Mon Sep 17 00:00:00 2001
From: Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au>
Date: Mon, 5 Nov 2012 18:14:23 +1100
Subject: Remove a bit of junk and fix up the logging again.

---
 impl/VariableAssignment.hpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'impl/VariableAssignment.hpp')

diff --git a/impl/VariableAssignment.hpp b/impl/VariableAssignment.hpp
index fff00b5..08002b8 100644
--- a/impl/VariableAssignment.hpp
+++ b/impl/VariableAssignment.hpp
@@ -41,8 +41,8 @@ struct DynamicVariableAssignment : public VariableAssignment<Domain> {
       log::fixpoint << indent() << "Invalidating " << x << std::endl;
  
       _unstable.insert(x);
-      _old_values[x] = _values[x];
       _touched.insert(x);
+      _old_values[x] = _values[x];
       _values[x] = infinity<Domain>();
 
       IdSet<Variable<Domain> > infl = _influence[x];
@@ -66,19 +66,15 @@ struct DynamicVariableAssignment : public VariableAssignment<Domain> {
          it != ei;
          ++it) {
       Variable<Domain>& var = _system.variable(*it);
-      //if (_old_values[var] != _values[var]) {
+      if (!_unstable.contains(var) && _old_values[var] != _values[var]) {
         changed.insert(var);
         _touched.remove(var);
-      //}
+      }
     }
     //_touched.clear();
     return changed;
   }
 
-  const IdMap<Variable<Domain>, Domain> get_old_values() const {
-    return _old_values;
-  }
-
 private:
 
   void solve(const Variable<Domain>& x) {
-- 
cgit v1.2.3