diff --git a/TODO b/TODO index fb8a6eb..8ae681f 100644 --- a/TODO +++ b/TODO @@ -1,10 +1,12 @@ TODO ---- - --Make fits writer create specified directories if they do not exist -Replace "star recognizer" test images -> instead of one big, multiple small ones with only 2-5 stars. +-Fix github build +-Make fits writer create specified directories if they do not exist -Extract starmath library! -> Need a concept of namespaces, overall structure etc. - First plan! - + -> See https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p1204r0.html + -> See https://stackoverflow.com/questions/2360734/whats-a-good-directory-structure-for-larger-c-projects-using-makefile + -Add unit test for remove_nans() - add parameter to allow specifying size of filter matrix -Add unit tests for pipeline::io::write() -Add unit tests for nad pixel interpolator diff --git a/source/focus_finder/common/include/pipeline/view/crop.h b/source/focus_finder/common/include/pipeline/view/crop.h index 46770e2..19b38af 100644 --- a/source/focus_finder/common/include/pipeline/view/crop.h +++ b/source/focus_finder/common/include/pipeline/view/crop.h @@ -43,7 +43,9 @@ namespace starmath::pipeline { * */ template - static auto cropInternal(const CropRegionRngT & crop_regions, const std::shared_ptr> &image) { + //static auto + static std::vector>> + cropInternal(const CropRegionRngT & crop_regions, const std::shared_ptr> &image) { return crop_regions | ranges::view::transform( [=](const auto & crop_region) { @@ -59,19 +61,20 @@ namespace starmath::pipeline { ); } ) - | ranges::to>>>(); + | ranges::to(); } template auto + //std::vector>> crop() { return ranges::view::transform( [=](const auto & imageRectsPair) { auto img = imageRectsPair.first; std::vector> cropRects = imageRectsPair.second; - return cropInternal(cropRects, img); + return cropInternal(cropRects, img); // std::vector>> }); } diff --git a/source/focus_finder/tests/starmath-tests/pipeline_real_world_tests.cpp b/source/focus_finder/tests/starmath-tests/pipeline_real_world_tests.cpp index 480692b..02fc0b6 100644 --- a/source/focus_finder/tests/starmath-tests/pipeline_real_world_tests.cpp +++ b/source/focus_finder/tests/starmath-tests/pipeline_real_world_tests.cpp @@ -259,10 +259,10 @@ BOOST_AUTO_TEST_CASE(pipeline_star_recognizer_test) ) | crop() | views::join - | scale_up(3.0F) - | center_on_star(CentroidAlgorithmFactoryT::getInstance(CentroidAlgorithmTypeT::IWC)) - | scale_down(3.0F) - | write(std::filesystem::current_path(), "img_%04d.fit") // NOTE; oath must exist +// | scale_up(3.0F) +// | center_on_star(CentroidAlgorithmFactoryT::getInstance(CentroidAlgorithmTypeT::IWC)) +// | scale_down(3.0F) +// | write(std::filesystem::current_path(), "img_%04d.fit") // NOTE; path must exist | to();