Implements updateFreq for simplex and de

Author: StephenNneji

minimisers/DE/deopt.m

@@ -311,7 +311,7 @@
 %----Output section----------------------------------------------------------
 
   if (I_refresh > 0)
-     if ((rem(I_iter,I_refresh) == 0) || I_iter == 1) && strcmpi(controls.display, coderEnums.displayOptions.Iter)
+     if ((rem(I_iter,I_refresh) == 0) || I_iter == 1) && strcmpi(controls.display, coderEnums.displayOptions.Iter) && rem(I_iter, controls.updateFreq) == 0
         triggerEvent(coderEnums.eventTypes.Message, ...
                      sprintf('Iteration: %g,  Best: %f,  fWeight: %f,  F_CR: %f,  I_NP: %g\n\n', I_iter,S_bestval.FVr_oa(1),fWeight,F_CR,I_NP));
 
@@ -347,4 +347,14 @@
 %       I_iter = I_itermax + 1;
 %   end
 end %---end while ((I_iter < I_itermax) ...
+if ~strcmpi(controls.display, coderEnums.displayOptions.Off) && rem(I_iter, controls.updateFreq) ~= 0
+    % This should ensure the final result is printed at the end of a run irrespective of update frequency
+    triggerEvent(coderEnums.eventTypes.Message, ...
+                     sprintf('Iteration: %g,  Best: %f,  fWeight: %f,  F_CR: %f,  I_NP: %g\n\n', I_iter,S_bestval.FVr_oa(1),fWeight,F_CR,I_NP));
+end
+if rem(I_iter, controls.updatePlotFreq) ~= 0
+   % This should ensure the final result is always plotted irrespective of update frequency
+   [~,result] = fname(FVr_bestmem,problem,controls);
+   triggerEvent(coderEnums.eventTypes.Plot, result, problem);
+end
 end

minimisers/simplex/fMinSearch.m

@@ -298,7 +298,7 @@
 how = 'initial simplex';
 itercount = itercount + 1;
 func_evals = n+1;
-if prnt == 3
+if prnt == 3 && rem(itercount, controls.updateFreq) == 0
     triggerEvent(coderEnums.eventTypes.Message, ...
                  sprintf(' %5.0f        %5.0f     %12.6g         %s\n', itercount, func_evals, fv(1), how));
 % elseif prnt == 4
@@ -418,7 +418,7 @@
     [fv,j] = sort(fv);
     v = v(:,j);
     itercount = itercount + 1;
-    if prnt == 3
+    if prnt == 3 && rem(itercount, controls.updateFreq) == 0
         triggerEvent(coderEnums.eventTypes.Message, sprintf(' %5.0f        %5.0f     %12.6g         %s\n', itercount, func_evals, fv(1), how));
 %     elseif prnt == 4
 %         fprintf('%s \n', ' ')
@@ -454,6 +454,14 @@
 x(:) = v(:,1);
 fval = fv(:,1);
 
+if prnt == 3 && rem(itercount, controls.updateFreq) ~= 0
+    % This should ensure the final result is printed at the end of a run irrespective of update frequency
+    triggerEvent(coderEnums.eventTypes.Message, sprintf(' %5.0f        %5.0f     %12.6g         %s\n', itercount, func_evals, fv(1), how));
+end
+if rem(itercount, controls.updatePlotFreq) ~= 0
+    % This should ensure the final result is always plotted irrespective of update frequency
+   triggerEvent(coderEnums.eventTypes.Plot, result, problemStruct);
+end
 
 % OutputFcn and PlotFcns call
 % if haveoutputfcn || haveplotfcn