Test for dirichlet optimizations

include/meta/index/ranker/dirichlet_prior.h

@@ -72,26 +72,33 @@ class dirichlet_prior : public language_model_ranker
 };
 
 class dirichlet_prior_opt : public dirichlet_prior{
-    void rank(ranker_context &ctx, uint64_t num_results, const filter_function_type &filter) const override{
+//    void rank(ranker_context &ctx, uint64_t num_results, const filter_function_type &filter) const override{
+//        ranking_function::rank(ctx, num_results, filter);
+//    }
+    template <class ForwardIterator>
+    std::vector<search_result> score(inverted_index& idx, ForwardIterator begin,
+                                     ForwardIterator end,
+                                     uint64_t num_results = 10)
+    {
         // optimize mu according to ranker_context before ranking
-        this->optimize_mu(ctx);
+        this->optimize_mu(idx);
 
-        ranking_function::rank(ctx, num_results, filter);
+        return ranker::score(idx, begin, end, num_results);
     }
 
-    virtual void optimize_mu(const ranker_context &ctx) = 0;
+    virtual void optimize_mu(const inverted_index& idx) = 0;
 };
 
 class digamma_rec: public dirichlet_prior_opt{
-    void optimize_mu(const ranker_context &ctx) override;
+    void optimize_mu(const inverted_index& idx) override;
 };
 
 class log_approx: public dirichlet_prior_opt{
-    void optimize_mu(const ranker_context &ctx) override;
+    void optimize_mu(const inverted_index& idx) override;
 };
 
 class mackay_peto: public dirichlet_prior_opt{
-    void optimize_mu(const ranker_context &ctx) override;
+    void optimize_mu(const inverted_index& idx) override;
 };
 
 /**

src/index/ranker/CMakeLists.txt

@@ -1,5 +1,7 @@
 project(meta-ranker)
 
+add_subdirectory(test_opt)
+
 add_library(meta-ranker absolute_discount.cpp
                         dirichlet_prior.cpp
                         jelinek_mercer.cpp

src/index/ranker/dirichlet_prior.cpp

@@ -33,7 +33,7 @@ void dirichlet_prior::save(std::ostream& out) const
     io::packed::write(out, mu_);
 }
 
-float dirichlet_prior::smoothed_prob(score_data& sd)
+float dirichlet_prior::smoothed_prob(const score_data& sd) const
 {
     float pc = static_cast<float>(sd.corpus_term_count) / sd.total_terms;
     float numerator = sd.doc_term_count + mu_ * pc;

src/index/ranker/test_opt/CMakeLists.txt

@@ -0,0 +1,8 @@
+project(meta-dirichlet-test)
+
+include_directories(../../../../include)
+
+add_executable(test_opt test.cpp)
+
+target_link_libraries(test_opt meta-ranker)
+

src/index/ranker/test_opt/test.cpp

@@ -0,0 +1,12 @@
+#include "meta/corpus/document.h"
+#include "meta/index/ranker/all.h"
+#include "meta/index/forward_index.h"
+
+#include <iostream>
+
+
+int main(){
+
+  std::cout << "Quaia!" << std::endl;
+  meta::index::dirichlet_prior ranker;
+}

src/stats/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(meta-stats)
 
-add_library(meta-stats running_stats.cpp optimization.cpp)
+add_library(meta-stats running_stats.cpp)
 target_link_libraries(meta-stats meta-definitions)
 
 install(TARGETS meta-stats