From 8930deb9ac5893712446055f9cd99300536bdb42 Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Wed, 15 Dec 2021 15:05:28 -0700
Subject: [PATCH] Store Hollywoo objects in improved FuzzyMap

---
 kiss/src/kiss/FuzzyMap.hx                 | 49 ++++++++++++++++++-----
 projects/hollywoo/src/hollywoo/Movie.hx   |  3 +-
 projects/hollywoo/src/hollywoo/Movie.kiss | 15 +++----
 3 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/kiss/src/kiss/FuzzyMap.hx b/kiss/src/kiss/FuzzyMap.hx
index 5555e678..1308f25d 100644
--- a/kiss/src/kiss/FuzzyMap.hx
+++ b/kiss/src/kiss/FuzzyMap.hx
@@ -4,9 +4,10 @@ import haxe.ds.StringMap;
 
 using hx.strings.Strings;
 
+// TODO forward and implement the full Map API
 abstract FuzzyMap<T>(StringMap<T>) from StringMap<T> to StringMap<T> {
-    public inline function new(m:StringMap<T>) {
-        this = m;
+    public inline function new(?m:StringMap<T>) {
+        this = if (m != null) m else new StringMap<T>();
     }
 
     @:from
@@ -19,24 +20,50 @@ abstract FuzzyMap<T>(StringMap<T>) from StringMap<T> to StringMap<T> {
         return this;
     }
 
-    @:arrayAccess
-    public inline function get(searchKey:String):Null<T> {
-        var bestMatch:Null<T> = null;
-        var bestScore = 0;
+    static var threshold = 0.8;
+    function bestMatch(fuzzySearchKey:String, ?throwIfNone=true):String {
+        if (this.exists(fuzzySearchKey)) return fuzzySearchKey;
 
-        for (key => value in this) {
-            var score = searchKey.getFuzzyDistance(key);
+        var bestScore = 0.0;
+        var bestKey = null;
+
+        for (key in this.keys()) {
+            var score = 1 - (key.getLevenshteinDistance(fuzzySearchKey) / Math.max(key.length, fuzzySearchKey.length));
             if (score > bestScore) {
                 bestScore = score;
-                bestMatch = value;
+                bestKey = key;
             }
         }
 
-        return bestMatch;
+        if (bestScore < threshold) {
+            if (throwIfNone)
+                throw 'No good match for $fuzzySearchKey in $this -- best was $bestKey with $bestScore';
+            else
+                return null;
+        }
+
+        #if (test || debug)
+        trace('Fuzzy match $bestKey for $fuzzySearchKey score: $bestScore');
+        #end
+        
+        return bestKey;
     }
 
     @:arrayAccess
-    public inline function set(key:String, v:T):T {
+    public inline function get(fuzzySearchKey:String):Null<T> {
+        return this.get(bestMatch(fuzzySearchKey));
+    }
+
+    public inline function remove(fuzzySearchKey:String):Bool {
+        var key = bestMatch(fuzzySearchKey, false);
+        if (key == null) return false;
+        return this.remove(key);
+    }
+
+    @:arrayAccess
+    public inline function set(fuzzySearchKey:String, v:T):T {
+        var key = bestMatch(fuzzySearchKey, false);
+        if (key == null) key = fuzzySearchKey;
         this.set(key, v);
         return v;
     }
diff --git a/projects/hollywoo/src/hollywoo/Movie.hx b/projects/hollywoo/src/hollywoo/Movie.hx
index 4f70734a..32a1e553 100644
--- a/projects/hollywoo/src/hollywoo/Movie.hx
+++ b/projects/hollywoo/src/hollywoo/Movie.hx
@@ -4,6 +4,7 @@ import haxe.Constraints.Function;
 import haxe.Timer;
 import kiss.AsyncEmbeddedScript;
 import kiss.Prelude;
+import kiss.FuzzyMap;
 import hollywoo.Scene;
 import hollywoo.Director;
 
@@ -20,5 +21,5 @@ enum DelayHandling {
 class Movie<Set, StagePosition, StageFacing, ScreenPosition, Actor, Sound, Song, Prop> extends AsyncEmbeddedScript {
     // TODO for some reason this wasn't working when declared in Movie.kiss:
     // Mutable representation of frames in time:
-    var scenes:Map<String, Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor, Prop>> = [];
+    var scenes:FuzzyMap<Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor, Prop>> = new FuzzyMap<Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor, Prop>>();
 }
diff --git a/projects/hollywoo/src/hollywoo/Movie.kiss b/projects/hollywoo/src/hollywoo/Movie.kiss
index 5af12ccd..8eebbd51 100644
--- a/projects/hollywoo/src/hollywoo/Movie.kiss
+++ b/projects/hollywoo/src/hollywoo/Movie.kiss
@@ -2,19 +2,20 @@
 (#unless subclass
 
     // Mostly immutable, reusable resources:
-    (prop :Map<String,Set> sets (new Map))
-    (prop :Map<String,Actor> actors (new Map))
-    (prop :Map<String,Sound> sounds (new Map))
-    (prop :Map<String,Song> songs (new Map))
-    (prop :Map<String,Prop> props (new Map))
+    (prop :FuzzyMap<Set> sets (new FuzzyMap<Set>))
+    (prop :FuzzyMap<Actor> actors (new FuzzyMap<Actor>))
+    (prop :FuzzyMap<Sound> sounds (new FuzzyMap<Sound>))
+    (prop :FuzzyMap<Song> songs (new FuzzyMap<Song>))
+    (prop :FuzzyMap<Prop> props (new FuzzyMap<Prop>))
 
     (prop &mut :DelayHandling delayHandling AutoWithSkip)
 
     // TODO for some reason this won't work when declared in Kiss syntax:
     // Mutable representation of frames in time:
     // var scenes:Map<String, Scene<Set, StagePosition, StageFacing, ScreenPosition, Actor>> = [];
-    (prop :Map<String,Bool> shownScenes (new Map))
-    (prop :Map<String,Bool> shownCharacters (new Map))
+
+    (prop :FuzzyMap<Bool> shownScenes (new FuzzyMap<Bool>))
+    (prop :FuzzyMap<Bool> shownCharacters (new FuzzyMap<Bool>))
 
     // This is set and unset by doPreload defined in HollywooDSL.kiss
     (prop &mut isLoading false)