Skip to content
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.

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

Add docs for scico.solver module #202

Merged
merged 15 commits into from
Feb 1, 2022
Merged

Add docs for scico.solver module #202

merged 15 commits into from
Feb 1, 2022

Conversation

bwohlberg
Copy link
Collaborator

Resolves #123.

In addition:

  • Address sphinx formatting issue and build warnings
  • Bump copyright years and remove __author__ attributes in a number of files

@bwohlberg bwohlberg added the documentation Improvements or additions to documentation label Feb 1, 2022
@codecov
Copy link

codecov bot commented Feb 1, 2022

Codecov Report

Merging #202 (95658bc) into main (982e86e) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #202      +/-   ##
==========================================
- Coverage   92.24%   92.22%   -0.02%     
==========================================
  Files          48       48              
  Lines        3351     3345       -6     
==========================================
- Hits         3091     3085       -6     
  Misses        260      260              
Flag Coverage Δ
unittests 92.22% <100.00%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
scico/blockarray.py 91.20% <ø> (ø)
scico/data/__init__.py 100.00% <ø> (ø)
scico/examples.py 92.85% <ø> (ø)
scico/flax.py 100.00% <ø> (ø)
scico/functional/__init__.py 100.00% <ø> (ø)
scico/functional/_flax.py 91.66% <ø> (-0.34%) ⬇️
scico/functional/_functional.py 88.33% <ø> (-0.20%) ⬇️
scico/functional/_indicator.py 100.00% <ø> (ø)
scico/functional/_norm.py 100.00% <ø> (ø)
scico/linop/__init__.py 100.00% <ø> (ø)
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 982e86e...95658bc. Read the comment docs.

@@ -50,17 +48,17 @@ def prox(
self, v: Union[JaxArray, BlockArray], lam: float = 1.0, **kwargs
) -> Union[JaxArray, BlockArray]:
r"""Evaluate the scaled proximal operator of the indicator over
the non-negative orthant, :math:`I_{>= 0} `,:
the non-negative orthant, :math:`I_{>= 0}`
Copy link
Contributor

Choose a reason for hiding this comment

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

I think there needs to be some connector here, because the equation on the following lines is part of this sentence (and is an independent clause)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Added a comma.

scico/solver.py Outdated
# All rights reserved. BSD 3-clause License.
# This file is part of the SCICO package. Details of the copyright and
# user license can be found in the 'LICENSE' file distributed with the
# package.

"""Optimization algorithms."""
"""Optimization algorithms.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggestion: "Scipy optimization algorithms" or similar to differentiate between this and scico.optimize which currently has the same description.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Very good point. Done.

Copy link
Contributor

@Michael-T-McCann Michael-T-McCann left a comment

Choose a reason for hiding this comment

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

Nice description; I added a couple minor comments.

@bwohlberg bwohlberg mentioned this pull request Feb 1, 2022
6 tasks

This module provides scico interface wrappers for functions
from :mod:`scipy.optimize` since jax directly implements only a very
limited subset of these functions (there is limited, experimental support
Copy link
Contributor

Choose a reason for hiding this comment

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

missing closing parenthesis

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good catch - fixed.

@bwohlberg bwohlberg merged commit 548555e into main Feb 1, 2022
@bwohlberg bwohlberg deleted the brendt/solver-docs branch February 1, 2022 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Additional documentation needed for scico.solver
3 participants