From 93cdd8bb462f666451b8e45b73c5c22fbe7650f2 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Fri, 3 Mar 2017 13:28:11 +0000 Subject: [PATCH] Remove unneccessar branch in CoreCH code --- include/engine/datafacade/algorithm_datafacade.hpp | 2 -- .../datafacade/contiguous_internalmem_datafacade.hpp | 10 ++-------- unit_tests/mocks/mock_datafacade.hpp | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/include/engine/datafacade/algorithm_datafacade.hpp b/include/engine/datafacade/algorithm_datafacade.hpp index 004f33341..ac7de6916 100644 --- a/include/engine/datafacade/algorithm_datafacade.hpp +++ b/include/engine/datafacade/algorithm_datafacade.hpp @@ -57,8 +57,6 @@ template <> class AlgorithmDataFacade using EdgeData = contractor::QueryEdge::EdgeData; virtual bool IsCoreNode(const NodeID id) const = 0; - - virtual std::size_t GetCoreSize() const = 0; }; } } diff --git a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp index 34f22490b..0f53bfb93 100644 --- a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp +++ b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp @@ -175,15 +175,9 @@ class ContiguousInternalMemoryAlgorithmDataFacade bool IsCoreNode(const NodeID id) const override final { - if (m_is_core_node.size() > 0) - { - return m_is_core_node.at(id); - } - - return false; + BOOST_ASSERT(id < m_is_core_node.size()); + return m_is_core_node[id]; } - - std::size_t GetCoreSize() const override final { return m_is_core_node.size(); } }; /** diff --git a/unit_tests/mocks/mock_datafacade.hpp b/unit_tests/mocks/mock_datafacade.hpp index 0ef54270f..1d490b70e 100644 --- a/unit_tests/mocks/mock_datafacade.hpp +++ b/unit_tests/mocks/mock_datafacade.hpp @@ -289,7 +289,6 @@ class MockAlgorithmDataFacade public: bool IsCoreNode(const NodeID /* id */) const override { return false; } - std::size_t GetCoreSize() const override { return 0; } }; template