Merge branch 'master' into square-matrix

This commit is contained in:
Josh Holtrop committed 2011-03-29 19:24:17 -04:00
commit 38cf7aeb8b
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -15,5 +15,5 @@ class Horizontal(Constraint):
for i in range(len(varrefs1)):
coeffs.append((1 * varrefs1[i], (self.shape1, i)))
for i in range(len(varrefs2)):
coeffs.append((-1 * varrefs2[i], (self.shape2, i))
coeffs.append((-1 * varrefs2[i], (self.shape2, i)))
return [(coeffs, 0)]
+1 -1
View File
@@ -15,5 +15,5 @@ class Vertical(Constraint):
for i in range(len(varrefs1)):
coeffs.append((1 * varrefs1[i], (self.shape1, i)))
for i in range(len(varrefs2)):
coeffs.append((-1 * varrefs2[i], (self.shape2, i))
coeffs.append((-1 * varrefs2[i], (self.shape2, i)))
return [(coeffs, 0)]