Remove these tests since they refer to obsolete options which are now removed

Change-Id: Id94c6f3d69444bd623304053591d88cd330a5472

diff --git a/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_outputcmdobsolete.dia.ref b/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_outputcmdobsolete.dia.ref
deleted file mode 100644 (file)
index 1f6dfc9..0000000
--- a/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_outputcmdobsolete.dia.ref
+++ /dev/null
@@ -1,116 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008-2009 - INRIA - Michael Baudin
-// Copyright (C) 2011 - DIGITEO - Michael Baudin
-//
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-// <-- CLI SHELL MODE -->
-// <-- ENGLISH IMPOSED -->
-// <-- NO CHECK REF -->
-// This test is designed to produce a warning:
-// this warning is localized.
-// This is why we do not check the ref.
-// Checking the ref file under Linux fails, because
-// <-- ENGLISH IMPOSED --> has no effect there.
-// See : http://bugzilla.scilab.org/show_bug.cgi?id=9284
-function [ y , index ] = rosenbrock ( x , index )
-  y = 100*(x(2)-x(1)^2)^2 + (1-x(1))^2;
-endfunction
-//
-// Check backward-compatibility #1:
-// without stop output argument.
-//
-function myoutputcmd3 ( state , data , mystuff )
-  global _OUTPUCMDFLAG_
-  // Unload the array, just to make sure that the minimum is there
-  iter = data.iteration
-  fc = data.funccount
-  fval = data.fval
-  x = data.x
-  simplex = data.simplex
-  // Simplex is a data structure, which can be managed
-  // by the simplex class.
-  v = optimsimplex_dirmat ( simplex )
-  condv = cond ( v )
-  _OUTPUCMDFLAG_ = mystuff.myarg
-endfunction
-global _OUTPUCMDFLAG_;
-_OUTPUCMDFLAG_ = 0;
-myobj = tlist(["T_MYSTUFF","myarg"]);
-myobj.myarg = 12;
-nm = neldermead_new ();
-nm = neldermead_configure(nm,"-numberofvariables",2);
-nm = neldermead_configure(nm,"-function",rosenbrock);
-nm = neldermead_configure(nm,"-x0",[-1.2 1.0]');
-nm = neldermead_configure(nm,"-maxiter",10);
-nm = neldermead_configure(nm,"-method","variable");
-nm = neldermead_configure(nm,"-outputcommand",list(myoutputcmd3,myobj));
-nm = neldermead_search(nm);
-AVERTISSEMENT : Calling sequence outputfun(state,data) is obsolete.
-AVERTISSEMENT : Utilisez plutôt stop=outputfun(state,data) s'il vous plait.
-AVERTISSEMENT : Cette fonctionnalité va être définitivement enlevée dans Scilab 5.4.1
-
-iter = neldermead_get(nm,"-iterations");
-assert_checkequal ( iter , 10 );
-assert_checkequal ( _OUTPUCMDFLAG_ , 12 );
-nm = neldermead_destroy(nm);
-//
-// Check backward-compatibility #2:
-// obsolete use of -outputcommandarg option.
-//
-//
-// myoutputcmd2 --
-//  This command is called back by the Nelder-Mead
-//  algorithm.
-// Arguments
-//  state : the current state of the algorithm
-//    "init", "iter", "done"
-//  data : the data at the current state
-//    This is a tlist with the following entries:
-//    * x : the optimal vector of parameters
-//    * fval : the minimum function value
-//    * simplex : the simplex, as a simplex object
-//    * iteration : the number of iterations performed
-//    * funccount : the number of function evaluations
-//  myobj : a user-defined data structure
-// stop: set to true to stop algorithm
-//
-function stop = myoutputcmd2 ( state , data , myobj )
-  global _OUTPUCMDFLAG_
-  // Unload the array, just to make sure that the minimum is there
-  iter = data.iteration
-  fc = data.funccount
-  fval = data.fval
-  x = data.x
-  simplex = data.simplex
-  // Simplex is a data structure, which can be managed
-  // by the simplex class.
-  v = optimsimplex_dirmat ( simplex )
-  condv = cond ( v )
-  _OUTPUCMDFLAG_ = myobj.myarg
-  stop = %f
-endfunction
-global _OUTPUCMDFLAG_;
-_OUTPUCMDFLAG_ = 0;
-myobj = tlist(["T_MYSTUFF","myarg"]);
-myobj.myarg = 12;
-nm = neldermead_new ();
-nm = neldermead_configure(nm,"-numberofvariables",2);
-nm = neldermead_configure(nm,"-function",rosenbrock);
-nm = neldermead_configure(nm,"-x0",[-1.2 1.0]');
-nm = neldermead_configure(nm,"-maxiter",10);
-nm = neldermead_configure(nm,"-method","variable");
-nm = neldermead_configure(nm,"-outputcommand",myoutputcmd2);
-nm = neldermead_configure(nm,"-outputcommandarg",myobj);
-AVERTISSEMENT : La fonctionnalité optimbase_configure est obsolète.
-AVERTISSEMENT : Utilisez plutôt -outputcommand s'il vous plait.
-AVERTISSEMENT : Cette fonctionnalité va être définitivement enlevée dans Scilab 5.4.1
-
-nm = neldermead_search(nm);
-iter = neldermead_get(nm,"-iterations");
-assert_checkequal ( iter , 10 );
-assert_checkequal ( _OUTPUCMDFLAG_ , 12 );
-nm = neldermead_destroy(nm);

diff --git a/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_outputcmdobsolete.tst b/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_outputcmdobsolete.tst
deleted file mode 100644 (file)
index 40506b9..0000000
--- a/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_outputcmdobsolete.tst
+++ /dev/null
@@ -1,127 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008-2009 - INRIA - Michael Baudin
-// Copyright (C) 2011 - DIGITEO - Michael Baudin
-//
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-
-// <-- CLI SHELL MODE -->
-// <-- ENGLISH IMPOSED -->
-// <-- NO CHECK REF -->
-
-// This test is designed to produce a warning:
-// this warning is localized.
-// This is why we do not check the ref.
-// Checking the ref file under Linux fails, because
-// <-- ENGLISH IMPOSED --> has no effect there.
-// See : http://bugzilla.scilab.org/show_bug.cgi?id=9284
-
-
-
-
-function [ y , index ] = rosenbrock ( x , index )
-  y = 100*(x(2)-x(1)^2)^2 + (1-x(1))^2;
-endfunction
-
-
-//
-// Check backward-compatibility #1:
-// without stop output argument.
-//
-
-function myoutputcmd3 ( state , data , mystuff )
-  global _OUTPUCMDFLAG_
-  // Unload the array, just to make sure that the minimum is there
-  iter = data.iteration
-  fc = data.funccount
-  fval = data.fval
-  x = data.x
-  simplex = data.simplex
-  // Simplex is a data structure, which can be managed
-  // by the simplex class.
-  v = optimsimplex_dirmat ( simplex )
-  condv = cond ( v )
-  _OUTPUCMDFLAG_ = mystuff.myarg
-endfunction
-
-global _OUTPUCMDFLAG_;
-_OUTPUCMDFLAG_ = 0;
-
-myobj = tlist(["T_MYSTUFF","myarg"]);
-myobj.myarg = 12;
-
-nm = neldermead_new ();
-nm = neldermead_configure(nm,"-numberofvariables",2);
-nm = neldermead_configure(nm,"-function",rosenbrock);
-nm = neldermead_configure(nm,"-x0",[-1.2 1.0]');
-nm = neldermead_configure(nm,"-maxiter",10);
-nm = neldermead_configure(nm,"-method","variable");
-nm = neldermead_configure(nm,"-outputcommand",list(myoutputcmd3,myobj));
-nm = neldermead_search(nm);
-iter = neldermead_get(nm,"-iterations");
-assert_checkequal ( iter , 10 );
-assert_checkequal ( _OUTPUCMDFLAG_ , 12 );
-nm = neldermead_destroy(nm);
-
-//
-// Check backward-compatibility #2:
-// obsolete use of -outputcommandarg option.
-//
-
-//
-// myoutputcmd2 --
-//  This command is called back by the Nelder-Mead
-//  algorithm.
-// Arguments
-//  state : the current state of the algorithm
-//    "init", "iter", "done"
-//  data : the data at the current state
-//    This is a tlist with the following entries:
-//    * x : the optimal vector of parameters
-//    * fval : the minimum function value
-//    * simplex : the simplex, as a simplex object
-//    * iteration : the number of iterations performed
-//    * funccount : the number of function evaluations
-//  myobj : a user-defined data structure
-// stop: set to true to stop algorithm
-//
-function stop = myoutputcmd2 ( state , data , myobj )
-  global _OUTPUCMDFLAG_
-  // Unload the array, just to make sure that the minimum is there
-  iter = data.iteration
-  fc = data.funccount
-  fval = data.fval
-  x = data.x
-  simplex = data.simplex
-  // Simplex is a data structure, which can be managed
-  // by the simplex class.
-  v = optimsimplex_dirmat ( simplex )
-  condv = cond ( v )
-  _OUTPUCMDFLAG_ = myobj.myarg
-  stop = %f
-endfunction
-
-
-global _OUTPUCMDFLAG_;
-_OUTPUCMDFLAG_ = 0;
-
-myobj = tlist(["T_MYSTUFF","myarg"]);
-myobj.myarg = 12;
-
-nm = neldermead_new ();
-nm = neldermead_configure(nm,"-numberofvariables",2);
-nm = neldermead_configure(nm,"-function",rosenbrock);
-nm = neldermead_configure(nm,"-x0",[-1.2 1.0]');
-nm = neldermead_configure(nm,"-maxiter",10);
-nm = neldermead_configure(nm,"-method","variable");
-nm = neldermead_configure(nm,"-outputcommand",myoutputcmd2);
-nm = neldermead_configure(nm,"-outputcommandarg",myobj);
-nm = neldermead_search(nm);
-iter = neldermead_get(nm,"-iterations");
-assert_checkequal ( iter , 10 );
-assert_checkequal ( _OUTPUCMDFLAG_ , 12 );
-nm = neldermead_destroy(nm);
-

diff --git a/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_searchaddargobsolete.dia.ref b/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_searchaddargobsolete.dia.ref
deleted file mode 100644 (file)
index 14d37ac..0000000
--- a/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_searchaddargobsolete.dia.ref
+++ /dev/null
@@ -1,49 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008-2009 - INRIA - Michael Baudin
-// Copyright (C) 2011 - DIGITEO - Michael Baudin
-//
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-// <-- CLI SHELL MODE -->
-// <-- ENGLISH IMPOSED -->
-// <-- NO CHECK REF -->
-// This test is designed to produce a warning:
-// this warning is localized.
-// This is why we do not check the ref.
-// Checking the ref file under Linux fails, because
-// <-- ENGLISH IMPOSED --> has no effect there.
-// See : http://bugzilla.scilab.org/show_bug.cgi?id=9284
-x0 = [11.0 140.0]';
-//
-// In this case, the mydata variable is passed
-// explicitely by the neldermead class.
-// So the actual name "mydata" does not matter
-// and whatever variable name can be used.
-//
-function [ y , index ] = rosenbrock2 ( x , index , mydata )
-  a = mydata.a
-  y = 100*(x(2)-x(1)^2)^2 + ( a - x(1))^2;
-endfunction
-//
-// Check backward compatibility with the "-costfargument" option.
-//
-mystuff = tlist(["T_MYSTUFF","a"]);
-mystuff.a = 12.0;
-nm = neldermead_new ();
-nm = neldermead_configure(nm,"-numberofvariables",2);
-nm = neldermead_configure(nm,"-function",rosenbrock2);
-nm = neldermead_configure(nm,"-costfargument",mystuff);
-AVERTISSEMENT : La fonctionnalité optimbase_configure est obsolète.
-AVERTISSEMENT : Utilisez plutôt -function s'il vous plait.
-AVERTISSEMENT : Cette fonctionnalité va être définitivement enlevée dans Scilab 5.4.1
-
-nm = neldermead_configure(nm,"-x0",x0);
-nm = neldermead_configure(nm,"-maxfunevals",%inf);
-nm = neldermead_configure(nm,"-maxiter",10);
-nm = neldermead_search(nm);
-iter = neldermead_get(nm,"-iterations");
-assert_checkequal ( iter , 10 );
-nm = neldermead_destroy(nm);

diff --git a/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_searchaddargobsolete.tst b/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_searchaddargobsolete.tst
deleted file mode 100644 (file)
index 916e720..0000000
--- a/scilab/modules/optimization/tests/unit_tests/neldermead/neldermead_searchaddargobsolete.tst
+++ /dev/null
@@ -1,54 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008-2009 - INRIA - Michael Baudin
-// Copyright (C) 2011 - DIGITEO - Michael Baudin
-//
-// This file must be used under the terms of the CeCILL.
-// This source file is licensed as described in the file COPYING, which
-// you should have received as part of this distribution.  The terms
-// are also available at
-// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-
-// <-- CLI SHELL MODE -->
-// <-- ENGLISH IMPOSED -->
-// <-- NO CHECK REF -->
-
-// This test is designed to produce a warning:
-// this warning is localized.
-// This is why we do not check the ref.
-// Checking the ref file under Linux fails, because
-// <-- ENGLISH IMPOSED --> has no effect there.
-// See : http://bugzilla.scilab.org/show_bug.cgi?id=9284
-
-
-
-x0 = [11.0 140.0]';
-
-
-//
-// In this case, the mydata variable is passed
-// explicitely by the neldermead class.
-// So the actual name "mydata" does not matter
-// and whatever variable name can be used.
-//
-function [ y , index ] = rosenbrock2 ( x , index , mydata )
-  a = mydata.a
-  y = 100*(x(2)-x(1)^2)^2 + ( a - x(1))^2;
-endfunction
-
-//
-// Check backward compatibility with the "-costfargument" option.
-//
-mystuff = tlist(["T_MYSTUFF","a"]);
-mystuff.a = 12.0;
-nm = neldermead_new ();
-nm = neldermead_configure(nm,"-numberofvariables",2);
-nm = neldermead_configure(nm,"-function",rosenbrock2);
-nm = neldermead_configure(nm,"-costfargument",mystuff);
-nm = neldermead_configure(nm,"-x0",x0);
-nm = neldermead_configure(nm,"-maxfunevals",%inf);
-nm = neldermead_configure(nm,"-maxiter",10);
-nm = neldermead_search(nm);
-iter = neldermead_get(nm,"-iterations");
-assert_checkequal ( iter , 10 );
-nm = neldermead_destroy(nm);
-