-
Notifications
You must be signed in to change notification settings - Fork 134
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
Added CFAR and CCL feeders #494
Conversation
Codecov Report
@@ Coverage Diff @@
## main #494 +/- ##
==========================================
- Coverage 94.34% 93.79% -0.56%
==========================================
Files 154 155 +1
Lines 7344 7393 +49
Branches 1397 1406 +9
==========================================
+ Hits 6929 6934 +5
- Misses 313 357 +44
Partials 102 102
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One change needed for dependencies, but otherwise looks good 👍
setup.py
Outdated
@@ -27,7 +27,7 @@ | |||
use_scm_version=True, | |||
install_requires=[ | |||
'ruamel.yaml>=0.15.45', 'numpy>=1.17', 'scipy', 'matplotlib', 'utm', 'pymap3d', 'ordered-set', | |||
'setuptools>=42', 'rtree', | |||
'setuptools>=42', 'rtree', 'opencv-python' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this may be better in extra_requires
. There are examples for this for video
/tensorflow
.
You can raise a warning on the relevant imports, like the tensorflow notebooks.
Stone-Soup/stonesoup/detector/tensorflow.py
Lines 5 to 13 in c806374
try: | |
import tensorflow as tf | |
from object_detection.utils import label_map_util as lm_util | |
except ImportError as error: | |
raise ImportError( | |
"Usage of the TensorFlow detectors requires that TensorFlow and the TensorFlow Object " | |
"Detection API are installed. A quick guide on how to set these up can be found here: " | |
"https://tensorflow-object-detection-api-tutorial.readthedocs.io/en/latest/install.html")\ | |
from error |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sdhiscocks Thanks for the comment. I'll be picking up this PR, since Charlotte has now finished her internship. Do you think this should go under the video extras?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Either video or many a new group. video may be best, so we don't have too many, and it makes sense for opencv
Just spotted that the pickle files are fairly large. Wonder if there is an alternative? numpy.savez? Or maybe check properties of the resultant array (sum of array or diagonal matches expects)? |
Compressed option numpy.savez_compressed |
@sdhiscocks Good spot! I have cropped the test image, which leads to reduced size of the image file and replaced the pickle files with the actual expected images, which are much smaller. Hope this does the trick. I also noticed that there was no documentation for the introduced classes, so I've added that as well. |
Added Constant False Alarm Rate (CFAR) and Connected Component Labeling (CCL) feeders, that perform post processing of frames generated by frame readers.
Note: This PR depends on #492 and will be re-based.