Skip to content

Improve performance of arithmetic on MultiVector pairs #283

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
eric-wieser merged 1 commit into from
Mar 12, 2020
Merged

Improve performance of arithmetic on MultiVector pairs #283

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
14 changes: 7 additions & 7 deletions clifford/_multivector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,13 @@ def _checkOther(self, other, coerce=True) -> Tuple['MultiVector', bool]:

_checkOther(other, coerce=True) --> newOther, isMultiVector
"""
if isinstance(other, numbers.Number):
if isinstance(other, MultiVector):
if other.layout != self.layout:
raise ValueError(
"cannot operate on MultiVectors with different Layouts")
else:
return other, True
elif isinstance(other, numbers.Number):
if coerce:
# numeric scalar
newOther = self._newMV(dtype=np.result_type(other))
Expand All @@ -70,12 +76,6 @@ def _checkOther(self, other, coerce=True) -> Tuple['MultiVector', bool]:
else:
return other, False

elif isinstance(other, MultiVector):
if other.layout != self.layout:
raise ValueError(
"cannot operate on MultiVectors with different Layouts")
else:
return other, True
else:
return other, False

Expand Down