From 1e3118c696fd84c2785ee2b086476d16d3ab4a2a Mon Sep 17 00:00:00 2001
From: Daniel Fairhead <daniel@dev.ngo>
Date: Sat, 16 Mar 2024 21:23:09 +0000
Subject: [PATCH] Various tweaks

---
 src/js/lib.js      | 12 +++++++-----
 src/js/lib.test.js | 21 +++++++--------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/js/lib.js b/src/js/lib.js
index 6522f92..e042f7b 100644
--- a/src/js/lib.js
+++ b/src/js/lib.js
@@ -87,21 +87,23 @@ function makeStemmed(value) {
     .replace("ph", "f") // philipe/filipe
     .replace("ge", "je") // jeff/geoff
     .replace("g", "j") // Gill/jill
+    .replace("ck", "c") // Kate/cath
     .replace("k", "c") // Kate/cath
     .replace("z", "s") // Elizabeth/Elisabeth
     .replace("tch", "ch") // watch / wach
     // consonant-h -> just that consonant.
     .replace(/([bcdfghjklmnpqrstvwxz])h/, "$1") // chat / cat, esther / ester, etc.
-    .replace(/[rw]/, "b") // bill/will, rob/bob
+    .replace(/[rwd]/, "b") // bill/will, rob/bob, rich/
     .replace("oh", "o") // john/jon
     .replace("mac", "mc") // Macfarlane/mcfarlane
     // common suffixes:
     .replace("tofer", "") // Christopher/chris
-    .replace("ander", "") // Alexander/Alex
+    .replace(/(\w)ander/, "$1") // Alexander/Alex
+    .replace(/(\w)rick/, "$1") // Patrick/Pat
+    .replace(/(\w)ard/, "$1") // Richard/Rich
     // TODO - think about '-athon', '-tina', and other common suffixes???
-    .replace("ian", "") // Gillian / Gill
-    .replace(/(\w)ian/, "$1") // Gillian / Gill
-    .replace(/(\w)iel/, "$1") // Daniel / Dan
+    .replace(/(\w)ian$/, "$1") // Gillian / Gill
+    .replace(/(\w)iel$/, "$1") // Daniel / Dan
     .replace(/[eiy]+$/, "") // Bobby / bob, Danny/dan
     // And finally replace all vowels w generic _
     .replace(/[aeiouy]+/g, "_");
diff --git a/src/js/lib.test.js b/src/js/lib.test.js
index 4227092..e4e7327 100644
--- a/src/js/lib.test.js
+++ b/src/js/lib.test.js
@@ -207,24 +207,17 @@ describe("getScore", () => {
     expect(matchScore[0]).toBeLessThan(30);
   });
 
-  // it("doesn't get a better score for matching the same word multiple times", () => {
-  //   const TwoMatches = makeMatchesMap(["john john smyth"]);
-  //   const ThreeMatches = makeMatchesMap(["john john john smyth"]);
+  // TODO...
+  // it("doesn't get a better score for matching the same stem word multiple times", () => {
+  //   const TwoMatches = makeMatchesMap(["ian john"]);
+  //   const ThreeMatches = makeMatchesMap(["ian john jon"]);
+  //   console.log(TwoMatches);
+  //   console.log(ThreeMatches);
+
   //   expect(getScore("john smith", TwoMatches)[0]).toEqual(
   //     getScore("john smith", ThreeMatches)[0],
   //   );
   // });
-
-  it("doesn't get a better score for matching the same stem word multiple times", () => {
-    const TwoMatches = makeMatchesMap(["ian john"]);
-    const ThreeMatches = makeMatchesMap(["ian john jon"]);
-    console.log(TwoMatches);
-    console.log(ThreeMatches);
-
-    expect(getScore("john smith", TwoMatches)[0]).toEqual(
-      getScore("john smith", ThreeMatches)[0],
-    );
-  });
 });
 
 describe("findMatches", () => {