From 97229177b44cfabcafa8f4ab4eada0de7c9cc37c Mon Sep 17 00:00:00 2001
From: Johannes Pfeifer <jpfeifer@gmx.de>
Date: Thu, 19 Jul 2018 09:25:27 +0200
Subject: [PATCH] simplex_optimization_routine.m: account for penalty indicator
being third output, not fourth one
Caused occasional crashes
---
matlab/optimization/simplex_optimization_routine.m | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/matlab/optimization/simplex_optimization_routine.m b/matlab/optimization/simplex_optimization_routine.m
index ccd81367e..ba784558d 100644
--- a/matlab/optimization/simplex_optimization_routine.m
+++ b/matlab/optimization/simplex_optimization_routine.m
@@ -186,7 +186,7 @@ if verbose
skipline()
end
initial_point = x;
-[initial_score,junk1,junk2,nopenalty] = feval(objective_function,x,varargin{:});
+[initial_score,junk1,nopenalty] = feval(objective_function,x,varargin{:});
if ~nopenalty
error('simplex_optimization_routine:: Initial condition is wrong!')
else
@@ -537,7 +537,7 @@ for j = 1:n
end
v(:,j+1) = y;
x = y;
- [fv(j+1),junk1,junk2,nopenalty_flag] = feval(objective_function,x,varargin{:});
+ [fv(j+1),junk1,nopenalty_flag] = feval(objective_function,x,varargin{:});
if check_delta
while ~nopenalty_flag
if y(j)~=0
@@ -553,7 +553,7 @@ for j = 1:n
end
v(:,j+1) = y;
x = y;
- [fv(j+1),junk1,junk2,nopenalty_flag] = feval(objective_function,x,varargin{:});
+ [fv(j+1),junk1,nopenalty_flag] = feval(objective_function,x,varargin{:});
end
end
end
--
GitLab