Lin space

[fweik]

Maybe fixes #2837.

[KaiSzuttor]

as I said, I already tried that...

[codecov]

Codecov Report

Merging #2840 into python will not change coverage.
The diff coverage is 100%.

@@          Coverage Diff           @@
##           python   #2840   +/-   ##
======================================
  Coverage      82%     82%           
======================================
  Files         519     519           
  Lines       26958   26958           
======================================
  Hits        22312   22312           
  Misses       4646    4646

Impacted Files	Coverage Δ
src/utils/tests/raster_test.cpp	100% <100%> (ø)	⬆️
src/utils/include/utils/raster.hpp	100% <100%> (ø)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5b88304...348a427. Read the comment docs.

[mkuron]

The Numpy thing can easily be fixed by replacing numpy.linalg.norm(A, axis=1) with numpy.sqrt(numpy.einsum('ij,ij->i',A,A)). That already works in Numpy 1.6.0.

[KaiSzuttor]

this is hard to read, I'd prefer to have a utility function that wraps this logic for older numpy versions

[fweik]

diff --git a/src/utils/include/utils/math/make_lin_space.hpp b/src/utils/include/utils/math/make_lin_space.hpp
index fa2198d06..6145048a3 100644
--- a/src/utils/include/utils/math/make_lin_space.hpp
+++ b/src/utils/include/utils/math/make_lin_space.hpp
@@ -45,8 +45,21 @@ auto make_lin_space(T start, T stop, size_t number, bool endpoint = true) {
   using boost::make_iterator_range;
   using boost::make_transform_iterator;
 
+  struct X {
+       using result_type = T;
+
+       T dx;
+       T start;
+
+       T operator()(size_t i) const {
+          return start + i * dx;
+       }
+  };
+
   auto const dx = (stop - start) / (number - endpoint);
-  auto x = [dx, start](size_t i) { return start + i * dx; };
+//  auto x = [dx, start](size_t i) { return start + i * dx; };
+
+      auto const x = X{dx, start};
 
   return make_iterator_range(
       make_transform_iterator(make_counting_iterator(size_t(0)), x),

[KaiSzuttor]

where is T actually used?

[KaiSzuttor]

bors r+

[bors]

Build succeeded

• ICP GitLab CI