cmaeswrapper was broken on old matlab versions

tholden · Sep 2, 2016 · 368baa3 · 368baa3
1 parent f1ab575
commit 368baa3
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Core/CMAESWrapper.m b/Core/CMAESWrapper.m
@@ -1,10 +1,18 @@
 function [ x, f ] = CMAESWrapper( OptiFunction, x, lb, ub, varargin )
+
+    OpenPool;
+
     try
         pool = gcp;
         nw = pool.NumWorkers;
     catch
-        nw = 1;
+        try
+            nw = matlabpool( 'size' ); %#ok<DPOOL>
+        catch
+            nw = 1;
+        end
     end
+
     cmaesOptions = cmaes;
     cmaesOptions.EvalParallel = 1;
     cmaesOptions.PopSize = [ 'max( ' int2str( nw ) ', (4 + floor(3*log(N))) )' ];
@@ -20,5 +28,6 @@
     [~,~,~,~,~,best] = CMAESMinimisation( @( XV ) CMAESParallelWrapper( OptiFunction, XV ), x, sigma, cmaesOptions );
     x = max( lb, min( ub, best.x ) );
     f = best.f;
+
 end