Removes unneeded compile folders, removes output class, and add full …

…compile code only generation (#164)

API/RAT.m

@@ -1,12 +1,5 @@
 function [outProblemDef,result] = RAT(problemDefInput,controls)
 
-persistent isInitialised
-
-if isempty(isInitialised)
-    isInitialised = false;
-end
-
-
 [problemDef,problemDefCells,problemDefLimits,priors,controls] = parseClassToStructs(problemDefInput,controls);
 [problemDef,~] = packparams(problemDef,problemDefCells,problemDefLimits,controls.checks);
 
@@ -41,28 +34,6 @@
 % coder.varsize('problemDef.fitconstr',[Inf,2],[1,0]);
 % coder.varsize('problemDef.otherconstr',[Inf,2],[1,0]);
 
-% Set up the output class and events.
-% Only do this once so it can be modified
-% by other apps using RAT (i.e. Rascal)
-if ~isInitialised
-    ratOut = outputClass();
-    ratListener = listener(ratOut,'ratUpdate',@defaultOutputFunction);
-    %ratListener = listener(ratOut,'ratUpdate',@bayesAddInfoText);
-    setappdata(0,'ratOut',{ratOut ; ratListener});
-    isInitialised = true;
-end
-
-% This creates an output class from RAT from which updates are sent.
-% To use it, register an output function with ratOut using the listener
-% class. To supress the default listener (outputs to command window only)
-% being called, this must be manually deleted (delete(ratListener)).
-% To trigger output within RAT...
-%
-% ratOut = getappdata(0,'ratOut');
-% ratOutHandle = ratOut{1};
-% ratOut.customEventData.textUpdate = 'new text';
-% ratOut.triggerEvent;
-
 % Set controls.calCls always to 1
 % if we are doing customXY
 switch lower(problemDef.modelType)
@@ -75,12 +46,11 @@
 % If display is not silent print a
 % line confirminf RAT is starting
 if ~strcmpi(controls.display,'off')
-    sendTextOutput(sprintf('Starting RAT ________________________________________________________________________________________________ \n'));
+    fprintf('Starting RAT ________________________________________________________________________________________________\n\n');
 end
 
 tic
 [outProblemStruct,problem,result,bayesResults] = RATMain_mex(problemDef,problemDefCells,problemDefLimits,controls,priors);
-sendTextOutput(sprintf('\n'));
 
 if ~strcmpi(controls.display,'off')
     toc
@@ -112,9 +82,7 @@
 outProblemDef = parseOutToProjectClass(problemDefInput,outProblemStruct,problem,result);
 
 if ~strcmpi(controls.display,'off')
-   sendTextOutput(sprintf('\nFinished RAT ______________________________________________________________________________________________ \n\n'));
+   fprintf('\nFinished RAT ______________________________________________________________________________________________ \n\n');
 end
 
 end
-
-

API/RATMain.m

@@ -44,22 +44,22 @@
         outProblemDef = problemDef;
     case 'simplex'
         if ~strcmpi(controls.display,'off')
-            sendTextOutput(sprintf('\nRunning simplex\n\n'));
+            fprintf('\nRunning simplex\n\n');
         end
         [outProblemDef,problem,results] = runSimplex(problemDef,problemDefCells,problemDefLimits,controls);
     case 'de'
         if ~strcmpi(controls.display,'off')
-            sendTextOutput(sprintf('\nRunning Differential Evolution\n\n'));
+            fprintf('\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'));
+            fprintf('\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'));
+            fprintf('\nRunning DREAM\n\n');
         end
         [outProblemDef,problem,results,bayesResults] = runDREAM(problemDef,problemDefCells,problemDefLimits,controls,priors);
 end

API/outputFunction/sendTextOutput.m

@@ -1,15 +1,12 @@
-function sendTextOutput(text)
+function sendTextOutput(outText)
 
-persistent ratOut
+% This is an overloaded version of 'sendTextOutput' for the compile.
+% The 'real' one is the output class. We will think of a better solution
+% later on.
+% if isnumeric(outText)
+%     outText = sprintf('%g',outText);
+% end
 
-if isempty(ratOut)
-    ratOut = getappdata(0,'ratOut');
-    outputClass = ratOut{1};
-end
+fprintf('%s \n',outText);
 
-try
-    outputClass.customEventData.textUpdate = text;
-    outputClass.triggerEvent;
-catch
-    disp(text);
 end

addPaths.m

@@ -23,12 +23,10 @@
     fullfile(root,'API','outputFunction');
     fullfile(root,'API','projectClass');
 
-    fullfile(root,'compile','DE');
     eventCompilePath;
     fullfile(root,'compile','customWrapper');
     fullfile(root,'compile','reflectivityCalculation');
     fullfile(root,'compile','fullCompile');
-    fullfile(root,'compile','simplex');
     fullfile(root,'compile');
 
     fullfile(root,'minimisers','DREAM');

buildScript.m

@@ -7,26 +7,14 @@
 % Go to the correct compile directory
 compilePath = fullfile(thisPath,'compile','reflectivityCalculation');
 cd(compilePath);
-
-% Run the compile script whist in that directory (ensures mex file ends up
-% in the correct place)
 reflectivityCalculationCompileScript
 
-% Now we need to change the defined paths to generate the source code. At
-% the moment, RAT uses a 'feval' call to the base workspace to excecute
-% Matlab custom model files. This will fail for standalone codegen. So, we
-% need to change RAT paths to exclude these files from the source generation
-% setCompilePaths('lib');
-% 
-% Now generate the source....
-reflectivityCalculationCodeOnlyScript;
-
 compilePath = fullfile(thisPath,'compile','fullCompile');
 cd(compilePath);
 ratMainCompileScript;
+ratMainCodeGen;
 
 % Finally, change the paths back or the tests might fail...
-% setCompilePaths('mex');
 compilePath = fullfile(thisPath, 'compile', 'events');
 cd(compilePath);
 eventCompileScript;