Skip to content
Merged
Show file tree
Hide file tree
Changes from 59 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
7c42408
update readdy module to match cytosim as much as possible
Jun 25, 2024
0b17f02
script to copy readdy outputs
Jun 26, 2024
aa344d5
visualize individual trajectories, leverage readdy post processing co…
Jun 27, 2024
de1b0a5
visualize combined
Jun 27, 2024
037f3bf
add readdy baseline individual viz
Jul 1, 2024
fa06164
WIP tomography viz
Jul 1, 2024
9bd0675
tomography visualization
Jul 1, 2024
5cea593
Merge branch 'main' into update-viz
Jul 1, 2024
4bd4c60
calculate compression metrics on tomography data for viz
Jul 2, 2024
27050ce
WIP debugging tomography visualization and analysis
Jul 3, 2024
97b09e3
dim reduction viz, tomography viz in separate files
Jul 8, 2024
1ec3599
WIP adding options to pca viz
Jul 9, 2024
503c5b6
Update name to series_name in workflow docstrings
jessicasyu Jul 1, 2024
1866f55
Move copy readdy outputs into workflow notebooks
jessicasyu Jul 1, 2024
73c4527
Lint readdy processing notebooks
jessicasyu Jul 1, 2024
5164acf
Update docstrings in readdy data structures module
jessicasyu Jul 2, 2024
b599032
Update docstrings in readdy loader module
jessicasyu Jul 2, 2024
1366b98
Update docstrings and type hinting in readdy post processor module
jessicasyu Jul 2, 2024
5190623
Fix readdy no compression simulation series name
jessicasyu Jul 2, 2024
f6e7376
Update readdy simulation workflows
jessicasyu Jul 2, 2024
548f3aa
Fix autodoc for readdy simulation module
jessicasyu Jul 2, 2024
5497614
Fix floating point error when calculating control points
jessicasyu Jul 3, 2024
9ca451b
Fix readdy series name in dim reduction analysis
jessicasyu Jul 3, 2024
36065d0
Add compression metric descriptions and bounds to enum
jessicasyu Jul 3, 2024
6f7b3d5
Update compression workflow to include non compression cases
jessicasyu Jul 3, 2024
e89b6a0
Fix readdy post processor normal calculation to skip start and end
jessicasyu Jul 3, 2024
e9921d2
Remove outdated visualization files
jessicasyu Jul 3, 2024
881125b
Update individual simulator visualization workflows
jessicasyu Jul 3, 2024
b0ff9e6
Adjust number of sampled timepoints for Cytosim to match ReaDDy
jessicasyu Jul 8, 2024
fba0a71
Refactor combined trajectory visualization
jessicasyu Jul 8, 2024
11986b6
Add visualization notebooks to docs
jessicasyu Jul 8, 2024
07ca4eb
Add normalized time to compression metrics workflow
jessicasyu Jul 9, 2024
1d378e2
Update PCA transform points
jessicasyu Jul 9, 2024
a84eb7c
* refactor tomography visualization functions
mogres Jul 9, 2024
cf1ca60
Update tomography visualization
jessicasyu Jul 9, 2024
e4a7597
add column to check if files are ordered
mogres Jul 10, 2024
669374d
Merge branch 'main' into debug-update-viz
jessicasyu Jul 10, 2024
120ad45
Formatting for compression metrics analysis
jessicasyu Jul 10, 2024
6699c55
Update pca analysis workflow to save results to bucket
jessicasyu Jul 10, 2024
18c54a5
Update visualization README
jessicasyu Jul 10, 2024
7e5d06a
Refactor PCA visualization
jessicasyu Jul 10, 2024
0b1001f
merged in changes from testing PCA viz with options
Jul 15, 2024
d81f78c
update colors and camera position for combined viz
Jul 15, 2024
64c8762
PCA viz tested with all options
Jul 16, 2024
d4cf64d
test and tweak individual readdy viz
Jul 17, 2024
723343b
test and tweak individual cytosim viz
Jul 17, 2024
4dd48a3
updated camera views for individual and PCA viz
Jul 17, 2024
dfba623
finish commit
Jul 17, 2024
05bccff
add ipdb to requirements
mogres Jul 17, 2024
83fab65
Methods to calculate twist angle
mogres Jul 17, 2024
d8895fe
Methods to visualize twist angle
mogres Jul 17, 2024
1cb6bff
Remove tangent angle visualization. Fix doc strings.
mogres Jul 18, 2024
5cf8e74
Merge branch 'debug-update-viz' of github.com:simularium/subcell-pipe…
mogres Jul 18, 2024
a3e4740
lint
Jul 19, 2024
e85f117
more lint
Jul 19, 2024
65b4f9d
and more linting
Jul 19, 2024
491173e
fix saving tomography 2D plots
Jul 19, 2024
7c87800
tweaks to dim reduction and tomography viz
Jul 19, 2024
aa34e3b
lint
Jul 19, 2024
9d87bfe
Update subcell_pipeline/analysis/compression_metrics/README.md
Jul 25, 2024
7085345
changes from review
Jul 25, 2024
76b2ced
add h5py with pdm, remove unused imageio dep, remove broken tests
Jul 25, 2024
305b0d0
don't run tests on build since there aren't any
Jul 25, 2024
497bcb5
calculate total steps for readdy
Jul 25, 2024
d0328b5
remove .pdm-python and add to gitignore
Jul 29, 2024
d2c6c0a
Merge remote-tracking branch 'origin/feature/polymer_twist' into debu…
Jul 29, 2024
f2dfd59
more changes from review
Jul 29, 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
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@ jobs:
conda env update --file environment.yml --prune
pdm sync

- name: Test with pytest
shell: bash -l {0}
run: |
pdm run pytest --cov --cov-report html
rm htmlcov/.gitignore

Copy link
Collaborator

Choose a reason for hiding this comment

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

I would keep the build workflow as is (it'll break the coverage badge otherwise). It just won't find any tests to run, which I think is fine.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

it breaks the build otherwise. We can add one test that passes, or maybe the coverage badge should be removed since we know it's zero, unfortunately

Copy link
Collaborator

Choose a reason for hiding this comment

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

I can refactor the existing test so it passes? It doesn't need to be in this PR

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

can I leave it like this for this PR and you can pull this back in with the fixed test?

- name: Publish coverage report
if: ${{ github.ref == 'refs/heads/main' && matrix.python-version == '3.10' }}
uses: JamesIves/github-pages-deploy-action@v4
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,4 @@ ENV/
*.cym
*.simularium
**/analysis_outputs/**
*.h5
1 change: 1 addition & 0 deletions .pdm-python
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/Users/blairl/Documents/Dev/subcell-pipeline/.venv/bin/python
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

# List of modules to be mocked up. Useful when some external dependencies are
# not met at build time and break the building process.
autodoc_mock_imports = []
autodoc_mock_imports = ["readdy"]

# Controls how to represent typehints.
autodoc_typehints = "signature"
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

Simulations <simulation>
Analysis <analysis>
Visualization <visualization>

.. autosummary::
:toctree: _summary
Expand All @@ -25,6 +26,7 @@

subcell_pipeline.simulation
subcell_pipeline.analysis
subcell_pipeline.visualization

.. toctree::
:hidden:
Expand Down
5 changes: 5 additions & 0 deletions docs/visualization.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Visualization workflow notebooks
================================

.. include:: ../subcell_pipeline/visualization/README.md
:parser: myst_parser.sphinx_
Loading