diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-03-06 18:42:19 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 18:42:19 -0800 |
| commit | b4a7d95d95e8fa5f54bee065801e6793a2c16b32 (patch) | |
| tree | 4bcee3fa018bd5096c272ee5def8fc9caadb1ae7 /native/jni/src/suggest/policyimpl/utils/edit_distance.h | |
| parent | 73105cc0791ea40c416bde899c2779d02ac4ec8c (diff) | |
| parent | ce2ac1c835e9794dde41fe14e4e953177c8333cc (diff) | |
| download | latinime-b4a7d95d95e8fa5f54bee065801e6793a2c16b32.tar.gz latinime-b4a7d95d95e8fa5f54bee065801e6793a2c16b32.tar.xz latinime-b4a7d95d95e8fa5f54bee065801e6793a2c16b32.zip | |
am ce2ac1c8: Merge "Revert "Use std::min() and std::max()""
* commit 'ce2ac1c835e9794dde41fe14e4e953177c8333cc':
Revert "Use std::min() and std::max()"
Diffstat (limited to 'native/jni/src/suggest/policyimpl/utils/edit_distance.h')
| -rw-r--r-- | native/jni/src/suggest/policyimpl/utils/edit_distance.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/native/jni/src/suggest/policyimpl/utils/edit_distance.h b/native/jni/src/suggest/policyimpl/utils/edit_distance.h index 4cfd0b3f3..0871c37ce 100644 --- a/native/jni/src/suggest/policyimpl/utils/edit_distance.h +++ b/native/jni/src/suggest/policyimpl/utils/edit_distance.h @@ -17,8 +17,6 @@ #ifndef LATINIME_EDIT_DISTANCE_H #define LATINIME_EDIT_DISTANCE_H -#include <algorithm> - #include "defines.h" #include "suggest/policyimpl/utils/edit_distance_policy.h" @@ -40,13 +38,13 @@ class EditDistance { for (int i = 0; i < beforeLength; ++i) { for (int j = 0; j < afterLength; ++j) { - dp[(afterLength + 1) * (i + 1) + (j + 1)] = std::min( + dp[(afterLength + 1) * (i + 1) + (j + 1)] = min( dp[(afterLength + 1) * i + (j + 1)] + policy->getInsertionCost(i, j), - std::min( - dp[(afterLength + 1) * (i + 1) + j] + policy->getDeletionCost(i, j), - dp[(afterLength + 1) * i + j] + policy->getSubstitutionCost(i, j))); + min(dp[(afterLength + 1) * (i + 1) + j] + policy->getDeletionCost(i, j), + dp[(afterLength + 1) * i + j] + + policy->getSubstitutionCost(i, j))); if (policy->allowTransposition(i, j)) { - dp[(afterLength + 1) * (i + 1) + (j + 1)] = std::min( + dp[(afterLength + 1) * (i + 1) + (j + 1)] = min( dp[(afterLength + 1) * (i + 1) + (j + 1)], dp[(afterLength + 1) * (i - 1) + (j - 1)] + policy->getTranspositionCost(i, j)); |