Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b3c53db
remove fista
deepanshs Dec 11, 2024
65e19f8
add changes from PR 67
Dec 13, 2024
4e1a7a8
try to add masked array option
Jan 30, 2025
1b021a0
add functions
May 10, 2025
38692bd
Merge branch 'master' into remove_fista
deepanshs Jun 2, 2025
f72eb13
remove commented fista import
deepanshs Jun 2, 2025
cc18d42
static limit mqmas kernel
Jun 24, 2025
9a8ea8b
add CV minimization and xygrid parameter to SmoothLasso and SmoothLas…
Aug 29, 2025
0c005ed
Merge branch 'deepanshs:master' into remove_fista
mccarthy677 Aug 29, 2025
94c3f94
add CV minimization and xygrid parameter to SmoothLasso and SmoothLas…
Aug 29, 2025
1f2a96d
Merge branch 'remove_fista' of https://github.com/mccarthy677/mrinver…
Aug 29, 2025
b29a5e5
linting
Aug 29, 2025
38e17d0
more linting, remove unneeded if block
Aug 29, 2025
4c040c6
even more linting
Aug 29, 2025
544002a
fixing if statement again, fix more whitespace stuff
Aug 29, 2025
9b8a297
remove import line
Aug 29, 2025
6e250f0
get rid of more old grid stuff
Aug 29, 2025
be62030
lint
deepanshs Sep 1, 2025
401780f
lint
deepanshs Sep 1, 2025
c4e8409
lint
deepanshs Sep 1, 2025
48fe31f
Merge branch 'master' into remove_fista
deepanshs Sep 12, 2025
bb96269
Merge branch 'master' into remove_fista
mccarthy677 Nov 7, 2025
d798d0a
add nQ, add comment line to avoid merge conflict
Nov 7, 2025
ed2386d
Merge branch 'remove_fista' of https://github.com/mccarthy677/mrinver…
mccarthy677 Nov 7, 2025
9dd7c16
finishing merge?
Nov 7, 2025
704077d
Merge branch 'master' into remove_fista
deepanshs Dec 2, 2025
cc66c1f
lint
deepanshs Dec 2, 2025
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
18 changes: 9 additions & 9 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[flake8]
ignore = E203
exclude = .eggs, *.egg,build, mrinversion/kernel/__init__.py, mrinversion/utils.py
filename = *.pyx, *.px*, *py
max-line-length = 88
max-complexity = 10
select = C,E,F,W,N8
count = True
statistics = True
[flake8]
ignore = E203
exclude = .eggs, *.egg,build, mrinversion/kernel/__init__.py, mrinversion/utils.py, examples/*
filename = *.pyx, *.px*, *py
max-line-length = 88
max-complexity = 10
select = C,E,F,W,N8
count = True
statistics = True
116 changes: 58 additions & 58 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
name: "CodeQL"

on:
# At the end of every day
schedule:
- cron: '0 0 * * *'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['python']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v6

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v4

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v4
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
name: "CodeQL"
on:
# At the end of every day
schedule:
- cron: '0 0 * * *'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['python']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
steps:
- name: Checkout repository
uses: actions/checkout@v6
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v4
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v4
132 changes: 66 additions & 66 deletions .github/workflows/continuous-integration-pip.yml
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: CI

on:
push:
branches: [master]
pull_request:
branches: [master]

jobs:
code_lint:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.11"]

steps:
- name: Checkout
uses: actions/checkout@v6
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=B,C,E,F,W,T,N8 --ignore=E203 --max-line-length=88 --show-source --statistics --exclude="examples/* docs/* build/* utils.py"
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=88 --statistics --exclude="examples/* docs/* build/* utils.py"

test_os:
needs: [code_lint]
runs-on: "ubuntu-latest"
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12", "3.13"]

steps:
- name: Checkout
uses: actions/checkout@v6

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools
pip install -r requirements-dev.txt

- name: Build and install package from source
run: python setup.py develop

- name: Test with pytest
run: pytest --cov=./ --cov-report=xml

- name: Upload coverage
uses: codecov/codecov-action@v5.5.1
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
name: CI
on:
push:
branches: [master]
pull_request:
branches: [master]
jobs:
code_lint:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.11"]
steps:
- name: Checkout
uses: actions/checkout@v6
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=B,C,E,F,W,T,N8 --ignore=E203 --max-line-length=88 --show-source --statistics --exclude="examples/* docs/* build/* utils.py"
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=88 --statistics --exclude="examples/* docs/* build/* utils.py"
test_os:
needs: [code_lint]
runs-on: "ubuntu-latest"
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12", "3.13"]
steps:
- name: Checkout
uses: actions/checkout@v6
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools
pip install -r requirements-dev.txt
- name: Build and install package from source
run: python setup.py develop
- name: Test with pytest
run: pytest --cov=./ --cov-report=xml
- name: Upload coverage
uses: codecov/codecov-action@v5.5.1
60 changes: 30 additions & 30 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
v0.3.1
------

What's new!
'''''''''''

- Simplified plot_3d function
- Replace fortran code with numba jit python version.

v0.3.0
------

What's new!
'''''''''''

- Added T1, T2 relaxation inversion kernel.

v0.2.0
------

What's new!
'''''''''''

- Added :func:`~mrinversion.utils.to_Haeberlen_grid` function to convert the 3D :math:`\rho(\delta_\text{iso}, x, y)`
distribution to :math:`\rho(\delta_\text{iso}, \zeta_\sigma, \eta_\sigma)` distribution.

Changes
'''''''

- Update code to comply with updated csdmpy library.
v0.3.1
------
What's new!
'''''''''''
- Simplified plot_3d function
- Replace fortran code with numba jit python version.
v0.3.0
------
What's new!
'''''''''''
- Added T1, T2 relaxation inversion kernel.
v0.2.0
------
What's new!
'''''''''''
- Added :func:`~mrinversion.utils.to_Haeberlen_grid` function to convert the 3D :math:`\rho(\delta_\text{iso}, x, y)`
distribution to :math:`\rho(\delta_\text{iso}, \zeta_\sigma, \eta_\sigma)` distribution.
Changes
'''''''
- Update code to comply with updated csdmpy library.
Loading