Working version of the grammar extractor.

1 files changed, 15 insertions, 14 deletions

diff --git a/extractor/suffix_array_test.cc b/extractor/suffix_array_test.cc
index d891933c..60295567 100644
--- a/extractor/suffix_array_test.cc
+++ b/extractor/suffix_array_test.cc
@@ -14,10 +14,10 @@ namespace {
 class SuffixArrayTest : public Test {
  protected:
   virtual void SetUp() {
-    data = vector<int>{5, 3, 0, 1, 3, 4, 2, 3, 5, 5, 3, 0, 1};
+    data = {6, 4, 1, 2, 4, 5, 3, 4, 6, 6, 4, 1, 2};
     data_array = make_shared<MockDataArray>();
     EXPECT_CALL(*data_array, GetData()).WillRepeatedly(ReturnRef(data));
-    EXPECT_CALL(*data_array, GetVocabularySize()).WillRepeatedly(Return(6));
+    EXPECT_CALL(*data_array, GetVocabularySize()).WillRepeatedly(Return(7));
     EXPECT_CALL(*data_array, GetSize()).WillRepeatedly(Return(13));
     suffix_array = make_shared<SuffixArray>(data_array);
   }
@@ -33,14 +33,15 @@ TEST_F(SuffixArrayTest, TestData) {
 }
 
 TEST_F(SuffixArrayTest, TestBuildSuffixArray) {
-  vector<int> expected_suffix_array{2, 11, 3, 12, 6, 1, 10, 4, 7, 5, 0, 9, 8};
+  vector<int> expected_suffix_array =
+      {13, 11, 2, 12, 3, 6, 10, 1, 4, 7, 5, 9, 0, 8};
   for (size_t i = 0; i < expected_suffix_array.size(); ++i) {
     EXPECT_EQ(expected_suffix_array[i], suffix_array->GetSuffix(i));
   }
 }
 
 TEST_F(SuffixArrayTest, TestBuildLCP) {
-  vector<int> expected_lcp{-1, 2, 0, 1, 0, 0, 3, 1, 1, 0, 0, 4, 1, 0};
+  vector<int> expected_lcp = {-1, 0, 2, 0, 1, 0, 0, 3, 1, 1, 0, 0, 4, 1};
   EXPECT_EQ(expected_lcp, suffix_array->BuildLCPArray());
 }
 
@@ -50,26 +51,26 @@ TEST_F(SuffixArrayTest, TestLookup) {
   }
 
   EXPECT_CALL(*data_array, HasWord("word1")).WillRepeatedly(Return(true));
-  EXPECT_CALL(*data_array, GetWordId("word1")).WillRepeatedly(Return(5));
-  EXPECT_EQ(PhraseLocation(10, 13), suffix_array->Lookup(0, 14, "word1", 0));
+  EXPECT_CALL(*data_array, GetWordId("word1")).WillRepeatedly(Return(6));
+  EXPECT_EQ(PhraseLocation(11, 14), suffix_array->Lookup(0, 14, "word1", 0));
 
   EXPECT_CALL(*data_array, HasWord("word2")).WillRepeatedly(Return(false));
   EXPECT_EQ(PhraseLocation(0, 0), suffix_array->Lookup(0, 14, "word2", 0));
 
   EXPECT_CALL(*data_array, HasWord("word3")).WillRepeatedly(Return(true));
-  EXPECT_CALL(*data_array, GetWordId("word3")).WillRepeatedly(Return(3));
-  EXPECT_EQ(PhraseLocation(10, 12), suffix_array->Lookup(10, 13, "word3", 1));
+  EXPECT_CALL(*data_array, GetWordId("word3")).WillRepeatedly(Return(4));
+  EXPECT_EQ(PhraseLocation(11, 13), suffix_array->Lookup(11, 14, "word3", 1));
 
   EXPECT_CALL(*data_array, HasWord("word4")).WillRepeatedly(Return(true));
-  EXPECT_CALL(*data_array, GetWordId("word4")).WillRepeatedly(Return(0));
-  EXPECT_EQ(PhraseLocation(10, 12), suffix_array->Lookup(10, 12, "word4", 2));
+  EXPECT_CALL(*data_array, GetWordId("word4")).WillRepeatedly(Return(1));
+  EXPECT_EQ(PhraseLocation(11, 13), suffix_array->Lookup(11, 13, "word4", 2));
 
   EXPECT_CALL(*data_array, HasWord("word5")).WillRepeatedly(Return(true));
-  EXPECT_CALL(*data_array, GetWordId("word5")).WillRepeatedly(Return(1));
-  EXPECT_EQ(PhraseLocation(10, 12), suffix_array->Lookup(10, 12, "word5", 3));
+  EXPECT_CALL(*data_array, GetWordId("word5")).WillRepeatedly(Return(2));
+  EXPECT_EQ(PhraseLocation(11, 13), suffix_array->Lookup(11, 13, "word5", 3));
 
-  EXPECT_EQ(PhraseLocation(10, 11), suffix_array->Lookup(10, 12, "word3", 4));
-  EXPECT_EQ(PhraseLocation(10, 10), suffix_array->Lookup(10, 12, "word5", 1));
+  EXPECT_EQ(PhraseLocation(12, 13), suffix_array->Lookup(11, 13, "word3", 4));
+  EXPECT_EQ(PhraseLocation(11, 11), suffix_array->Lookup(11, 13, "word5", 1));
 }
 
 }  // namespace