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

Adaptions of EvA2-renaming in the Matlab m-Files of JEInterface

Browse Source
This commit is contained in:
Marcel Kronfeld
2008-06-03 15:04:32 +00:00
parent 3013e905d6
commit 8136704b1b
10 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
function retInt = optimize(int, optType, varargin)
% Start a JavaEvA optimization run.
% Start a EvA2 optimization run.
% optimize(interface, optType, [, outputFilePrefix ] )
% where
% interface: instance of JEInterface
@@ -28,11 +28,11 @@ if ((nargin == 2) || (nargin == 3))
maxEvals = int.opts.MaxFunEvals;
fTol = int.opts.TolFun;
import javaeva.server.go.operators.terminators.PhenotypeConvergenceTerminator;
import javaeva.server.go.operators.terminators.FitnessConvergenceTerminator;
import javaeva.server.go.operators.terminators.CombinedTerminator;
import javaeva.server.go.operators.terminators.EvaluationTerminator;
import javaeva.OptimizerFactory;
import eva2.server.go.operators.terminators.PhenotypeConvergenceTerminator;
import eva2.server.go.operators.terminators.FitnessConvergenceTerminator;
import eva2.server.go.operators.terminators.CombinedTerminator;
import eva2.server.go.operators.terminators.EvaluationTerminator;
import eva2.OptimizerFactory;
% set some default values if theyre not given
% fminsearch, for example, always uses TolX and TolFun with default
@@ -61,13 +61,13 @@ if ((nargin == 2) || (nargin == 3))
% maxEvals = OptimizerFactory.getDefaultFitCalls;
end
convTerm = EvaluationTerminator(maxEvals);
javaeva.OptimizerFactory.setTerminator(convTerm);
eva2.OptimizerFactory.setTerminator(convTerm);
else % there is a convergence terminator
javaeva.OptimizerFactory.setTerminator(convTerm); % so set it
eva2.OptimizerFactory.setTerminator(convTerm); % so set it
if (~isempty(maxEvals) && (maxEvals > 0))
% if TolX/TolFun plus MaxFunEvals is defined additionally, combine an
% EvaluationTerminator in disjunction, as Matlab does.
javaeva.OptimizerFactory.addTerminator(EvaluationTerminator(maxEvals), 0);
eva2.OptimizerFactory.addTerminator(EvaluationTerminator(maxEvals), 0);
end
end