From e758e3c225fc693fd1dde3b9fd7fedd3a2912c82 Mon Sep 17 00:00:00 2001 From: kwikrick Date: Tue, 29 Mar 2011 18:49:27 +0000 Subject: [PATCH] fixed invalid syntax (vector.vector[...]) in configuration fixed bug in Connected(IncrementalSet) --- geosolver/clsolver2D.py | 3 ++- geosolver/configuration.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/geosolver/clsolver2D.py b/geosolver/clsolver2D.py index 440150c..ea49bf4 100644 --- a/geosolver/clsolver2D.py +++ b/geosolver/clsolver2D.py @@ -247,7 +247,8 @@ class Connected(incremental.IncrementalSet): dependend = self._solver.find_dependend(var) dependend = filter(lambda x: x in self._incrset, dependend) connected.update(dependend) - connected.remove(obj) + if obj in connected: + connected.remove(obj) for obj2 in connected: self._add(frozenset((obj, obj2))) diff --git a/geosolver/configuration.py b/geosolver/configuration.py index e302c26..ab18268 100644 --- a/geosolver/configuration.py +++ b/geosolver/configuration.py @@ -133,14 +133,14 @@ class Configuration: p12 = self.map[v2] if tol_eq(vector.norm(p12-p11),0.0): underconstrained = True - cs1 = make_hcs_2d(p11, p11+vector.vector[1.0,0.0]) + cs1 = make_hcs_2d(p11, p11+vector.vector([1.0,0.0])) else: cs1 = make_hcs_2d(p11, p12) p21 = other.map[v1] p22 = other.map[v2] if tol_eq(vector.norm(p22-p21),0.0): underconstrained = True - cs2 = make_hcs_2d(p21, p21+vector.vector[1.0,0.0]) + cs2 = make_hcs_2d(p21, p21+vector.vector([1.0,0.0])) else: cs2 = make_hcs_2d(p21, p22) # in any case @@ -164,14 +164,14 @@ class Configuration: p12 = self.map[v2] if tol_eq(vector.norm(p12-p11),0.0): underconstrained = True - cs1 = make_hcs_2d_scaled(p11, p11+vector.vector[1.0,0.0]) + cs1 = make_hcs_2d_scaled(p11, p11+vector.vector([1.0,0.0])) else: cs1 = make_hcs_2d_scaled(p11, p12) p21 = other.map[v1] p22 = other.map[v2] if tol_eq(vector.norm(p22-p21),0.0): underconstrained = True - cs2 = make_hcs_2d_scaled(p21, p21+vector.vector[1.0,0.0]) + cs2 = make_hcs_2d_scaled(p21, p21+vector.vector([1.0,0.0])) else: cs2 = make_hcs_2d_scaled(p21, p22) print cs1, cs2