suzanne.soy/geosolver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed invalid syntax (vector.vector[...]) in configuration

Browse Source 
fixed bug in Connected(IncrementalSet)
This commit is contained in:
kwikrick 2011-03-29 18:49:27 +00:00
parent fdf7300eef
commit e758e3c225
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
geosolver/clsolver2D.py
View File

@ -247,6 +247,7 @@ class Connected(incremental.IncrementalSet):
dependend = self._solver.find_dependend(var) dependend = self._solver.find_dependend(var)
dependend = filter(lambda x: x in self._incrset, dependend) dependend = filter(lambda x: x in self._incrset, dependend)
connected.update(dependend) connected.update(dependend)
if obj in connected:
connected.remove(obj) connected.remove(obj)
for obj2 in connected: for obj2 in connected:
self._add(frozenset((obj, obj2))) self._add(frozenset((obj, obj2)))

8
geosolver/configuration.py
View File

@ -133,14 +133,14 @@ class Configuration:
p12 = self.map[v2] p12 = self.map[v2]
if tol_eq(vector.norm(p12-p11),0.0): if tol_eq(vector.norm(p12-p11),0.0):
underconstrained = True 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: else:
cs1 = make_hcs_2d(p11, p12) cs1 = make_hcs_2d(p11, p12)
p21 = other.map[v1] p21 = other.map[v1]
p22 = other.map[v2] p22 = other.map[v2]
if tol_eq(vector.norm(p22-p21),0.0): if tol_eq(vector.norm(p22-p21),0.0):
underconstrained = True 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: else:
cs2 = make_hcs_2d(p21, p22) cs2 = make_hcs_2d(p21, p22)
# in any case # in any case
@ -164,14 +164,14 @@ class Configuration:
p12 = self.map[v2] p12 = self.map[v2]
if tol_eq(vector.norm(p12-p11),0.0): if tol_eq(vector.norm(p12-p11),0.0):
underconstrained = True 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: else:
cs1 = make_hcs_2d_scaled(p11, p12) cs1 = make_hcs_2d_scaled(p11, p12)
p21 = other.map[v1] p21 = other.map[v1]
p22 = other.map[v2] p22 = other.map[v2]
if tol_eq(vector.norm(p22-p21),0.0): if tol_eq(vector.norm(p22-p21),0.0):
underconstrained = True 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: else:
cs2 = make_hcs_2d_scaled(p21, p22) cs2 = make_hcs_2d_scaled(p21, p22)
print cs1, cs2 print cs1, cs2