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

Fixing broken tests (Part I) #874

Conversation

ns-rse
Copy link
Collaborator

@ns-rse ns-rse commented Jul 16, 2024

Work on getting the existing tests to pass in light of all the changes in maxgamill-sheffield/800-better-tracing, still a fair bit to go but small Pull Requests are considerably easier and faster to undertake.

tests/test_grainstats_minicircle.py

  • reset regression tests output molecule_number > grain_number in statistics output.
  • Reset minicircle_grainstats.cropped_size as commit 53fd579 set the default grainstats.cropped_size to -1 which
    broke the tests which were developed using a size of 40.0nm rather than bounding to the image (which is what -1 does).

tests/tracing/test_dnatracing_multigrain.py

  • npt.NDArray typehints.
  • pytest.param(id="") added.
  • skeletonisation_method="topostats" no longer a valid option to dnaTrace() class, so updated, in some places this uses the **dnatracing_config keyword approach.

tests/tracing/test_dnatracing_methods.py

  • pytest.param(id="") added.
  • grain > mask
  • Removed print()

tests/tracing/test_dnatracing_single_grain.py

  • dnatrac.smoothed_grain > dnatrace.smoothed_mask

topostats/tracing/dnatracing.py

  • grain > mask in a number of places.

Partially addresses issues detailed in #850.

+ reset regression tests output `molecule_number` > `grain_number` in `statistics` output.
+ Reset `minicircle_grainstats.cropped_size` as commit 53fd579 set the default `grainstats.cropped_size` to `-1` which
  broke the tests which were developed using a size of 40.0nm rather than bounding to the image (which is what `-1` does).
@ns-rse ns-rse added DNATracing Issues pertaining to the DNATracing class tests Issues pertaining to testing labels Jul 16, 2024
@ns-rse ns-rse added this to the Tracing and Cats milestone Jul 16, 2024
@ns-rse ns-rse changed the title refactor(dnatracing) : remove ambiguous grain (image or mask only) Fixing broken tests (Part I) Jul 16, 2024
@MaxGamill-Sheffield
Copy link
Collaborator

With merge of Sylvia's NN there is some issues, I'm not sure if it just needs a pull of her branch and changes?

@MaxGamill-Sheffield
Copy link
Collaborator

Fixed above - mainly just conflicts between variable names and typehints in geometry.py in which Sylvias' were more explicit.
Changes in nodestats were lengthening abbreviated comments

@MaxGamill-Sheffield
Copy link
Collaborator

This looks like a great start to keep things small.

I was running the tests but realise they still fail because they have not been addressed here, just terminology and "id's" added which sound like a good idea for diagnosing why.

Happy to merge to the main 800 branch

@MaxGamill-Sheffield MaxGamill-Sheffield merged commit a1bc487 into maxgamill-sheffield/800-better-tracing Jul 24, 2024
1 of 2 checks passed
@MaxGamill-Sheffield MaxGamill-Sheffield deleted the ns-rse/818-test-simplification branch July 24, 2024 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DNATracing Issues pertaining to the DNATracing class tests Issues pertaining to testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants