monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-11-12 23:23:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix: partially correct last words counting towards final wpm in non timed modes

Browse source
This commit is contained in:
Miodec 2025-11-09 09:54:29 +01:00
parent df06b62636
commit a3765b9b52
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/ts/test/test-logic.ts
View file

@ -967,7 +967,7 @@ export async function finish(difficultyFailed = false): Promise<void> {
}
// stats
const stats = TestStats.calculateStats();
const stats = TestStats.calculateFinalStats();
if (stats.time % 1 !== 0 && Config.mode !== "time") {
TestStats.setLastSecondNotRound();
}

26
frontend/src/ts/test/test-stats.ts
View file

@ -7,6 +7,7 @@ import * as TestState from "./test-state";
import * as Numbers from "@monkeytype/util/numbers";
import { CompletedEvent, IncompleteTest } from "@monkeytype/schemas/results";
import { isFunboxActiveWithProperty } from "./funbox/list";
import * as CustomText from "./custom-text";
type CharCount = {
spaces: number;
@ -144,14 +145,17 @@ export function calculateTestSeconds(now?: number): number {
}
}
export function calculateWpmAndRaw(withDecimalPoints?: true): {
export function calculateWpmAndRaw(
withDecimalPoints?: true,
final = false
): {
wpm: number;
raw: number;
} {
const testSeconds = calculateTestSeconds(
TestState.isActive ? performance.now() : end
);
const chars = countChars();
const chars = countChars(final);
const wpm = Numbers.roundTo2(
((chars.correctWordChars + chars.correctSpaces) * (60 / testSeconds)) / 5
);
@ -280,7 +284,7 @@ function getTargetWords(): string[] {
return targetWords;
}
function countChars(): CharCount {
function countChars(final = false): CharCount {
let correctWordChars = 0;
let correctChars = 0;
let incorrectChars = 0;
@ -343,7 +347,13 @@ function countChars(): CharCount {
}
correctChars += toAdd.correct;
incorrectChars += toAdd.incorrect;
if (i === inputWords.length - 1) {
const isTimedTest =
Config.mode === "time" ||
(Config.mode === "custom" && CustomText.getLimit().mode === "time");
const shouldCountPartialLastWord = !final || (final && isTimedTest);
if (i === inputWords.length - 1 && shouldCountPartialLastWord) {
//last word - check if it was all correct - add to correct word chars
if (toAdd.incorrect === 0) correctWordChars += toAdd.correct;
} else {
@ -370,7 +380,7 @@ function countChars(): CharCount {
};
}
export function calculateStats(): Stats {
export function calculateFinalStats(): Stats {
console.debug("Calculating result stats");
let testSeconds = calculateTestSeconds();
console.debug(
@ -398,8 +408,10 @@ export function calculateStats(): Stats {
testSeconds
);
}
const chars = countChars();
const { wpm, raw } = calculateWpmAndRaw(true);
//todo: this counts chars twice - once here and once in calculateWpmAndRaw
const chars = countChars(true);
const { wpm, raw } = calculateWpmAndRaw(true, true);
const acc = Numbers.roundTo2(calculateAccuracy());
const ret = {
wpm: isNaN(wpm) ? 0 : wpm,