Changeset 1631

Timestamp:

07/12/07 18:11:21 (1 year ago)

Author:

wrobe..@pld-linux.org

Message:

- recursive approach does not work in case of Constraint.solve_for (there

is no reccursion), try to detect juggling by counting constraint in
solver

Files:

• gaphas/branches/hw/gaphas/constraint.py (modified) (7 diffs)
• gaphas/branches/hw/gaphas/solver.py (modified) (2 diffs)

gaphas/branches/hw/gaphas/constraint.py

@@ -30 +30 @@
-
-import operator
-from decorators import recursive
-
-
@@ -121 +120 @@
-        self.b = b
-
-    @recursive(limit=5)
-    def solve_for(self, var):
-        assert var in (self.a, self.b)
@@ -160 +158 @@
-        self.center = center
-
-    @recursive(limit=5)
-    def solve_for(self, var):
-        assert var in (self.a, self.b, self.center)
@@ -198 +195 @@
-        self.delta = delta
-
-    @recursive(limit=5)
-    def solve_for(self, var):
-        if self.smaller.value > self.bigger.value - self.delta:
@@ -284 +280 @@
-
-
-    @recursive(limit=5)
-    def solve_for(self, var):
-        """
@@ -386 +381 @@
-        print 'b', self.balance
-
-    @recursive(limit=5)
-    def solve_for(self, var):
-        b1, b2 = self.band
@@ -433 +427 @@
-
-
-    @recursive(limit=5)
-    def solve_for(self, var):
-        b1, b2 = self.band

gaphas/branches/hw/gaphas/solver.py

@@ -345 +345 @@
-                else:
-                    self._marked_cons.append(c)
+                    if __debug__:
+                        if self._marked_cons.count(c) > 100:
+                            raise JuggleError, 'Variable juggling detected, constraint %s' % c
+
-
-    def request_resolve(self, variable):
@@ -536 +540 @@
-
-
+
+
+class JuggleError(AssertionError):
+    """
+    Variable juggling exception. Raised when constraint's variables are
+    marking each other dirty forever.
+    """
+
+
-__test__ = {
-    'Solver.add_constraint': Solver.add_constraint,