Merge pull request #118 from Kamieljv/wkid_tool

Improved robustness of percentagematch function
Kamieljv · Jul 18, 2024 · 02bd59d · 02bd59d
2 parents 7395fa8 + 34e1e1a
commit 02bd59d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/app/Helpers/vectors.php b/app/Helpers/vectors.php
@@ -31,9 +31,11 @@ function percentageMatch(array $a, array $b)
     if ($va->length() == 0) {
         return 0;
     }
-    // normalize vectors
-    $va = $va->normalize();
-    $vb = $vb->normalize();
-    // compute scalar projection of a on b (dot(a, b)/len(b))
-    return $va->dotProduct($vb) / $vb->length() * 100;
+
+    // compute scalar projection of a on b (dot(a, b)/len(b)), divided by len(b) again to get percentage
+    try {
+        return min(max($va->dotProduct($vb) / $vb->length() ** 2 * 100, 10), 100);
+    } catch (DivisionByZeroError $e) {
+        return null;
+    }
 }
diff --git a/resources/views/actiewijzer/result.blade.php b/resources/views/actiewijzer/result.blade.php
@@ -45,7 +45,8 @@ class="mt-10"
                             @foreach($referentie_types as $rt)
                                 <div>
                                     <a href="#{{str_replace(' ', '_', $rt->title)}}" class="hover:font-bold">{{$rt->title}}
-                                        &nbsp;<span class="text-pink-600 font-bold">{{$rt->match_perc}}%</span>
+                                        &nbsp;
+                                        @if($rt->match_perc)<span class="text-pink-600">{{$rt->match_perc}}%</span>@endif
                                     </a>
                                 </div>
                             @endforeach
@@ -56,7 +57,7 @@ class="mt-10"
                 <div class="mt-10 md:gap-6 grid grid-cols-2">
                     <div class="w-full col-span-2 md:col-span-1">
                         <h4 class="text-lg mb-2">Thema's</h4>
-                        <div class="flex">
+                        <div class="flex flex-wrap">
                             @foreach ($themes as $t)
                                 <div
                                     class="relative self-start inline-block px-2 py-1 mr-1 mb-1 text-xs font-medium leading-5 uppercase rounded"
@@ -79,7 +80,9 @@ class="relative self-start inline-block px-2 py-1 mr-1 mb-1 text-xs font-medium
 
             @foreach($referentie_types as $rt)
                 <div class="mt-20">
-                    <h2 id="{{str_replace(' ', '_', $rt->title)}}">{{$rt->title}}&nbsp;<span class="text-pink-600">{{$rt->match_perc}}%</span></h2>
+                    <h2 id="{{str_replace(' ', '_', $rt->title)}}">{{$rt->title}}&nbsp;
+                        @if($rt->match_perc)<span class="text-pink-600">{{$rt->match_perc}}%</span>@endif
+                    </h2>
                     <p>{!! filterScripts($rt->description) !!}</p>
                     @if ($rt->title == config('app.actiewijzer.demonstrations_section_name'))
                         <p><i>Demonstraties voor