250907.121439.CST matlab: misc small improvements

Author: zaikunzhang

matlab/interfaces/private/postprima.m

@@ -49,12 +49,12 @@
 invoker_list = [invoker_list, strcat(invoker_list, '.m')];
 callstack = dbstack;
 funname = callstack(1).name; % Name of the current function
-if (length(callstack) == 1) || ~ismember(callstack(2).name, invoker_list)
+if length(callstack) > 1 && ismember(callstack(2).name, invoker_list)
+    invoker = callstack(2).name; % Name of the function who calls this function
+else
     % Private/unexpected error
     error(sprintf('%s:InvalidInvoker', funname), ...
     '%s: UNEXPECTED ERROR: %s should only be called by %s.', funname, funname, strjoin(invoker_list, ', '));
-else
-    invoker = callstack(2).name; % Name of the function who calls this function
 end
 
 % Verify the input before starting the real business

matlab/interfaces/private/preprima.m

@@ -30,12 +30,12 @@
 invoker_list = [invoker_list, strcat(invoker_list, '.m')];
 callstack = dbstack;
 funname = callstack(1).name; % Name of the current function
-if (length(callstack) == 1 || ~ismember(callstack(2).name, invoker_list))
+if length(callstack) > 1 && ismember(callstack(2).name, invoker_list)
+    invoker = callstack(2).name; % Name of the function who calls this function
+else
     % Private/unexpected error
     error(sprintf('%s:InvalidInvoker', funname), ...
     '%s: UNEXPECTED ERROR: %s should only be called by %s.', funname, funname, strjoin(invoker_list, ', '));
-else
-    invoker = callstack(2).name; % Name of the function who calls this function
 end
 
 if (nargin ~= 1) && (nargin ~= 10)
@@ -435,11 +435,7 @@
 
 if ~isempty(unknown_fields)
     wid = sprintf('%s:UnknownProbField', invoker);
-    if length(unknown_fields) == 1
-        wmsg = sprintf('%s: problem with an unknown field %s; it is ignored.', invoker, strjoin(unknown_fields, ', '));
-    else
-        wmsg = sprintf('%s: problem with unknown fields %s; they are ignored.', invoker, strjoin(unknown_fields, ', '));
-    end
+    wmsg = sprintf('%s: problem with unknown field(s) %s, which will be ignored.', invoker, strjoin(unknown_fields, ', '));
     warning(wid, '%s', wmsg);
     warnings = [warnings, wmsg];
 end
@@ -1023,11 +1019,7 @@
 % even though we have declared that this field will be ignored.
 if ~isempty(unknown_fields)
     wid = sprintf('%s:UnknownOption', invoker);
-    if length(unknown_fields) == 1
-        wmsg = sprintf('%s: unknown option %s; it is ignored.', invoker, strjoin(unknown_fields, ', '));
-    else
-        wmsg = sprintf('%s: unknown options %s; they are ignored.', invoker, strjoin(unknown_fields, ', '));
-    end
+    wmsg = sprintf('%s: unknown option(s) %s, which will be ignored.', invoker, strjoin(unknown_fields, ', '));
     warning(wid, '%s', wmsg);
     warnings = [warnings, wmsg];
 end

matlab/setup_tools/package_info.m

@@ -21,12 +21,12 @@
 invoker_list = {'prima', 'preprima', 'parse_input'};
 callstack = dbstack;
 funname = callstack(1).name; % Name of the current function
-if (length(callstack) == 1 || ~ismember(callstack(2).name, invoker_list))
+if length(callstack) > 1 && ismember(callstack(2).name, invoker_list)
+    invoker = callstack(2).name; % Name of the function who calls this function
+else
     % Private/unexpected error
     error(sprintf('%s:InvalidInvoker', funname), ...
     '%s: UNEXPECTED ERROR: %s should only be called by %s.', funname, funname, strjoin(invoker_list, ', '));
-else
-    invoker = callstack(2).name; % Name of the function who calls this function
 end
 
 name = 'PRIMA';

matlab/tests/parallel.m

@@ -71,7 +71,7 @@ function parallel(solver, options)
 
     %ticBytes(gcp)
 
-    parfor i = 1:np
+    parfor ip = 1:np
         fprintf('\n>>>>>> Parallel test for %s, %d-th run <<<<<<\n', solver_name, i);
         test(solver, n, solver_options, random_seed + i);
     end

matlab/tests/private/isequiv.m

@@ -385,14 +385,10 @@ function isequiv(solvers, options)
     test_options.npt = floor(2*rand*n);
 end
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-if 1 <= ir && ir <= 20
+if rand < 0.5
     % The TOUGH tests
-    % We must pass the random seed `rseed` to `tough` to ensure reproducibility.
+    prob = tough(prob, rseed);  % We must pass the random seed `rseed` to `tough` to ensure reproducibility.
     test_options.chkfunval = false;  % The checking would fail due to noise.
-    prob = tough(prob, rseed);
-else
-    prob.objective  = objective;
-    prob.nonlcon = nonlcon;
 end
 prob.options = test_options;
 

matlab/tests/private/isintnum.m

@@ -1,2 +1,2 @@
 function is_intnum = isintnum(x)
-is_intnum = isnumeric(x) && numel(x) == 1 && abs(x-round(x)) <= eps;
+is_intnum = isnumeric(x) && isscalar(x) && abs(x-round(x)) <= eps;

matlab/tests/recursive.m

@@ -64,7 +64,7 @@ function recursive(solver, options)
 solver_options.maxfun = min(100*n, 5e3);
 fun = @chrosen;
 for i = 1 : depth
-    fun = @(x) rfun(x, fun, solver, n, solver_options);
+    fun = @(x) rfun(x, fun, solver, solver_options);
 end
 
 % Conduct the test
@@ -89,7 +89,7 @@ function recursive(solver, options)
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-function f = rfun(x, fun, solver, n, solver_options)
+function f = rfun(x, fun, solver, solver_options)
 %RFUN defines a function of x by minimizing fun([x; y]) with respect to y in R^2 using a solver.
 solver_options.iprint = 0;
 solver_options.rhoend = 1.0e-2;