Merge pull request #331 from Steinbeck-Lab/feat-charts

Feat charts

app/Console/Commands/GenerateHeatMapData.php

@@ -22,7 +22,7 @@ public function handle()
             $molecule_identifiers = array_map(function ($item) {
                 return preg_replace('/^CNP/i', '', $item);
             }, $molecule_identifiers);
-            $heat_map_data['ids'][$collection->id . '|' . $collection->title] = $molecule_identifiers;
+            $heat_map_data['ids'][$collection->id.'|'.$collection->title] = $molecule_identifiers;
         }
 
         // Calculate percentage overlaps -> ol_d = overlap data
@@ -42,24 +42,31 @@ public function handle()
                 $intersection = array_intersect($set1, $set2);
                 $intersection_count = count($intersection);
 
-                // Calculate percentage overlap
-                if ($set1_count > 0 && $set2_count > 0) {
-                    // Using Jaccard similarity: intersection size / union size
-                    $union_count = $set1_count + $set2_count - $intersection_count;
-                    $overlap_percentage = ($intersection_count / $union_count) * 100;
-                } else {
-                    $overlap_percentage = 0;
-                }
+                // Calculate directional overlap percentages
+                // What percentage of collection1's molecules are in collection2
+                $c1_in_c2_percentage = ($set1_count > 0)
+                    ? ($intersection_count / $set1_count) * 100
+                    : 0;
+
+                // What percentage of collection2's molecules are in collection1
+                $c2_in_c1_percentage = ($set2_count > 0)
+                    ? ($intersection_count / $set2_count) * 100
+                    : 0;
+
+                // For the main heatmap data, use the larger percentage
+                // This shows the stronger relationship between the collections
+                $overlap_percentage = max($c1_in_c2_percentage, $c2_in_c1_percentage);
 
                 $heat_map_data['ol_d'][$collection1_key][$collection2_key] = round($overlap_percentage, 2);
 
                 // Add additional overlap statistics -> ol_s = overlap_stats
                 $heat_map_data['ol_s'][$collection1_key][$collection2_key] = [
-                    //  ol = overlap count
                     'ol' => $intersection_count,
                     'c1_count' => $set1_count,
                     'c2_count' => $set2_count,
                     'p' => round($overlap_percentage, 2),
+                    'c1_in_c2_p' => round($c1_in_c2_percentage, 2), // Percentage of collection1 contained in collection2
+                    'c2_in_c1_p' => round($c2_in_c1_percentage, 2), // Percentage of collection2 contained in collection1
                 ];
             }
         }

app/Livewire/CollectionOverlap.php

@@ -24,8 +24,8 @@ public function mount()
         }
 
         // Store in the public property
-        $this->collections = $decodedData['ol_d'];
-       
+        $this->collections = $decodedData;
+
     }
 
     public function render()