Merge branch 'master' into square-matrix

This commit is contained in:
Josh Holtrop 2011-03-29 19:21:13 -04:00
commit d18b45cff7
2 changed files with 4 additions and 4 deletions

View File

@ -9,8 +9,8 @@ class Horizontal(Constraint):
self.pt2 = pt2 self.pt2 = pt2
def toEqu(self): def toEqu(self):
varrefs1 = self.shape1.toEqu(pt1)[1] varrefs1 = self.shape1.toEqu(self.pt1)[1]
varrefs2 = self.shape2.toEqu(pt2)[1] varrefs2 = self.shape2.toEqu(self.pt2)[1]
coeffs = [] coeffs = []
for i in range(len(varrefs1)): for i in range(len(varrefs1)):
coeffs.append((1 * varrefs1[i], (self.shape1, i))) coeffs.append((1 * varrefs1[i], (self.shape1, i)))

View File

@ -9,8 +9,8 @@ class Vertical(Constraint):
self.pt2 = pt2 self.pt2 = pt2
def toEqu(self): def toEqu(self):
varrefs1 = self.shape1.toEqu(pt1)[0] varrefs1 = self.shape1.toEqu(self.pt1)[0]
varrefs2 = self.shape2.toEqu(pt2)[0] varrefs2 = self.shape2.toEqu(self.pt2)[0]
coeffs = [] coeffs = []
for i in range(len(varrefs1)): for i in range(len(varrefs1)):
coeffs.append((1 * varrefs1[i], (self.shape1, i))) coeffs.append((1 * varrefs1[i], (self.shape1, i)))