Merge "Quit limiting gesture search space by distance." (627fcc6c) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/src/suggest/core/layout/proximity_info_params.cpp

+1 −4

Original line number	Diff line number	Diff line
		@@ -24,9 +24,6 @@ const float ProximityInfoParams::VERTICAL_SWEET_SPOT_SCALE = 1.0f;
		const float ProximityInfoParams::VERTICAL_SWEET_SPOT_SCALE_G = 0.5f;

		/* Per method constants */
		// Used by ProximityInfoStateUtils::initGeometricDistanceInfos()
		const float ProximityInfoParams::NEAR_KEY_NORMALIZED_SQUARED_THRESHOLD = 4.0f;

		// Used by ProximityInfoStateUtils::updateNearKeysDistances()
		const float ProximityInfoParams::NEAR_KEY_THRESHOLD_FOR_DISTANCE = 2.0f;

		@@ -50,7 +47,7 @@ const int ProximityInfoParams::NUM_POINTS_FOR_SPEED_CALCULATION = 2;
		const int ProximityInfoParams::LAST_POINT_SKIP_DISTANCE_SCALE = 4;

		// Used by ProximityInfoStateUtils::updateAlignPointProbabilities()
		const float ProximityInfoParams::MIN_PROBABILITY = 0.000001f;
		const float ProximityInfoParams::MIN_PROBABILITY = 0.000005f;
		const float ProximityInfoParams::MAX_SKIP_PROBABILITY = 0.95f;
		const float ProximityInfoParams::SKIP_FIRST_POINT_PROBABILITY = 0.01f;
		const float ProximityInfoParams::SKIP_LAST_POINT_PROBABILITY = 0.1f;

native/jni/src/suggest/core/layout/proximity_info_params.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -28,9 +28,6 @@ class ProximityInfoParams {
		static const float VERTICAL_SWEET_SPOT_SCALE;
		static const float VERTICAL_SWEET_SPOT_SCALE_G;

		// Used by ProximityInfoStateUtils::initGeometricDistanceInfos()
		static const float NEAR_KEY_NORMALIZED_SQUARED_THRESHOLD;

		// Used by ProximityInfoStateUtils::updateNearKeysDistances()
		static const float NEAR_KEY_THRESHOLD_FOR_DISTANCE;

native/jni/src/suggest/core/layout/proximity_info_state.cpp

+3 −5

Original line number	Diff line number	Diff line
		@@ -91,7 +91,6 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
		mSampledInputIndice.clear();
		mSampledLengthCache.clear();
		mSampledNormalizedSquaredLengthCache.clear();
		mSampledNearKeySets.clear();
		mSampledSearchKeySets.clear();
		mSpeedRates.clear();
		mBeelineSpeedPercentiles.clear();
		@@ -126,18 +125,17 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
		if (mSampledInputSize > 0) {
		ProximityInfoStateUtils::initGeometricDistanceInfos(mProximityInfo, mSampledInputSize,
		lastSavedInputSize, isGeometric, &mSampledInputXs, &mSampledInputYs,
		&mSampledNearKeySets, &mSampledNormalizedSquaredLengthCache);
		&mSampledNormalizedSquaredLengthCache);
		if (isGeometric) {
		// updates probabilities of skipping or mapping each key for all points.
		ProximityInfoStateUtils::updateAlignPointProbabilities(
		mMaxPointToKeyLength, mProximityInfo->getMostCommonKeyWidth(),
		mProximityInfo->getKeyCount(), lastSavedInputSize, mSampledInputSize,
		&mSampledInputXs, &mSampledInputYs, &mSpeedRates, &mSampledLengthCache,
		&mSampledNormalizedSquaredLengthCache, &mSampledNearKeySets,
		mProximityInfo, &mCharProbabilities);
		&mSampledNormalizedSquaredLengthCache, mProximityInfo, &mCharProbabilities);
		ProximityInfoStateUtils::updateSampledSearchKeySets(mProximityInfo,
		mSampledInputSize, lastSavedInputSize, &mSampledLengthCache,
		&mSampledNearKeySets, &mSampledSearchKeySets,
		&mCharProbabilities, &mSampledSearchKeySets,
		&mSampledSearchKeyVectors);
		mMostProbableStringProbability = ProximityInfoStateUtils::getMostProbableString(
		mProximityInfo, mSampledInputSize, &mCharProbabilities, mMostProbableString);

native/jni/src/suggest/core/layout/proximity_info_state.h

+3 −7

Original line number	Diff line number	Diff line
		@@ -50,9 +50,9 @@ class ProximityInfoState {
		mSampledInputXs(), mSampledInputYs(), mSampledTimes(), mSampledInputIndice(),
		mSampledLengthCache(), mBeelineSpeedPercentiles(),
		mSampledNormalizedSquaredLengthCache(), mSpeedRates(), mDirections(),
		mCharProbabilities(), mSampledNearKeySets(), mSampledSearchKeySets(),
		mSampledSearchKeyVectors(), mTouchPositionCorrectionEnabled(false),
		mSampledInputSize(0), mMostProbableStringProbability(0.0f) {
		mCharProbabilities(), mSampledSearchKeySets(), mSampledSearchKeyVectors(),
		mTouchPositionCorrectionEnabled(false), mSampledInputSize(0),
		mMostProbableStringProbability(0.0f) {
		memset(mInputProximities, 0, sizeof(mInputProximities));
		memset(mPrimaryInputWord, 0, sizeof(mPrimaryInputWord));
		memset(mMostProbableString, 0, sizeof(mMostProbableString));
		@@ -216,10 +216,6 @@ class ProximityInfoState {
		std::vector<float> mDirections;
		// probabilities of skipping or mapping to a key for each point.
		std::vector<hash_map_compat<int, float> > mCharProbabilities;
		// The vector for the key code set which holds nearby keys for each sampled input point
		// 1. Used to calculate the probability of the key
		// 2. Used to calculate mSampledSearchKeySets
		std::vector<ProximityInfoStateUtils::NearKeycodesSet> mSampledNearKeySets;
		// The vector for the key code set which holds nearby keys of some trailing sampled input points
		// for each sampled input point. These nearby keys contain the next characters which can be in
		// the dictionary. Specifically, currently we are looking for keys nearby trailing sampled

native/jni/src/suggest/core/layout/proximity_info_state_utils.cpp

+26 −37

Original line number	Diff line number	Diff line
		@@ -188,13 +188,10 @@ namespace latinime {
		const int lastSavedInputSize, const bool isGeometric,
		const std::vector<int> *const sampledInputXs,
		const std::vector<int> *const sampledInputYs,
		std::vector<NearKeycodesSet> *sampledNearKeySets,
		std::vector<float> *sampledNormalizedSquaredLengthCache) {
		sampledNearKeySets->resize(sampledInputSize);
		const int keyCount = proximityInfo->getKeyCount();
		sampledNormalizedSquaredLengthCache->resize(sampledInputSize * keyCount);
		for (int i = lastSavedInputSize; i < sampledInputSize; ++i) {
		(*sampledNearKeySets)[i].reset();
		for (int k = 0; k < keyCount; ++k) {
		const int index = i * keyCount + k;
		const int x = (*sampledInputXs)[i];
		@@ -203,10 +200,6 @@ namespace latinime {
		proximityInfo->getNormalizedSquaredDistanceFromCenterFloatG(
		k, x, y, isGeometric);
		(*sampledNormalizedSquaredLengthCache)[index] = normalizedSquaredDistance;
		if (normalizedSquaredDistance
		< ProximityInfoParams::NEAR_KEY_NORMALIZED_SQUARED_THRESHOLD) {
		(*sampledNearKeySets)[i][k] = true;
		}
		}
		}
		}
		@@ -626,7 +619,6 @@ namespace latinime {
		const std::vector<float> *const sampledSpeedRates,
		const std::vector<int> *const sampledLengthCache,
		const std::vector<float> *const sampledNormalizedSquaredLengthCache,
		std::vector<NearKeycodesSet> *sampledNearKeySets,
		const ProximityInfo *const proximityInfo,
		std::vector<hash_map_compat<int, float> > *charProbabilities) {
		charProbabilities->resize(sampledInputSize);
		@@ -643,14 +635,12 @@ namespace latinime {

		float nearestKeyDistance = static_cast<float>(MAX_VALUE_FOR_WEIGHTING);
		for (int j = 0; j < keyCount; ++j) {
		if ((*sampledNearKeySets)[i].test(j)) {
		const float distance = getPointToKeyByIdLength(
		maxPointToKeyLength, sampledNormalizedSquaredLengthCache, keyCount, i, j);
		if (distance < nearestKeyDistance) {
		nearestKeyDistance = distance;
		}
		}
		}

		if (i == 0) {
		skipProbability *= std::min(1.0f,
		@@ -744,18 +734,15 @@ namespace latinime {
		// Summing up probability densities of all near keys.
		float sumOfProbabilityDensities = 0.0f;
		for (int j = 0; j < keyCount; ++j) {
		if ((*sampledNearKeySets)[i].test(j)) {
		sumOfProbabilityDensities += distribution.getProbabilityDensity(
		proximityInfo->getKeyCenterXOfKeyIdG(j,
		NOT_A_COORDINATE /* referencePointX /, true / isGeometric */),
		proximityInfo->getKeyCenterYOfKeyIdG(j,
		NOT_A_COORDINATE /* referencePointY /, true / isGeometric */));
		}
		}

		// Split the probability of an input point to keys that are close to the input point.
		for (int j = 0; j < keyCount; ++j) {
		if ((*sampledNearKeySets)[i].test(j)) {
		const float probabilityDensity = distribution.getProbabilityDensity(
		proximityInfo->getKeyCenterXOfKeyIdG(j,
		NOT_A_COORDINATE /* referencePointX /, true / isGeometric */),
		@@ -766,7 +753,6 @@ namespace latinime {
		(*charProbabilities)[i][j] = probability;
		}
		}
		}

		if (DEBUG_POINTS_PROBABILITY) {
		for (int i = 0; i < sampledInputSize; ++i) {
		@@ -820,10 +806,9 @@ namespace latinime {
		for (int j = 0; j < keyCount; ++j) {
		hash_map_compat<int, float>::iterator it = (*charProbabilities)[i].find(j);
		if (it == (*charProbabilities)[i].end()){
		(*sampledNearKeySets)[i].reset(j);
		continue;
		} else if(it->second < ProximityInfoParams::MIN_PROBABILITY) {
		// Erases from near keys vector because it has very low probability.
		(*sampledNearKeySets)[i].reset(j);
		(*charProbabilities)[i].erase(j);
		} else {
		it->second = -logf(it->second);
		@@ -835,9 +820,8 @@ namespace latinime {

		/* static */ void ProximityInfoStateUtils::updateSampledSearchKeySets(
		const ProximityInfo *const proximityInfo, const int sampledInputSize,
		const int lastSavedInputSize,
		const std::vector<int> *const sampledLengthCache,
		const std::vector<NearKeycodesSet> *const sampledNearKeySets,
		const int lastSavedInputSize, const std::vector<int> *const sampledLengthCache,
		const std::vector<hash_map_compat<int, float> > *const charProbabilities,
		std::vector<NearKeycodesSet> *sampledSearchKeySets,
		std::vector<std::vector<int> > *sampledSearchKeyVectors) {
		sampledSearchKeySets->resize(sampledInputSize);
		@@ -854,7 +838,12 @@ namespace latinime {
		if ((sampledLengthCache)[j] - (sampledLengthCache)[i] >= readForwordLength) {
		break;
		}
		(sampledSearchKeySets)[i] \|= (sampledNearKeySets)[j];
		for(const auto& charProbability : charProbabilities->at(j)) {
		if (charProbability.first == NOT_AN_INDEX) {
		continue;
		}
		(*sampledSearchKeySets)[i].set(charProbability.first);
		}
		}
		}
		const int keyCount = proximityInfo->getKeyCount();