Fix bugs and add mean scielab metric

linusmossberg · Mar 25, 2020 · f9d0ba9 · f9d0ba9
1 parent 3df4deb
commit f9d0ba9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 73 deletions.
diff --git a/source/circle-packing/findNumClusters.m b/source/circle-packing/findNumClusters.m
@@ -2,7 +2,7 @@
 
     max_clusters = 16;
 
-    num_unique_colors = size(uniquetol(reshape(image, [], 3), 1e-3, 'ByRows', true), 1);
+    num_unique_colors = size(unique(reshape(im2uint8(image), [], 3), 'rows'), 1);
 
     low_unique = false;
     if num_unique_colors <= max_clusters
@@ -11,11 +11,11 @@
         return;
     end
 
-    num_colors = prod(size(image), 1:2);
+    num_colors = prod(size(image, 1:2));
     max_colors = 256*256;
 
     if(num_colors > max_colors)
-        image = imresize(image, sqrt(max_colors/num_colors), 'nearest');
+        image = imresize(image, sqrt(max_colors/num_colors), 'bilinear');
     end
 
     image = rgb2lab(image);

diff --git a/source/lib/scielab/lab2xyz.m b/source/lib/scielab/lab2xyz.m
diff --git a/source/util/meanscielab.m b/source/util/meanscielab.m
@@ -0,0 +1,10 @@
+function mean_scielab = meanscielab(reproduced, reference, distance, PPI)
+    D65_wp = [0.9504, 1.0000, 1.0888];
+    XYZ_reference = rgb2xyz(reference, 'WhitePoint', 'd65');
+    XYZ_reproduced = rgb2xyz(reproduced, 'WhitePoint', 'd65');
+    D = distance * 39.3700787;
+    SPD = PPI * D * tan(pi/180);
+    scielab_map = scielab(SPD, XYZ_reference, XYZ_reproduced, D65_wp, 'xyz');
+    mean_scielab = mean(scielab_map(:));
+end
+