Drop zero-length segments returned by Arbor

- Sync to arbor master - Really drop empty segments - Account for floating point accuracy
arbor-sim · Sep 8, 2021 · 67e3f03 · 67e3f03
1 parent 289eabf
commit 67e3f03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/3rd-party/arbor b/3rd-party/arbor
diff --git a/src/cell_builder.cpp b/src/cell_builder.cpp
@@ -45,7 +45,7 @@ void cell_builder::make_label_dict(std::vector<ls_def>& locsets, std::vector<rg_
 std::vector<arb::msegment> cell_builder::make_segments(const arb::region& region) {
   auto concrete = thingify(region, provider);
   auto result = pwlin.all_segments(concrete);
-  std::remove_if(result.begin(), result.end(), [](const auto& s) { return s.dist == s.prox; });
+  std::erase_if(result, [](const auto& s) { return distance(s.dist, s.prox) <= std::numeric_limits<double>::epsilon(); });
   return result;
 }
+1 −1		CONTRIBUTING.md
+1 −0		README.md
+3 −3		arbor/backends/event.hpp
+15 −4		arbor/fvm_layout.cpp
+1 −1		arbor/fvm_lowered_cell.hpp
+1 −1		arbor/fvm_lowered_cell_impl.hpp
+3 −3		arbor/include/arbor/common_types.hpp
+2 −2		arbor/include/arbor/fvm_types.hpp
+9 −0		arbor/include/arbor/mechanism_abi.h
+3 −0		arbor/include/arbor/mechinfo.hpp
+1 −1		arbor/include/arbor/profile/meter_manager.hpp
+0 −4		arbor/include/arbor/simd/simd.hpp
+1 −0		arbor/mechinfo.cpp
+3 −1		arborio/neurolucida.cpp
+4 −1		ci/test-ault-fujitsu.sh
+2 −2		doc/contrib/index.rst
+1 −1		doc/contrib/pr.rst
+1 −1		doc/index.rst
+20 −15		doc/install/build_install.rst
+35 −34		doc/install/python.rst
+10 −0		doc/python/mechanisms.rst
+6 −0		python/mechanism.cpp
+25 −25		test/unit/test_asc.cpp
+25 −0		test/unit/test_fvm_layout.cpp