Hyperparameters estimation for LDA

.gitignore

@@ -16,3 +16,5 @@ data/cranfield
 biicode.conf
 bii/
 bin/
+*.pro
+*.pro.user

include/meta/index/disk_index.h

@@ -87,6 +87,16 @@ class disk_index
      */
     std::vector<doc_id> docs() const;
 
+    /**
+     * @return a vector of term_ids that are contained in this index
+     */
+    std::vector<term_id> terms() const;
+
+    /**
+     * @return a vector of term_ids that are contained in the document with d_id
+     */
+    std::vector<term_id> terms(doc_id d_id) const;
+
     /**
      * @param d_id The document to search for
      * @return the size of the given document (the total number of terms

include/meta/index/ranker/all.h

@@ -1,6 +1,7 @@
 #include "meta/index/ranker/ranker.h"
 #include "meta/index/ranker/absolute_discount.h"
 #include "meta/index/ranker/dirichlet_prior.h"
+#include "meta/index/ranker/dirichlet_prior_opt.h"
 #include "meta/index/ranker/jelinek_mercer.h"
 #include "meta/index/ranker/lm_ranker.h"
 #include "meta/index/ranker/okapi_bm25.h"

include/meta/index/ranker/dirichlet_prior.h

@@ -1,82 +1,89 @@
-/**
- * @file dirichlet_prior.h
- * @author Sean Massung
- *
- * All files in META are released under the MIT license. For more details,
- * consult the file LICENSE in the root of the project.
- */
-
-#ifndef META_DIRICHLET_PRIOR_H_
-#define META_DIRICHLET_PRIOR_H_
-
-#include "meta/index/ranker/lm_ranker.h"
-#include "meta/index/ranker/ranker_factory.h"
-
-namespace meta
-{
-namespace index
-{
-
-/**
- * Implements Bayesian smoothing with a Dirichlet prior.
- *
- * Required config parameters:
- * ~~~toml
- * [ranker]
- * method = "dirichlet-prior"
- * ~~~
- *
- * Optional config parameters:
- * ~~~toml
- * mu = 2000.0
- * ~~~
-
- */
-class dirichlet_prior : public language_model_ranker
-{
-  public:
-    /// Identifier for this ranker.
-    const static util::string_view id;
-
-    /// Default value of mu
-    const static constexpr float default_mu = 2000.0f;
-
-    /**
-     * @param mu
-     */
-    dirichlet_prior(float mu = default_mu);
-
-    /**
-     * Loads a dirichlet_prior ranker from a stream.
-     * @param in The stream to read from
-     */
-    dirichlet_prior(std::istream& in);
-
-    void save(std::ostream& out) const override;
-
-    /**
-     * Calculates the smoothed probability of a term.
-     * @param sd score_data for the current query
-     */
-    float smoothed_prob(const score_data& sd) const override;
-
-    /**
-     * A document-dependent constant.
-     * @param sd score_data for the current query
-     */
-    float doc_constant(const score_data& sd) const override;
-
-  private:
-    /// the Dirichlet prior parameter
-    const float mu_;
-};
-
-/**
- * Specialization of the factory method used to create dirichlet_prior
- * rankers.
- */
-template <>
-std::unique_ptr<ranker> make_ranker<dirichlet_prior>(const cpptoml::table&);
-}
-}
-#endif
+/**
+ * @file dirichlet_prior.h
+ * @author Sean Massung
+ *
+ * All files in META are released under the MIT license. For more details,
+ * consult the file LICENSE in the root of the project.
+ */
+
+#ifndef META_DIRICHLET_PRIOR_H_
+#define META_DIRICHLET_PRIOR_H_
+
+#include "meta/index/ranker/lm_ranker.h"
+#include "meta/index/ranker/ranker_factory.h"
+
+namespace meta
+{
+namespace index
+{
+
+/**
+ * Implements Bayesian smoothing with a Dirichlet prior.
+ *
+ * Required config parameters:
+ * ~~~toml
+ * [ranker]
+ * method = "dirichlet-prior"
+ * ~~~
+ *
+ * Optional config parameters:
+ * ~~~toml
+ * mu = 2000.0
+ * ~~~
+
+ */
+class dirichlet_prior : public language_model_ranker
+{
+  public:
+    /// Identifier for this ranker.
+    const static util::string_view id;
+
+    /// Default value of mu
+    const static constexpr float default_mu = 2000.0f;
+
+    /**
+     * @param mu
+     */
+    dirichlet_prior(float mu = default_mu);
+
+    /**
+     * Loads a dirichlet_prior ranker from a stream.
+     * @param in The stream to read from
+     */
+    dirichlet_prior(std::istream& in);
+
+    void save(std::ostream& out) const override;
+
+    /**
+     * Calculates the smoothed probability of a term.
+     * @param sd score_data for the current query
+     */
+    float smoothed_prob(const score_data& sd) const override;
+
+    /**
+     * A document-dependent constant.
+     * @param sd score_data for the current query
+     */
+    float doc_constant(const score_data& sd) const override;
+
+    float parameter() const {
+        return mu_;
+    }
+
+  protected:
+    /// the Dirichlet prior parameter
+//    const float mu_;
+    float mu_;
+};
+
+
+/**
+ * Specialization of the factory method used to create dirichlet_prior
+ * rankers.
+ */
+template <>
+std::unique_ptr<ranker> make_ranker<dirichlet_prior>(const cpptoml::table&);
+
+}
+}
+#endif