am 239f7daf: Merge "Make WeightedString have ProbabilityInfo."

* commit '239f7daf4a1fa9f83a4ce54a840c0fdc011f3b4c':
  Make WeightedString have ProbabilityInfo.

1 files changed, 17 insertions, 0 deletions

diff --git a/java/src/com/android/inputmethod/latin/makedict/ProbabilityInfo.java b/java/src/com/android/inputmethod/latin/makedict/ProbabilityInfo.java
index c1a43cedf..79f924cc6 100644
--- a/java/src/com/android/inputmethod/latin/makedict/ProbabilityInfo.java
+++ b/java/src/com/android/inputmethod/latin/makedict/ProbabilityInfo.java
@@ -17,6 +17,7 @@
 package com.android.inputmethod.latin.makedict;
 
 import com.android.inputmethod.latin.BinaryDictionary;
+import com.android.inputmethod.latin.makedict.FusionDictionary.WeightedString;
 
 public final class ProbabilityInfo {
     public final int mProbability;
@@ -39,8 +40,24 @@ public final class ProbabilityInfo {
         mCount = count;
     }
 
+    public boolean hasHistoricalInfo() {
+        return mTimestamp != BinaryDictionary.NOT_A_VALID_TIMESTAMP;
+    }
+
     @Override
     public String toString() {
         return mTimestamp + ":" + mLevel + ":" + mCount;
     }
+
+    @Override
+    public boolean equals(Object o) {
+      if (o == this) return true;
+      if (!(o instanceof ProbabilityInfo)) return false;
+      final ProbabilityInfo p = (ProbabilityInfo)o;
+      if (!hasHistoricalInfo() && !p.hasHistoricalInfo()) {
+          return mProbability == p.mProbability;
+      }
+      return mProbability == p.mProbability && mTimestamp == p.mTimestamp && mLevel == p.mLevel
+              && mCount == p.mCount;
+  }
 }
\ No newline at end of file