From e2067953e504dd81bb0f7f5a7847d9ee419f4850 Mon Sep 17 00:00:00 2001
From: Paul Sharp <44529197+DrPaulSharp@users.noreply.github.com>
Date: Tue, 17 Sep 2024 11:12:15 +0100
Subject: [PATCH] Bug fixes for DE minimiser and domains calculations (#268)

* Fixes contrast model bug for domains standard layers

* Implements DE strategy
---
 minimisers/DE/runDE.m                       | 2 +-
 targetFunctions/+domainsTF/standardLayers.m | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/minimisers/DE/runDE.m b/minimisers/DE/runDE.m
index 78664a5e2..dcd9aecd2 100644
--- a/minimisers/DE/runDE.m
+++ b/minimisers/DE/runDE.m
@@ -38,7 +38,7 @@
     %                      Alternates between differential mutation and three-point-
     %                      recombination.           
     
-    I_strategy = 5;
+    I_strategy = controls.strategy;
     
     % I_refresh     intermediate output will be produced after "I_refresh"
     %               iterations. No intermediate output will be produced
diff --git a/targetFunctions/+domainsTF/standardLayers.m b/targetFunctions/+domainsTF/standardLayers.m
index 4d7eeb470..052af2346 100644
--- a/targetFunctions/+domainsTF/standardLayers.m
+++ b/targetFunctions/+domainsTF/standardLayers.m
@@ -11,7 +11,8 @@
     [repeatLayers,...
      data,...
      dataLimits,...
-     simLimits,~,...
+     simLimits,...
+     contrastLayers,...
      layersDetails,~] = parseCells(problemCells);
     
     % Additionally extract the additional domain layers details
@@ -95,9 +96,9 @@
         subRoughs(i) = params(1);
     end
 
-    for i = 1:size(domainContrastLayers1,1)
-        domainContrastLayers1{i} = domainContrastLayers{i,1};
-        domainContrastLayers2{i} = domainContrastLayers{i,2};
+    for i = 1:numberOfContrasts
+        domainContrastLayers1{i} = domainContrastLayers{contrastLayers{i}(1)};
+        domainContrastLayers2{i} = domainContrastLayers{contrastLayers{i}(2)};
     end
 
     if strcmpi(parallel, coderEnums.parallelOptions.Contrasts)