diff --git a/Sketch.py b/Sketch.py index 5ec5825..10791ef 100644 --- a/Sketch.py +++ b/Sketch.py @@ -28,12 +28,8 @@ class Sketch(object): shape_vars[shape_var] = varid varid += 1 varid_to_shape_var.append(shape_var) - C = empty((len(equations), len(shape_vars))) - d = empty(len(equations)) - for row in range(len(equations)): - for col in range(len(shape_vars)): - C[row][col] = 0.0 - d[row] = 0.0 + C = zeros((len(equations), len(shape_vars))) + d = zeros(len(equations)) for i in range(len(equations)): e = equations[i] coeffs = e[0] @@ -41,9 +37,16 @@ class Sketch(object): var_index = shape_vars[c[1]] C[i][var_index] = c[0] d[i] = e[1] +# for row in range(len(equations)): +# print '[', +# for col in range(len(shape_vars)): +# print C[row][col], +# print ',', +# print '] [%f]' % d[row] s = SLE(C, d) r = s.solve() solved_vars = r.xf + print "SOLVED: ", solved_vars for i in range(len(solved_vars)): varid_to_shape_var[i][0].setVar(varid_to_shape_var[i][1], solved_vars[i])