nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 8acab80a: am 56f35a10: Merge "Fix bug in counting words between samples" 

* commit '8acab80a8680956038b45912d3e00a1d6a5e3cdb':
  Fix bug in counting words between samples
main
Kurt Partridge 2013-05-15 10:46:51 -07:00 committed by Android Git Automerger
parent bec53aa09f 8acab80a86
commit 1efcbd67cd
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
java/src/com/android/inputmethod/research/FixedLogBuffer.java
View File

@ -51,10 +51,6 @@ public class FixedLogBuffer extends LogBuffer {
mNumActualWords = 0; mNumActualWords = 0;
} }
protected int getNumActualWords() {
return mNumActualWords;
}
/** /**
* Adds a new LogUnit to the front of the LIFO queue, evicting existing LogUnit's * Adds a new LogUnit to the front of the LIFO queue, evicting existing LogUnit's
* (oldest first) if word capacity is reached. * (oldest first) if word capacity is reached.
@ -119,12 +115,24 @@ public class FixedLogBuffer extends LogBuffer {
return logUnit; return logUnit;
} }
protected void shiftOutWords(final int numWords) { /**
final int targetNumWords = mNumActualWords - numWords; * Remove LogUnits from the front of the LogBuffer until {@code numWords} have been removed.
final LinkedList<LogUnit> logUnits = getLogUnits(); *
while (mNumActualWords > targetNumWords && !logUnits.isEmpty()) { * If there are less than {@code numWords} word-containing {@link LogUnit}s, shifts out
shiftOut(); * all {@code LogUnit}s in the buffer.
*
* @param numWords the number of word-containing {@link LogUnit}s to shift out
* @return the number of actual {@code LogUnit}s shifted out
*/
protected int shiftOutWords(final int numWords) {
int numWordContainingLogUnitsShiftedOut = 0;
for (LogUnit logUnit = shiftOut(); logUnit != null
&& numWordContainingLogUnitsShiftedOut < numWords; logUnit = shiftOut()) {
if (logUnit.hasWord()) {
numWordContainingLogUnitsShiftedOut++;
}
} }
return numWordContainingLogUnitsShiftedOut;
} }
public void shiftOutAll() { public void shiftOutAll() {

17
java/src/com/android/inputmethod/research/MainLogBuffer.java
View File

@ -25,7 +25,6 @@ import com.android.inputmethod.latin.define.ProductionFlag;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Random;
/** /**
* MainLogBuffer is a FixedLogBuffer that tracks the state of LogUnits to make privacy guarantees. * MainLogBuffer is a FixedLogBuffer that tracks the state of LogUnits to make privacy guarantees.
@ -100,10 +99,6 @@ public abstract class MainLogBuffer extends FixedLogBuffer {
return mSuggest.getMainDictionary(); return mSuggest.getMainDictionary();
} }
public void resetWordCounter() {
mNumWordsUntilSafeToSample = mNumWordsBetweenNGrams;
}
public void setIsStopping() { public void setIsStopping() {
mIsStopping = true; mIsStopping = true;
} }
@ -201,7 +196,7 @@ public abstract class MainLogBuffer extends FixedLogBuffer {
// Good n-gram at the front of the buffer. Publish it, disclosing details. // Good n-gram at the front of the buffer. Publish it, disclosing details.
publish(logUnits, true /* canIncludePrivateData */); publish(logUnits, true /* canIncludePrivateData */);
shiftOutWords(N_GRAM_SIZE); shiftOutWords(N_GRAM_SIZE);
resetWordCounter(); mNumWordsUntilSafeToSample = mNumWordsBetweenNGrams;
} else { } else {
// No good n-gram at front, and buffer is full. Shift out the first word (or if there // No good n-gram at front, and buffer is full. Shift out the first word (or if there
// is none, the existing logUnits). // is none, the existing logUnits).
@ -224,13 +219,13 @@ public abstract class MainLogBuffer extends FixedLogBuffer {
final boolean canIncludePrivateData); final boolean canIncludePrivateData);
@Override @Override
protected void shiftOutWords(final int numWords) { protected int shiftOutWords(final int numWords) {
final int oldNumActualWords = getNumActualWords(); final int numWordContainingLogUnitsShiftedOut = super.shiftOutWords(numWords);
super.shiftOutWords(numWords); mNumWordsUntilSafeToSample = Math.max(0, mNumWordsUntilSafeToSample
final int numWordsShifted = oldNumActualWords - getNumActualWords(); - numWordContainingLogUnitsShiftedOut);
mNumWordsUntilSafeToSample -= numWordsShifted;
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "wordsUntilSafeToSample now at " + mNumWordsUntilSafeToSample); Log.d(TAG, "wordsUntilSafeToSample now at " + mNumWordsUntilSafeToSample);
} }
return numWordContainingLogUnitsShiftedOut;
} }
} }