refactor Translation::Compare() (#624)

--------- Signed-off-by: shewer <[email protected]> Co-authored-by: Qijia Liu <[email protected]>
rime · Sep 26, 2023 · e849f28 · e849f28
1 parent f8528dd
commit e849f28
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/src/rime/candidate.cc b/src/rime/candidate.cc
@@ -31,4 +31,21 @@ vector<of<Candidate>> Candidate::GetGenuineCandidates(
   return result;
 }
 
+int Candidate::compare(const Candidate& other) {
+  // the one nearer to the beginning of segment comes first
+  int k = start_ - other.start_;
+  if (k != 0)
+    return k;
+  // then the longer comes first
+  k = end_ - other.end_;
+  if (k != 0)
+    return -k;
+  // compare quality
+  double qdiff = quality_ - other.quality_;
+  if (qdiff != 0.)
+    return (qdiff > 0.) ? -1 : 1;
+  // draw
+  return 0;
+}
+
 }  // namespace rime
diff --git a/src/rime/candidate.h b/src/rime/candidate.h
@@ -20,6 +20,7 @@ class Candidate {
 
   static an<Candidate> GetGenuineCandidate(const an<Candidate>& cand);
   static vector<of<Candidate>> GetGenuineCandidates(const an<Candidate>& cand);
+  int compare(const Candidate& other);
 
   // recognized by translators in learning phase
   const string& type() const { return type_; }

diff --git a/src/rime/translation.cc b/src/rime/translation.cc
@@ -19,21 +19,7 @@ int Translation::Compare(an<Translation> other,
   auto theirs = other->Peek();
   if (!ours || !theirs)
     return 1;
-  int k = 0;
-  // the one nearer to the beginning of segment comes first
-  k = ours->start() - theirs->start();
-  if (k != 0)
-    return k;
-  // then the longer comes first
-  k = ours->end() - theirs->end();
-  if (k != 0)
-    return -k;
-  // compare quality
-  double qdiff = ours->quality() - theirs->quality();
-  if (qdiff != 0.)
-    return (qdiff > 0.) ? -1 : 1;
-  // draw
-  return 0;
+  return ours->compare(*theirs);
 }
 
 bool UniqueTranslation::Next() {