finalized merge

1 files changed, 1 insertions, 25 deletions

diff --git a/klm/lm/virtual_interface.hh b/klm/lm/virtual_interface.hh
index 08627efd..6a5a0196 100644
--- a/klm/lm/virtual_interface.hh
+++ b/klm/lm/virtual_interface.hh
@@ -1,37 +1,13 @@
 #ifndef LM_VIRTUAL_INTERFACE__
 #define LM_VIRTUAL_INTERFACE__
 
+#include "lm/return.hh"
 #include "lm/word_index.hh"
 #include "util/string_piece.hh"
 
 #include <string>
 
 namespace lm {
-
-/* Structure returned by scoring routines. */
-struct FullScoreReturn {
-  // log10 probability
-  float prob;
-
-  /* The length of n-gram matched.  Do not use this for recombination.  
-   * Consider a model containing only the following n-grams:
-   * -1 foo
-   * -3.14  bar
-   * -2.718 baz -5
-   * -6 foo bar
-   *
-   * If you score ``bar'' then ngram_length is 1 and recombination state is the
-   * empty string because bar has zero backoff and does not extend to the
-   * right.  
-   * If you score ``foo'' then ngram_length is 1 and recombination state is 
-   * ``foo''.  
-   *
-   * Ideally, keep output states around and compare them.  Failing that,
-   * get out_state.ValidLength() and use that length for recombination.
-   */
-  unsigned char ngram_length;
-};
-
 namespace base {
 
 template <class T, class U, class V> class ModelFacade;