From 9408319e48df731eb14bbc185ae7f1a3c79e20cd Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Fri, 24 Apr 2015 12:31:27 +0200 Subject: [PATCH] Cosmetic changes related to solvopt.m --- matlab/global_initialization.m | 1 - matlab/optimization/solvopt.m | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m index 4ec37b459..3fa5421e4 100644 --- a/matlab/global_initialization.m +++ b/matlab/global_initialization.m @@ -541,7 +541,6 @@ options_.saopt.neps=10; options_.saopt.maximizer_indicator=0; options_.saopt.rt=0.10; options_.saopt.MaxIter=100000; -options_.saopt.MaxIter=100000; options_.saopt.verbosity=1; options_.saopt.TolFun=1.0e-8; options_.saopt.initial_temperature=15; diff --git a/matlab/optimization/solvopt.m b/matlab/optimization/solvopt.m index 9e5aa6139..6d5693e86 100644 --- a/matlab/optimization/solvopt.m +++ b/matlab/optimization/solvopt.m @@ -53,7 +53,7 @@ function [x,f,exitflag,n_f_evals,n_grad_evals,n_constraint_evals,n_constraint_gr % n_constraint_gradient_evals number of constraint gradient evaluations. % % -% Algorithm: Kuntsevich, A.V., Kappel, F., The solver for local nonlinear optimization problems +% Algorithm: Kuntsevich, A.V., Kappel, F., SolvOpt - The solver for local nonlinear optimization problems % (version 1.1, Matlab, C, FORTRAN). University of Graz, Graz, 1997. % %