halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates to the OptimizerFactory and the MatlabInterface. Better access to EvAClient.

Browse Source
This commit is contained in:
Marcel Kronfeld
2008-12-09 15:18:54 +00:00
parent c76f046faf
commit 245d8892ef
15 changed files with 433 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/MatlabInterface/@JEInterface/optimize.m
View File

@@ -43,15 +43,14 @@ if ((nargin == 2) || (nargin == 3))
if (isempty(int.opts.TolX)) ; xTol = 1e-4; end
if (isempty(int.opts.TolFun)) ; fTol = 1e-4; end
evalsForConv=100;
% construct Terminators
if ((xTol > 0) && (fTol > 0))
% both criteria are given, use combination
convTerm = CombinedTerminator(FitnessConvergenceTerminator(fTol, evalsForConv, 1, 1), PhenotypeConvergenceTerminator(xTol, evalsForConv, 1, 1), 1);
convTerm = CombinedTerminator(FitnessConvergenceTerminator(fTol, int.opts.TolFunEvals, 1, 1), PhenotypeConvergenceTerminator(xTol, int.opts.TolXEvals, 1, 1), 1);
else if (xTol > 0) % only phenotye convergence
convTerm = PhenotypeConvergenceTerminator(xTol, evalsForConv, 1, 1);
convTerm = PhenotypeConvergenceTerminator(xTol, int.opts.TolXEvals, 1, 1);
else if (fTol > 0 ) % only fitness covnergence
convTerm = FitnessConvergenceTerminator(fTol, evalsForConv, 1, 1);
convTerm = FitnessConvergenceTerminator(fTol, int.opts.TolFunEvals, 1, 1);
else
convTerm = 'undef'; % signal that there is no terminator yet
end