Full compile of NS minimizer (#163)

Co-authored-by: Stephen Nneji <[email protected]>

Author: arwelHughes

API/RATMain.m

@@ -52,11 +52,11 @@
             sendTextOutput(sprintf('\nRunning Differential Evolution\n\n'));
         end
         [outProblemDef,problem,results] = runDE(problemDef,problemDefCells,problemDefLimits,controls);
-%     case 'ns'
-%         if ~strcmpi(controls.display,'off')
-%             sendTextOutput(sprintf('\nRunning Nested Sampler\n\n'));
-%         end            
-%         [outProblemDef,problem,results,bayesResults] = runNestedSampler(problemDef,problemDefCells,problemDefLimits,controls);   
+    case 'ns'
+        if ~strcmpi(controls.display,'off')
+            sendTextOutput(sprintf('\nRunning Nested Sampler\n\n'));
+        end            
+        [outProblemDef,problem,results,bayesResults] = runNestedSampler(problemDef,problemDefCells,problemDefLimits,controls,priors);   
     case 'dream'
         if ~strcmpi(controls.display,'off')
             sendTextOutput(sprintf('\nRunning DREAM\n\n'));

compile/fullCompile/ratMainCompileScript.m

@@ -4,6 +4,11 @@
 % 
 % See also CODER, CODER.CONFIG, CODER.TYPEOF, CODEGEN.
 
+%% Deal with globals
+global verbose DEBUG
+DEBUG = 0;
+verbose = 1;
+
 %% Create configuration object of class 'coder.MexCodeConfig'.
 cfg = coder.config('mex');
 cfg.GenerateReport = true;
@@ -12,10 +17,10 @@
 cfg.TargetLang = 'C++';
 % cfg.TargetLangStandard = 'C++11 (ISO)';
 
-
-% Define the input argument types..
+%% Define the input argument types..
 ARGS = makeCompileArgsFull();
 
+%% Run the compile
 includeDirs = getappdata(0,'includeDirs');
 includes = cell(length(includeDirs)*2, 1);
 includes(1:2:end) = {'-I'};

examples/D2O/d2o_2contrast.mat

@@ -1,4 +1,4 @@
-function [B, mu, VE, flag] = calc_ellipsoid(u, VS)
+function [B, mu, VE, flag] = calcEllipsoid(u, VS)
 %
 % calculate properties of ellipsoid given a set of points u
 %
@@ -51,10 +51,11 @@
 
 % find scale factor for bounding ellipsoid E
 fB = 0;
+%coder.varsize('fB');
 for i=1:N
     f = ( (u(i,:)-mu) / C ) * (u(i,:)-mu)';
     if f > fB
-        fB = f;
+        fB = f(1);
     end
 end
 
@@ -69,6 +70,21 @@
 end
 
 % scale C to get bounding matrix B
-B = fV * fB * C;
+
+% Again emphasise the scalar for the inner mutiplication
+% matlab error in compiled code.....
+% 
+% Error using eml_mtimes_helper>dynamic_size_checks
+% Inner dimensions must agree. Generated code for a general matrix multiplication at this call site. If this should have been a scalar times a variable-size matrix, the
+% scalar input must be fixed-size.
+% 
+% Error in eml_mtimes_helper (line 69)
+%     dynamic_size_checks(a, b, innerDimA, innerDimB);
+% 
+% Error in calcEllipsoid (line 73)
+% B = fV * fB * C;
+
+% B = fV * fB * C;
+B = fV(1) * fB(1) * C;
 
 return

examples/originalDSPCBilayer/original_dspc_bilayer.mat

@@ -1,6 +1,6 @@
-function pnts = draw_from_ellipsoid(B, mu, N )
+function pnts = drawEllipsoidPoints(B, mu, N )
 
-% function pnts = draw_from_ellipsoid(B, mu, N )
+% function pnts = drawEllipsoidPoints(B, mu, N )
 %
 % This function draws points uniformly from an ndims-dimensional ellipsoid
 % with edges and orientation defined by the the bounding matrix B and
@@ -41,7 +41,8 @@
     pnts(i,:) = fac(i)*pt(i,:);
 
     % scale and rotate to ellipsoid
-    pnts(i,:) = (pnts(i,:) .* D' * V') + mu;
+    % ('real' needed for compile....)
+    pnts(i,:) = real((pnts(i,:) .* D' * V') + mu);
 end
 
 return