go

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
index 6aea57709be1dd6f23f0e4c9c2ff5b5dab0ef96c..9ee034719dae879a433b09df722d08bba8271bb1 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilder.java
@@ -45,8 +45,8 @@ public class DictionaryBuilder {
   
   public DictionaryBuilder(final String dictInfo, final Language lang0, final Language lang1) {
     dictionary = new Dictionary(dictInfo);
-    indexBuilders.add(new IndexBuilder(this, lang0.getSymbol(), lang0.getSymbol() + "->" + lang1.getSymbol(), lang0));
-    indexBuilders.add(new IndexBuilder(this, lang1.getSymbol(), lang1.getSymbol() + "->" + lang0.getSymbol(), lang1));
+    indexBuilders.add(new IndexBuilder(this, lang0.getSymbol(), lang0.getSymbol() + "->" + lang1.getSymbol(), lang0, false));
+    indexBuilders.add(new IndexBuilder(this, lang1.getSymbol(), lang1.getSymbol() + "->" + lang0.getSymbol(), lang1, true));
   }
   
   void build() {

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryTest.java b/src/com/hughes/android/dictionary/engine/DictionaryTest.java
index d4ca69f00f6ddbf73ec5e93e76c04c6c1054b2d5..bfceeffa515a57b5a22f61f9eb68210d3213d212 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/DictionaryTest.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryTest.java
@@ -10,6 +10,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import junit.framework.TestCase;
 
+import com.hughes.android.dictionary.engine.Index.SearchResult;
+
 
 public class DictionaryTest extends TestCase {
   
@@ -47,30 +49,44 @@ public class DictionaryTest extends TestCase {
   public void testGermanIndex() throws IOException {
     for (final Index.IndexEntry indexEntry : deIndex.sortedIndexEntries) {
       System.out.println("testing: " + indexEntry.token);
-      final TokenRow row = deIndex.find(indexEntry.token, new AtomicBoolean(
+      final Index.SearchResult searchResult = deIndex.findLongestSubstring(indexEntry.token, new AtomicBoolean(
           false));
-      assertEquals(indexEntry.token.toLowerCase(), row.getToken().toLowerCase());
+      assertEquals(indexEntry.token.toLowerCase(), searchResult.insertionPoint.token.toLowerCase());
+      assertEquals(indexEntry.token.toLowerCase(), searchResult.longestPrefix.token.toLowerCase());
     }
 
     // TODO: maybe if user types capitalization, use it.
-    assertEquals("aaac", deIndex.find("AAAC", new AtomicBoolean(false)).getToken());
-    assertEquals("aaac", deIndex.find("aaac", new AtomicBoolean(false)).getToken());
-    assertEquals("aaac", deIndex.find("AAAc", new AtomicBoolean(false)).getToken());
-    assertEquals("aaac", deIndex.find("aaac", new AtomicBoolean(false)).getToken());
-    
+    assertSearchResult("aaac", "aaac", deIndex.findLongestSubstring("aaac", new AtomicBoolean(false)));
+    assertSearchResult("aaac", "aaac", deIndex.findLongestSubstring("AAAC", new AtomicBoolean(false)));
+    assertSearchResult("aaac", "aaac", deIndex.findLongestSubstring("AAAc", new AtomicBoolean(false)));
+    assertSearchResult("aaac", "aaac", deIndex.findLongestSubstring("aAac", new AtomicBoolean(false)));
+
     // Before the beginning.
-    assertEquals("40", deIndex.find("__", new AtomicBoolean(false)).getToken());
+    assertSearchResult("40", "40" /* special case */, deIndex.findLongestSubstring("__", new AtomicBoolean(false)));
     
     // After the end.
-    assertEquals("Zweckorientiertheit", deIndex.find("ZZZZZ", new AtomicBoolean(false)).getToken());
+    assertSearchResult("Zweckorientiertheit", "zählen", deIndex.findLongestSubstring("ZZZZZ", new AtomicBoolean(false)));
 
-    assertEquals("aaac", deIndex.find("aaaca", new AtomicBoolean(false)).getToken());
-    
-    assertEquals("überprüfe", deIndex.find("ueberprüfe", new AtomicBoolean(false)).getToken());
-    assertEquals("überprüfe", deIndex.find("ueberpruefe", new AtomicBoolean(false)).getToken());
+    assertSearchResult("ab", "aaac", deIndex.findLongestSubstring("aaaca", new AtomicBoolean(false)));
+    assertSearchResult("machen", "machen", deIndex.findLongestSubstring("m", new AtomicBoolean(false)));
+
+
+    assertSearchResult("überprüfe", "überprüfe", deIndex.findLongestSubstring("ueberprüfe", new AtomicBoolean(false)));
+    assertSearchResult("überprüfe", "überprüfe", deIndex.findLongestSubstring("ueberpruefe", new AtomicBoolean(false)));
+
+    assertSearchResult("überprüfe", "überprüfe", deIndex.findLongestSubstring("ueberpBLEH", new AtomicBoolean(false)));
+    assertSearchResult("überprüfe", "überprüfe", deIndex.findLongestSubstring("überprBLEH", new AtomicBoolean(false)));
+
+    assertSearchResult("überprüfen", "überprüfe", deIndex.findLongestSubstring("überprüfeBLEH", new AtomicBoolean(false)));
 
   }
   
+  private void assertSearchResult(final String insertionPoint, final String longestPrefix,
+      final SearchResult actual) {
+    assertEquals(insertionPoint, actual.insertionPoint.token);
+    assertEquals(longestPrefix, actual.longestPrefix.token);
+  }
+
   public void testGermanTokenRows() {
     // Pre-cache a few of these, just to make sure that's working.
     for (int i = 0; i < deIndex.rows.size(); i += 7) {
@@ -96,7 +112,6 @@ public class DictionaryTest extends TestCase {
     }
   }
   
-  @SuppressWarnings("unchecked")
   public void testGermanSort() {
     assertEquals("aüÄÄ", Language.de.textNorm("aueAeAE", false));
     final List<String> words = Arrays.asList(

diff --git a/src/com/hughes/android/dictionary/engine/IndexBuilder.java b/src/com/hughes/android/dictionary/engine/IndexBuilder.java
index aa09421df726d502849ccf009ca7b9ec9544a0bb..2db62905eb899342e22ba4f6eb84557c45b233ee 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/IndexBuilder.java
+++ b/src/com/hughes/android/dictionary/engine/IndexBuilder.java
@@ -18,9 +18,9 @@ public class IndexBuilder {
   final SortedMap<String, TokenData> tokenToData;
 
   @SuppressWarnings("unchecked")
-  IndexBuilder(final DictionaryBuilder dictionaryBuilder, final String shortName, final String longName, final Language language) {
+  IndexBuilder(final DictionaryBuilder dictionaryBuilder, final String shortName, final String longName, final Language language, final boolean swapPairEntries) {
     this.dictionaryBuilder = dictionaryBuilder;
-    index = new Index(dictionaryBuilder.dictionary, shortName, longName, language);
+    index = new Index(dictionaryBuilder.dictionary, shortName, longName, language, swapPairEntries);
     tokenToData = new TreeMap<String, TokenData>(language.getSortCollator());
   }