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

Major pytraction update in April 2024 #61

Open
wants to merge 95 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
44bc074
First_Changes
nik-liegroup Oct 29, 2023
e002214
Retry
nik-liegroup Oct 31, 2023
0ea196b
ROI_and_Crop_Commented
nik-liegroup Oct 31, 2023
7714e71
Further_Improvements
nik-liegroup Nov 1, 2023
0d17e7c
Further improvements
nik-liegroup Nov 1, 2023
4747b24
Minor fixes
nik-liegroup Nov 6, 2023
d90b8d3
Repaired tests
nik-liegroup Dec 13, 2023
ac317ba
Update README.md
nik-liegroup Dec 13, 2023
dec184e
conda install -c conda-forge shapely
nik-liegroup Dec 13, 2023
527fa7d
Merge branch 'main' of https://github.com/nik-liegroup/pytraction
nik-liegroup Dec 13, 2023
98f76a9
github worflow conda env
nik-liegroup Dec 13, 2023
927d791
update workflow #2
nik-liegroup Dec 13, 2023
2aba3e2
Reroll
nik-liegroup Dec 13, 2023
c24aef5
Update python-package.yml
nik-liegroup Dec 13, 2023
c26fd81
Summary#4
nik-liegroup Dec 13, 2023
04c9e22
Test3
nik-liegroup Dec 13, 2023
5575407
Rollback
nik-liegroup Dec 13, 2023
f738a26
Update python-package.yml
nik-liegroup Dec 13, 2023
7120f3e
Update setup.py
nik-liegroup Dec 13, 2023
b594963
Commented first part of fourier file
nik-liegroup Dec 13, 2023
60c9b83
Commented first fourier function
nik-liegroup Dec 14, 2023
71f55fd
Further code comments in Fourier file
nik-liegroup Dec 21, 2023
3167ad5
Massiv changes in FT file
nik-liegroup Dec 22, 2023
4d53e96
Fourier fixes
nik-liegroup Dec 22, 2023
9e0a041
added strain energy function
nik-liegroup Dec 23, 2023
a30ebb8
Added contractile moments measurement
nik-liegroup Dec 23, 2023
e90e2ac
fixed contraction matrix function
nik-liegroup Dec 23, 2023
25f617c
Strain energy in pJ
nik-liegroup Dec 23, 2023
81fe8a1
added normal distribution as example field
nik-liegroup Dec 25, 2023
4c50708
added_fourier_and_forward_tests
nik-liegroup Dec 27, 2023
d07ff32
added algorithm to solve inverse problem
nik-liegroup Dec 27, 2023
a05e8f8
Update .name
nik-liegroup Dec 29, 2023
d806625
convolution_theorem
nik-liegroup Jan 3, 2024
175a312
circular conv and matrix_inversion fourier
nik-liegroup Jan 5, 2024
19aeacd
boundary_element_method
nik-liegroup Jan 11, 2024
1c5e5d5
final_bem
nik-liegroup Jan 12, 2024
4654aec
fully_implemented_bem
nik-liegroup Jan 12, 2024
8cecf60
more_tests
nik-liegroup Jan 19, 2024
355d46d
compare_all_three_methods
nik-liegroup Jan 24, 2024
6e0580c
finalised_tikhonov_regularization
nik-liegroup Jan 25, 2024
f3f8da4
fixed_fourierfile
nik-liegroup Feb 1, 2024
ab61fe0
Included Ryans inversion method to prelim func
nik-liegroup Feb 7, 2024
1f7e0f6
Update 1.1
nik-liegroup Mar 1, 2024
2ee01c9
update
nik-liegroup Mar 4, 2024
f81dc55
Restructured functions and added option to extract center z-slice
nik-liegroup Mar 15, 2024
7aa4dbb
Added more options for noise calculations
nik-liegroup Mar 16, 2024
2bb47b6
more changes
nik-liegroup Mar 16, 2024
edcb689
added prelim fft and bem code
nik-liegroup Mar 17, 2024
d635c13
updated but plot function not working
nik-liegroup Mar 24, 2024
f0449b9
fixed plot function and added .gif functionality
nik-liegroup Mar 28, 2024
243a0ab
fixed_gif_problems
nik-liegroup Mar 29, 2024
ed4dc6f
fixed_masking
nik-liegroup Mar 30, 2024
387c539
Removed large example files
nik-liegroup Apr 10, 2024
2b18427
fixed_regularization
nik-liegroup Apr 11, 2024
1cad7c1
removed_superfluous_files
nik-liegroup Apr 12, 2024
0107042
removed_pycharm_idea_folder
nik-liegroup Apr 12, 2024
7a0c668
Revert "removed_pycharm_idea_folder"
nik-liegroup Apr 12, 2024
410087d
ignore_prelim
nik-liegroup Apr 12, 2024
3a51677
Update .gitignore
nik-liegroup Apr 12, 2024
3f415fc
removed prelim_files
nik-liegroup Apr 12, 2024
eda97df
core and dataset tests
nik-liegroup Apr 12, 2024
484a13d
Update python-package.yml
nik-liegroup Apr 12, 2024
cd368a8
Revert "Update python-package.yml"
nik-liegroup Apr 12, 2024
1c1131e
change dir in github acction
nik-liegroup Apr 12, 2024
119c0c4
Update python-package.yml
nik-liegroup Apr 12, 2024
47212a6
Update: load_data
nik-liegroup Apr 15, 2024
43c9ede
Fixed tests
nik-liegroup Apr 15, 2024
a85b1b2
Added widimand windef PIV algorithms
nik-liegroup Apr 20, 2024
a54f90e
Revert "Added widimand windef PIV algorithms"
nik-liegroup Apr 20, 2024
e533d0d
Added widim.pyd to git
nik-liegroup Apr 20, 2024
6b9e10b
Merge remote-tracking branch 'pytraction_nik/main'
nik-liegroup Apr 20, 2024
349f489
Create dependabot.yml
nik-liegroup Apr 21, 2024
149e8b1
updated example_config and package versions
nik-liegroup Apr 21, 2024
0a58365
Merge branch 'main' of https://github.com/nik-liegroup/pytraction
nik-liegroup Apr 21, 2024
50ad5d4
Update python-package.yml
nik-liegroup Apr 21, 2024
fced2b2
Update python-package.yml
nik-liegroup Apr 21, 2024
74f6b60
Fix: .pyd file not found
nik-liegroup Apr 21, 2024
e1a7262
Merge branch 'main' of https://github.com/nik-liegroup/pytraction
nik-liegroup Apr 21, 2024
fa214d3
Update .gitignore
nik-liegroup Apr 21, 2024
c58dff5
os independent .pyx compilation
nik-liegroup Apr 21, 2024
e043be3
Update python-package.yml
nik-liegroup Apr 21, 2024
785cc7c
cyhon req
nik-liegroup Apr 21, 2024
47bd22c
workflow updated
nik-liegroup Apr 21, 2024
dbda016
setup update
nik-liegroup Apr 21, 2024
584c68d
removed Cython in setup.py due to installation error
nik-liegroup Apr 21, 2024
bfdef53
fixed_setup file
nik-liegroup Apr 21, 2024
c8554bb
Update workflows
nik-liegroup Apr 21, 2024
97ec1ea
Merge remote-tracking branch 'pytraction_nik/main'
nik-liegroup Apr 21, 2024
05d22f7
piv_method choice in config
nik-liegroup Apr 22, 2024
c7cb537
updated_bem_method
nik-liegroup Apr 22, 2024
a8b87e5
added_bem_regularization
nik-liegroup Apr 22, 2024
6194960
Merge remote-tracking branch 'pytraction_nik/main'
nik-liegroup Apr 22, 2024
a688374
core, dataset, noise tests updated
nik-liegroup Apr 28, 2024
7670786
removed_postprocess_test
nik-liegroup Apr 28, 2024
e92abf0
Merge remote-tracking branch 'pytraction_nik/main'
nik-liegroup Apr 28, 2024
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: 18 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 2
updates:
- package-ecosystem: "python"
directory: "/"
schedule:
interval: "daily"
ignore:
- dependency-name: "numpy"
versions: ["1.24.4"]
- dependency-name: "scikit-learn"
versions: ["0.24.1"]
- dependency-name: "scikit-image"
versions: ["0.18.1"]
- dependency-name: "matplotlib"
versions: ["3.7.5"]
commit-message:
prefix: "chore(deps): update"
commit-args: ["-S"]
21 changes: 7 additions & 14 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: [3.8]

steps:
- uses: actions/checkout@v2
Expand All @@ -28,25 +28,18 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install flake8 pytest-cov
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if (Test-Path requirements.txt) { pip install -r requirements.txt }
- name: List installed packages
run: |
pip list
- name: Install locally
run: |
pip install -e .
# - name: Get example data
# run: |
# pytraction_get_data
# - name: Lint with flake8
# run: |
# # stop the build if there are Python syntax errors or undefined names
# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
# flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
run: |
cd tests
pytest --cov=. --cov-report=xml --ignore=pytraction/net/*
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
files: coverage.xml


13 changes: 3 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
# Additional
building/*
data/*
.vscode/*
data2/*
*.tif
*.pth
*.zip
examples/data/*
examples/pytraction/*
*.h5
!tests/data/*
*/prelim_code/
*/.idea/
.bash_history/
.ssh/*
.vscode-server/*
.vscode/*

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/pytraction.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

181 changes: 181 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
![GitHub Python Workflow](https://github.com/rg314/pytraction/actions/workflows/python-package.yml/badge.svg)
![GitHub Test docker-compose](https://github.com/rg314/pytraction/actions/workflows/test-docker-compose.yml/badge.svg)
![GitHub Python Workflow](https://github.com/nik-liegroup/pytraction/actions/workflows/python-package.yml/badge.svg)
![GitHub Test docker-compose](https://github.com/nik-liegroup/pytraction/actions/workflows/test-docker-compose.yml/badge.svg)
[![codecov](https://codecov.io/gh/rg314/pytraction/branch/main/graph/badge.svg?token=5HLPLUWIXN)](https://codecov.io/gh/rg314/pytraction)

<p align="center">
Expand Down
27 changes: 0 additions & 27 deletions config/config.yaml

This file was deleted.

Loading