fixed multi-objective support, collected sim data on 3 new experiments

2026-05-24 20:28:12 -07:00
parent fbcaa32abd
commit 9c65bf7880
7 changed files with 23 additions and 5 deletions
@@ -4,12 +4,16 @@ function f = objectiveFunctionWrapper(center, sigma)
    % composite objectives in particular
    arguments (Input)
        center (:, 2) double;
-        sigma (:, 2, 2) double = eye(2);
+        sigma (:, 2, 2) double = reshape(eye(2), 1, 2, 2);
    end
    arguments (Output)
        f (1, 1) {mustBeA(f, "function_handle")};
    end
    
+    if size(sigma, 1) == 1 && size(center, 1) > 1
+        sigma = repmat(sigma, size(center, 1), 1, 1);
+    end
+
    assert(size(center, 1) == size(sigma, 1));
    f = @(x,y) sum(cell2mat(arrayfun(@(i) mvnpdf([x(:), y(:)], center(i,:), squeeze(sigma(i, :, :))), 1:size(center,1), "UniformOutput", false)), 2);
 end