diff --git a/resources/MatlabInterface/@JEInterface/getMultipleResults.m b/resources/MatlabInterface/@JEInterface/getMultipleResults.m index 2e4bf2e2..cba8f0c4 100644 --- a/resources/MatlabInterface/@JEInterface/getMultipleResults.m +++ b/resources/MatlabInterface/@JEInterface/getMultipleResults.m @@ -1,18 +1,23 @@ function [sols, fits] = getMultipleResults(int) -% If a post processing step was performed: return a set of -% optimization solutions if the run has been finished, or +% After optimization or post processing: return a set of +% optimization solutions if the run has been finished. Returns % a single intermediate solution if the run has not finished yet or an % empty array if there is no intermediate solution yet. if (isFinished(int)) - sols = int.resultArr; + sArr = int.resultArr; else - sols = int.mp.getIntermediateResult(); + sArr(1) = int.mp.getIntermediateResult(); end -fits=zeros(size(sols,1),1); +fits=zeros(size(sArr,1),1); -for i=1:size(sols,1) +for i=1:size(sArr,1) + if (isempty(int.range)) % binary case + sols(i,:)=convertUnsignedJE(int, sArr(i)); + else + sols(i,:)=sArr(i,:); + end; %disp(sols(i,:)); if (isempty(int.args)) fits(i) = feval(int.f, sols(i,:)); diff --git a/resources/MatlabInterface/@JEInterface/getResult.m b/resources/MatlabInterface/@JEInterface/getResult.m index 983a951b..81a40203 100644 --- a/resources/MatlabInterface/@JEInterface/getResult.m +++ b/resources/MatlabInterface/@JEInterface/getResult.m @@ -5,9 +5,9 @@ function [sol, fit] = getResult(int) % [sol, fit] = getResult(int) if (isFinished(int)) - sol = int.result; + sol = int.result'; else - sol = int.mp.getIntermediateResult(); + sol = int.mp.getIntermediateResult()'; end if (isempty(sol))