Fix Labeler implementation. Now, 'labeler' method is defined as virtu…

…al in 'DecodabelModel'.
topsframework · Aug 18, 2015 · 18628f4 · 18628f4
1 parent 8c4349e
commit 18628f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/include/model/DecodableModel.hpp b/include/model/DecodableModel.hpp
@@ -29,6 +29,7 @@
 
 // ToPS templates
 #include "model/Labeling.tcc"
+#include "model/Labeler.tcc"
 
 namespace tops {
 namespace model {
@@ -53,6 +54,8 @@ class DecodableModel : public virtual ProbabilisticModel {
       const Labeling<Sequence> &sequence, bool cached = false) = 0;
 
   virtual GeneratorPtr<Labeling> labelingGenerator() = 0;
+  virtual LabelerPtr<Standard> labeler(const Standard<Sequence> &s,
+                                       bool cached = false) = 0;
 };
 
 }  // namespace model

diff --git a/include/model/DecodableModelCrtp.tcc b/include/model/DecodableModelCrtp.tcc
@@ -103,7 +103,7 @@ class DecodableModelCrtp
   GeneratorPtr<Labeling> labelingGenerator() override;
 
   LabelerPtr<Standard> labeler(const Standard<Sequence> &s,
-                                       bool cached = false);
+                               bool cached = false) override;
 
   // Purely virtual methods
   virtual void initializeCache(CEPtr<Labeling> evaluator,