Merge branch 'smalton/DOR-577-server-polya_patch' into 'master'

[DOR-577] Tidier function signature Closes DOR-577 See merge request machine-learning/dorado!933
nanoporetech · Apr 4, 2024 · f469eaa · f469eaa
2 parents c88e9f7 + 30474a6
commit f469eaa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/dorado/read_pipeline/ClientInfo.h b/dorado/read_pipeline/ClientInfo.h
@@ -25,8 +25,7 @@ class ClientInfo {
     virtual ~ClientInfo() = default;
 
     virtual const AlignmentInfo& alignment_info() const = 0;
-    virtual const std::unique_ptr<const poly_tail::PolyTailCalculator>& poly_a_calculator()
-            const = 0;
+    virtual const poly_tail::PolyTailCalculator* poly_a_calculator() const = 0;
 
     virtual int32_t client_id() const = 0;
     virtual bool is_disconnected() const = 0;

diff --git a/dorado/read_pipeline/DefaultClientInfo.h b/dorado/read_pipeline/DefaultClientInfo.h
@@ -21,8 +21,8 @@ class DefaultClientInfo final : public ClientInfo {
     ~DefaultClientInfo() = default;
 
     const AlignmentInfo& alignment_info() const override { return empty_alignment_info; }
-    const std::unique_ptr<const poly_tail::PolyTailCalculator>& poly_a_calculator() const override {
-        return m_poly_a_calculator;
+    const poly_tail::PolyTailCalculator* poly_a_calculator() const override {
+        return m_poly_a_calculator.get();
     };
 
     int32_t client_id() const override { return -1; }

diff --git a/dorado/read_pipeline/PolyACalculatorNode.cpp b/dorado/read_pipeline/PolyACalculatorNode.cpp
@@ -25,7 +25,7 @@ void PolyACalculatorNode::input_thread_fn() {
         // If this message isn't a read, we'll get a bad_variant_access exception.
         auto read = std::get<SimplexReadPtr>(std::move(message));
 
-        const auto& calculator = read->read_common.client_info->poly_a_calculator();
+        auto calculator = read->read_common.client_info->poly_a_calculator();
         if (!calculator) {
             send_message_to_sink(std::move(read));
             num_not_called++;

diff --git a/tests/AlignerTest.cpp b/tests/AlignerTest.cpp
@@ -1,7 +1,6 @@
 #include "MessageSinkUtils.h"
 #include "TestUtils.h"
 #include "alignment/Minimap2Aligner.h"
-#include "poly_tail/poly_tail_calculator.h"
 #include "read_pipeline/AlignerNode.h"
 #include "read_pipeline/ClientInfo.h"
 #include "read_pipeline/HtsReader.h"
@@ -29,16 +28,14 @@ namespace {
 
 class TestClientInfo : public dorado::ClientInfo {
     const dorado::AlignmentInfo m_align_info;
-    const std::unique_ptr<const dorado::poly_tail::PolyTailCalculator> m_calculator;
 
 public:
     TestClientInfo(dorado::AlignmentInfo align_info) : m_align_info(std::move(align_info)) {}
 
     int32_t client_id() const override { return 1; }
 
-    const std::unique_ptr<const dorado::poly_tail::PolyTailCalculator>& poly_a_calculator()
-            const override {
-        return m_calculator;
+    const dorado::poly_tail::PolyTailCalculator* poly_a_calculator() const override {
+        return nullptr;
     };
 
     const dorado::AlignmentInfo& alignment_info() const override { return m_align_info; }