Skip to content

Default behavior of divmod() is different from MATLAB mod(), on which… #242

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
merged 2 commits into from
Sep 16, 2023
Merged

Default behavior of divmod() is different from MATLAB mod(), on which… #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efaf16c
Default behavior of divmod() is different from MATLAB mod(), on which…
Sep 16, 2023
2f24969
black: fixing black formatting
dmdunla Sep 16, 2023
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
2 changes: 1 addition & 1 deletion pyttb/cp_als.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def cp_als( # noqa: PLR0912,PLR0913,PLR0915
else:
flag = 1

if (divmod(iteration, printitn)[1] == 0) or (printitn > 0 and flag == 0):
if (printitn > 0) and ((divmod(iteration, printitn)[1] == 0) or (flag == 0)):
print(f" Iter {iteration}: f = {fit:e} f-delta = {fitchange:7.1e}")

# Check for convergence
Expand Down
20 changes: 20 additions & 0 deletions tests/test_cp_als.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,3 +206,23 @@ def test_cp_als_sptensor_zeros(capsys):
capsys.readouterr()
assert pytest.approx(output3["fit"], 1) == 0
assert output3["normresidual"] == 0


def test_cp_als_tensor_printitn(capsys, sample_tensor):
_, T = sample_tensor

# default printitn
ttb.cp_als(T, 2, printitn=1, maxiters=2)
capsys.readouterr()

# zero printitn
ttb.cp_als(T, 2, printitn=0, maxiters=2)
capsys.readouterr()

# negative printitn
ttb.cp_als(T, 2, printitn=-1, maxiters=2)
capsys.readouterr()

# float printitn
ttb.cp_als(T, 2, printitn=1.5, maxiters=2)
capsys.readouterr()