Also apply fuzzy matching to answer option matching, but don't disreg…

…ard characters that may change the nature of the answer option
Gapminder · Mar 30, 2020 · b79faf0 · b79faf0
1 parent eefd150
commit b79faf0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/src/lib/answerOptionMatchesFactualAnswer.spec.ts b/src/lib/answerOptionMatchesFactualAnswer.spec.ts
@@ -25,6 +25,26 @@ const testAnswerOptionMatchesFactualAnswer: Macro<any> = (
     factualAnswer: "1% ",
     expectedOutput: true
   },
+  {
+    answerOption: "1%",
+    factualAnswer: "1%,",
+    expectedOutput: true
+  },
+  {
+    answerOption: "1%,",
+    factualAnswer: "1%",
+    expectedOutput: true
+  },
+  {
+    answerOption: '1%"',
+    factualAnswer: "1%",
+    expectedOutput: true
+  },
+  {
+    answerOption: "1%",
+    factualAnswer: '1%"',
+    expectedOutput: true
+  },
   {
     answerOption: "30-40%",
     factualAnswer: "24%",

diff --git a/src/lib/answerOptionMatchesFactualAnswer.ts b/src/lib/answerOptionMatchesFactualAnswer.ts
@@ -1,4 +1,5 @@
 import { extractNumericalPartsOfAnswerOption } from "./extractNumericalPartsOfAnswerOption";
+import { keyNormalizerForSlightlyFuzzyLookups } from "./keyNormalizerForSlightlyFuzzyLookups";
 
 /**
  * @hidden
@@ -7,8 +8,8 @@ export function answerOptionMatchesFactualAnswer(
   answerOption: string,
   factualAnswer: string
 ): boolean {
-  answerOption = answerOption.trim().toLocaleLowerCase();
-  factualAnswer = factualAnswer.trim().toLocaleLowerCase();
+  answerOption = keyNormalizerForSlightlyFuzzyLookups(answerOption);
+  factualAnswer = keyNormalizerForSlightlyFuzzyLookups(factualAnswer);
   if (answerOption === factualAnswer) {
     return true;
   }

diff --git a/src/lib/keyNormalizerForSlightlyFuzzyLookups.ts b/src/lib/keyNormalizerForSlightlyFuzzyLookups.ts
@@ -10,5 +10,5 @@ export function keyNormalizerForSlightlyFuzzyLookups(
   const trimmedLowerCasedWithoutDiacritics = removeDiacritics(
     lookupKey.trim().toLowerCase()
   );
-  return trimmedLowerCasedWithoutDiacritics.replace(/[^a-z0-9 ()]/g, "");
+  return trimmedLowerCasedWithoutDiacritics.replace(/[^a-z0-9%\-.,<> ()]/g, "");
 }