Skip to content

fix #439 #441

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

Merged
sdrave merged 1 commit into from
Jun 12, 2018
Merged

fix #439 #441

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/pymor/operators/constructions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def apply_transpose(self, V, mu=None):
return R

def assemble(self, mu=None):
operators = tuple(op.assemble(mu) for op in self.operators)
operators = [op.assemble(mu) for op in self.operators]
coefficients = self.evaluate_coefficients(mu)
op = operators[0].assemble_lincomb(operators, coefficients, solver_options=self.solver_options,
name=self.name + '_assembled')
Expand Down Expand Up @@ -400,7 +400,7 @@ def assemble_lincomb(self, operators, coefficients, solver_options=None, name=No
assert all(op.source == operators[0].source for op in operators)
return IdentityOperator(operators[0].source, name=name) * sum(coefficients)
else:
return operators[1].assemble_lincomb(operators[1:] + (operators[0],),
return operators[1].assemble_lincomb(operators[1:] + [operators[0]],
coefficients[1:] + [coefficients[0]],
solver_options=solver_options, name=name)

Expand Down
12 changes: 6 additions & 6 deletions src/pymortests/complex_values.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ def test_complex():
Cva = NumpyVectorSpace.from_data(C)

# assemble_lincomb
assert not np.iscomplexobj(Aop.assemble_lincomb((Iop, Bop), (1, 1)).matrix)
assert not np.iscomplexobj(Aop.assemble_lincomb((Aop, Bop), (1, 1)).matrix)
assert np.iscomplexobj(Aop.assemble_lincomb((Aop, Bop), (1 + 0j, 1 + 0j)).matrix)
assert np.iscomplexobj(Aop.assemble_lincomb((Aop, Bop), (1j, 1)).matrix)
assert np.iscomplexobj(Aop.assemble_lincomb((Bop, Aop), (1, 1j)).matrix)
assert not np.iscomplexobj(Aop.assemble_lincomb([Iop, Bop], [1, 1]).matrix)
assert not np.iscomplexobj(Aop.assemble_lincomb([Aop, Bop], [1, 1]).matrix)
assert np.iscomplexobj(Aop.assemble_lincomb([Aop, Bop], [1 + 0j, 1 + 0j]).matrix)
assert np.iscomplexobj(Aop.assemble_lincomb([Aop, Bop], [1j, 1]).matrix)
assert np.iscomplexobj(Aop.assemble_lincomb([Bop, Aop], [1, 1j]).matrix)

# apply_inverse
assert not np.iscomplexobj(Aop.apply_inverse(Cva).data)
assert np.iscomplexobj((Aop * 1j).apply_inverse(Cva).data)
assert np.iscomplexobj(Aop.assemble_lincomb((Aop, Bop), (1, 1j)).apply_inverse(Cva).data)
assert np.iscomplexobj(Aop.assemble_lincomb([Aop, Bop], [1, 1j]).apply_inverse(Cva).data)
assert np.iscomplexobj(Aop.apply_inverse(Cva * 1j).data)

# append
Expand Down