Bug fixes for DE minimiser and domains calculations (#268)

* Fixes contrast model bug for domains standard layers * Implements DE strategy
RascalSoftware · Sep 17, 2024 · e206795 · e206795
1 parent 5487610
commit e206795
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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)