Skip to content

Attempt at replacing | with * for creating quantities #693

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
rieder wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Attempt at replacing | with * for creating quantities #693

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d1bd861
Attempt at replacing | with * for creating quantities
rieder Oct 28, 2020
e56b7ed
replace | with * in units package
rieder Oct 28, 2020
0ca00b8
work in progress
rieder Oct 28, 2020
6c3ba2c
Merge branch 'master' into units_mul
rieder Oct 28, 2020
f362b29
update
rieder Oct 28, 2020
1a780eb
add as_unit and to_unit to unit to simplify e.g. named_unit
ipelupessy Oct 29, 2020
f97fbdc
add test, fix some constants
rieder Oct 29, 2020
7b49b90
1.0 * unit should give a quantity
rieder Oct 29, 2020
11c5e3d
seems better
rieder Oct 29, 2020
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
9 changes: 3 additions & 6 deletions src/amuse/units/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,9 @@ def __truediv__(self, other):
# return factor_unit(1.0 / other, self)

def __rmul__(self, other):
if other == 1:
return self
else:
if isinstance(other, unit):
return factor_unit(other, self)
return self.new_quantity(other)
if isinstance(other, unit):
return factor_unit(other, self)
Copy link
Member

@ipelupessy ipelupessy Oct 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is wrong, because factor units are supposed to construct from a number(like) and a unit..you should only get here with other a number..

Copy link
Member Author

@rieder rieder Oct 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see

Copy link
Member Author

@rieder rieder Oct 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaced it with mul_unit, I think that's correct?

return self.new_quantity(other)

def __ror__(self, value):
"""Create a new Quantity object.
Expand Down