diff --git a/geosolver/geometric.py b/geosolver/geometric.py index 851819a..924efb7 100644 --- a/geosolver/geometric.py +++ b/geosolver/geometric.py @@ -47,16 +47,18 @@ class GeometricProblem (Notifier, Listener): self.prototype = {} self.cg = ConstraintGraph() - def add_point(self, variable, position): + def add_point(self, variable,pos): """add a point variable with a prototype position""" + position = vector.vector(pos) if variable not in self.prototype: self.prototype[variable] = position self.cg.add_variable(variable) else: raise StandardError, "point already in problem" - def set_point(self, variable, position): + def set_point(self, variable, pos): """set prototype position of point variable""" + position = vector.vector(pos) if variable in self.prototype: self.prototype[variable] = position self.send_notify(("set_point", (variable,position))) diff --git a/solvertest/test.py b/solvertest/test.py index 452ec8b..2909f8d 100644 --- a/solvertest/test.py +++ b/solvertest/test.py @@ -771,13 +771,13 @@ def runstats(): stats_parametric() def runtests(): + #diag_select("clsolver3D") #test(double_banana_plus_one_problem()) #test(double_banana_problem()) #test(double_tetrahedron_problem()) #test(ada_tetrahedron_problem()) #test(random_triangular_problem_3D(10,10.0,0.0,0.5)) #test(random_distance_problem_3D(10,1.0,0.0)) - #diag_select("clsolver3D") test(fix_problem_3d()) if __name__ == "__main__": runtests()