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.

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

Minor edits to files edited in previous PRs #356

Merged
merged 4 commits into from
Jul 30, 2022
Merged

Minor edits to files edited in previous PRs #356

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0694e13
fix minor logic error
luisfabib Jul 30, 2022
a310171
minor documentation update
luisfabib Jul 30, 2022
dea82cb
fix minor bug
luisfabib Jul 30, 2022
7c5ef52
Merge branch 'main' into fix/minor
luisfabib Jul 30, 2022
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
8 changes: 5 additions & 3 deletions deerlab/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,15 +939,17 @@ def _print_fitresults(fitresult,model):

hasregularization = fitresult.regparam!=0
haspenalties = fitresult.penweights
if hasregularization and haspenalties:
if hasregularization or haspenalties:
string += 'Model hyperparameters: \n'
tags = []
values = []
alignment = []
if hasregularization:
alignment.append('^')
tags.append('Regularization parameter')
values.append(fitresult.regparam)
tags.append('Regularization parameter')
regparam = fitresult.regparam
if regparam is None: regparam = 0
values.append(regparam)
if haspenalties:
for n,penweight in enumerate(fitresult.penweights):
alignment.append('^')
Expand Down
2 changes: 1 addition & 1 deletion docsrc/source/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Requirements

To install DeerLab, first install Python on your computer. Python can be downloaded from the `official Python distribution <https://www.python.org/>`_. There are
many online tutorials to guide you through the installation and setup (see `here <https://realpython.com/installing-python/>`_ for example). Make sure you install
one of the Python versions compatible with DeerLab, either **Python 3.6**, **3.7**, **3.8**, **3.9**, or **3.10**.
one of the Python versions compatible with DeerLab, either **Python 3.8**, **3.9**, or **3.10**.

.. rubric:: Windows systems

Expand Down