Skip to content

Commit

Permalink
Merge branch 'use-sorted-semi-axes-for-curvature-calculation' of http…
Browse files Browse the repository at this point in the history
…s://github.com/jo-mueller/napari-stress into use-sorted-semi-axes-for-curvature-calculation
  • Loading branch information
jo-mueller committed Sep 5, 2024
2 parents ea576ed + 4fa8536 commit 164c16e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
10 changes: 7 additions & 3 deletions src/napari_stress/_measurements/toolbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -499,9 +499,13 @@ def comprehensive_analysis(
gamma=gamma,
)

max_min_anisotropy = 2 * gamma * (
Expander_ellipsoid.properties["maximum_mean_curvature"]
- Expander_ellipsoid.properties["minimum_mean_curvature"]
max_min_anisotropy = (
2
* gamma
* (
Expander_ellipsoid.properties["maximum_mean_curvature"]
- Expander_ellipsoid.properties["minimum_mean_curvature"]
)
)

result = measurements.tissue_stress_tensor(
Expand Down
19 changes: 10 additions & 9 deletions src/napari_stress/_tests/test_measurements.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,21 +439,21 @@ def test_comprehensive_stress_toolbox_4d(make_napari_viewer):
# Check against legacy measurements: load legacy data
legacy_results_file = Path(__file__).parent / "stress_tissue_anisotropy.csv"
df_legacy = pd.read_csv(legacy_results_file, header=None).T
df_legacy.columns = ['tissue_stress_anisotropy']
df_legacy.columns = ["tissue_stress_anisotropy"]

results_layer = viewer.layers['Result of lebedev quadrature on ellipsoid']
results_layer = viewer.layers["Result of lebedev quadrature on ellipsoid"]
result_tissue_stress = results_layer.metadata[
types._METADATAKEY_STRESS_TISSUE_ANISO]

difference_abs = result_tissue_stress - df_legacy['tissue_stress_anisotropy'].values
difference_rel = difference_abs / df_legacy['tissue_stress_anisotropy'].values
types._METADATAKEY_STRESS_TISSUE_ANISO
]

difference_abs = result_tissue_stress - df_legacy["tissue_stress_anisotropy"].values
difference_rel = difference_abs / df_legacy["tissue_stress_anisotropy"].values

# make sure that the results are within limits of agreement
assert np.all(np.abs(difference_rel).mean() < 0.1)
assert np.all(np.abs(difference_abs).mean() < 0.1)



def test_curvature(make_napari_viewer):
from napari_stress._spherical_harmonics.spherical_harmonics_napari import (
perform_lebedev_quadrature,
Expand Down Expand Up @@ -687,6 +687,7 @@ def test_stresses():
measurements.maximal_tissue_anisotropy(ellipsoid, gamma=gamma)


if __name__ == '__main__':
if __name__ == "__main__":
import napari
test_comprehensive_stress_toolbox_4d(napari.Viewer)

test_comprehensive_stress_toolbox_4d(napari.Viewer)

0 comments on commit 164c16e

Please sign in to comment.