Skip to content

Fix VectorEquation helper #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StevenClontz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix VectorEquation helper #1048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions source/common/sagemath/library.sage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ class TBIL:
string+=latex(self.vectors[-1])
return string

#Vector equation class
#Linear combination class
class LinearCombinationFromMatrix(LinearCombination):
def __init__(self,A,coefficients=None):
A=A.subdivision(0,0) # ignores augmented matrices
Expand All @@ -602,13 +602,14 @@ class TBIL:
self.matrix=A
#Check if column subdivision exists
if not self.matrix.subdivisions()[1]:
self.matrix=self.matrix.augment(zero_vector(ZZ, len(self.matrix.columns())), subdivide=true)
self.matrix=self.matrix.augment(zero_vector(ZZ, len(self.matrix.rows())), subdivide=true)

#if vars were not supplied, create them
if not vars:
vars = vector([var("x_"+str(i+1)) for i in range(0,len(self.matrix.subdivision(0,0).columns()))])

super().__init__(TBIL.LinearCombination(vars,[column_matrix(c) for c in self.matrix.subdivision(0,0).columns()]), column_matrix(A.column(-1)))
super().__init__(TBIL.LinearCombination(vars,[column_matrix(c) for c in self.matrix.subdivision(0,0).columns()]), column_matrix(self.matrix.column(-1)))


@staticmethod
def choices_from_list(lst):
Expand Down
Loading