Merge branch 'feature/2023Update'

jonathancurrie · Mar 9, 2023 · 755423c · 755423c
2 parents f85f789 + 76f4577
commit 755423c
Show file tree

Hide file tree

Showing 275 changed files with 590 additions and 591 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/@opti/buildConfig.m b/@opti/buildConfig.m
@@ -5,7 +5,7 @@
 %   solving a problem with a specified solver. It is not designed to be
 %   called by the user.
 
-%   Copyright (C) 2011 Jonathan Currie (IPL)
+%   Copyright (C) 2011 Jonathan Currie (Control Engineering)
 
 %Get Warning Level
 if(strcmpi(opts.warnings,'all'))

diff --git a/@opti/buildOpti.m b/@opti/buildOpti.m
@@ -3,7 +3,7 @@
 %
 %   Called By OPTI Constructor
 
-%   Copyright (C) 2011-2012 Jonathan Currie (IPL)
+%   Copyright (C) 2011-2012 Jonathan Currie (Control Engineering)
 
 % Build Settings
 settings.QUAD_EIG_MAX_SIZE = 1e8;    %Maximum size (rows*cols) for a quadratic matrix before skipping eig() for non-convex check

diff --git a/@opti/calcStatistics.m b/@opti/calcStatistics.m
@@ -3,7 +3,7 @@
 %
 %   Called By opti fitStats
 
-%   Copyright (C) 2011-2014 Jonathan Currie (IPL)
+%   Copyright (C) 2011-2014 Jonathan Currie (Control Engineering)
 
 % This function uses ideas from:
 % - David M. Himmelblau. Process Analysis by Statistical Methods. 

diff --git a/@opti/checkOptiSol.m b/@opti/checkOptiSol.m
@@ -3,7 +3,7 @@
 %
 %   Called by OPTI / checkSol
 
-%   Copyright (C) 2011 Jonathan Currie (IPL)
+%   Copyright (C) 2011 Jonathan Currie (Control Engineering)
 
 ok = 1;
 msg = sprintf('Solver Status:');

diff --git a/@opti/displayOPTI.m b/@opti/displayOPTI.m
@@ -3,7 +3,7 @@ function displayOPTI(O)
 %
 %   Called By OPTI Class
 
-%   Copyright (C) 2011 Jonathan Currie (IPL)
+%   Copyright (C) 2011 Jonathan Currie (Control Engineering)
 
 %Distribute Structure Variables;
 prob = O.prob;

diff --git a/@opti/multiSolveOpti.m b/@opti/multiSolveOpti.m
@@ -7,7 +7,7 @@
 %   pretty much an exhaustive search. However it has been very useful on
 %   problems where an initial guess is hard to find!
 
-%   Copyright (C) 2013 Jonathan Currie (IPL)
+%   Copyright (C) 2013 Jonathan Currie (Control Engineering)
 
 %Number of 'best points' to keep during search
 nbestpts = 10;

diff --git a/@opti/opti.m b/@opti/opti.m
@@ -32,12 +32,12 @@
 %
 %
 %   For detailed documentation see the Wiki:
-%      https://inverseproblem.co.nz/OPTI
+%      https://controlengineering.co.nz/Wikis/OPTI
 %
 %
 %   See also opti.solve optiset opti.plot 
 %
-%   Copyright (C) 2011-2018 Jonathan Currie (www.inverseproblem.co.nz)
+%   Copyright (C) 2011-2018 Jonathan Currie (www.controlengineering.co.nz)
 
     properties (SetAccess = private)
         prob        % Problem Structure (optiprob)

diff --git a/@opti/solveOpti.m b/@opti/solveOpti.m
@@ -3,7 +3,7 @@
 %
 %   Called By opti Solve
 
-%   Copyright (C) 2011-2013 Jonathan Currie (IPL)
+%   Copyright (C) 2011-2013 Jonathan Currie (Control Engineering)
 
 %Allocate input args
 prob = optObj.prob; 

diff --git a/@opti/testProblem.m b/@opti/testProblem.m
@@ -7,7 +7,7 @@
 %   [times,results] = testProblems(optObj,solvers) runs only the selected
 %   solvers across the supplied problem.
 
-%   Copyright (C) 2011 Jonathan Currie (IPL)
+%   Copyright (C) 2011 Jonathan Currie (Control Engineering)
 
 
 %Setup default arguments

diff --git a/Examples/AMPL_Examples.m b/Examples/AMPL_Examples.m
@@ -6,10 +6,10 @@
 %
 % The underlying parser uses Netlib's AMPL Solver Library (ASL) Interface.
 %
-%   Copyright (C) 2014 Jonathan Currie (IPL)
+%   Copyright (C) 2014 Jonathan Currie (Control Engineering)
 
 % There is also a page on the Wiki which supplements this example:
-web('https://www.inverseproblem.co.nz/OPTI/index.php/File/AMPL');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/File/AMPL');
 
 %% Loading an AMPL Problem
 % OPTI Toolbox is supplied with a number of example AMPL problems ranging

diff --git a/Examples/Basic_Usage.m b/Examples/Basic_Usage.m
@@ -15,10 +15,10 @@
 %   - Validating the solution
 %   - Plotting the solution
 %
-%   Copyright (C) 2014 Jonathan Currie (IPL)
+%   Copyright (C) 2014 Jonathan Currie (Control Engineering)
 
 % There is also a page on the Wiki which supplements this example:
-web('https://www.inverseproblem.co.nz/OPTI/index.php/GetStart/Basics');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/GetStart/Basics');
 
 %% Checking solvers available with your OPTI distribution
 % Not all solvers are supplied with the OPTI Toolbox, so to check which are
@@ -65,7 +65,7 @@
 clc
 optiset
 
-web('https://www.inverseproblem.co.nz/OPTI/index.php/Advanced/Opts','-new');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Advanced/Opts','-new');
 
 %% Example 1
 % This is a simple two decision variable Linear Program (LP) which we will

diff --git a/Examples/Differentiation_Examples.m b/Examples/Differentiation_Examples.m
@@ -4,10 +4,10 @@
 % supplied with the OPTI Toolbox. Note you should be familiar with the 
 % operation of OPTI Toolbox by reading the accompanying examples.
 %
-%   Copyright (C) 2014 Jonathan Currie (IPL)
+%   Copyright (C) 2014 Jonathan Currie (Control Engineering)
 
 %Also see the following webpage for more examples:
-web('https://www.inverseproblem.co.nz/OPTI/index.php/Advanced/Deriv1');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Advanced/Deriv1');
 
 %% Gradient vs Jacobian
 % The terms Gradient and Jacobian are associated with differentiation

diff --git a/Examples/FileIO_Examples.m b/Examples/FileIO_Examples.m
@@ -7,12 +7,12 @@
 % The underlying parser uses CoinUtils + GLPK for reading and writing all
 % file types.
 %
-%   Copyright (C) 2014 Jonathan Currie (IPL)
+%   Copyright (C) 2014 Jonathan Currie (Control Engineering)
 
 %This page is supplemented by examples on the following pages:
-web('https://www.inverseproblem.co.nz/OPTI/index.php/File/MPS');
-web('https://www.inverseproblem.co.nz/OPTI/index.php/File/SDPA','-new');
-web('https://www.inverseproblem.co.nz/OPTI/index.php/File/GAMS','-new');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/File/MPS');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/File/SDPA','-new');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/File/GAMS','-new');
 
 %% Loading a MPS Problem
 % OPTI Toolbox is supplied with a number of example LP, MILP & QP problems

diff --git a/Examples/Global_NonlinearProgramming.m b/Examples/Global_NonlinearProgramming.m
@@ -4,10 +4,10 @@
 % to solve them using the OPTI Toolbox. You should read and complete
 % BasicUsage.m & NonlinearProgramming.m BEFORE running the below examples.
 %
-%   Copyright (C) 2014 Jonathan Currie (IPL)
+%   Copyright (C) 2014 Jonathan Currie (Control Engineering)
 
 % There is also a page on the Wiki which supplements this example:
-web('https://www.inverseproblem.co.nz/OPTI/index.php/Probs/GNLP');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Probs/GNLP');
 
 %% Determing which Solver to Use
 % OPTI Toolbox comes with a number of NLP solvers, thus to determine which
@@ -175,7 +175,7 @@
 % algorithm for searching the problem space for a global solution. See the
 % following page for more examples:
 
-web('https://www.inverseproblem.co.nz/OPTI/index.php/Advanced/MultiSolve');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Advanced/MultiSolve');
 
 clc
 Opt = opti(Opt,'solver','ipopt');

diff --git a/Examples/LinearProgramming.m b/Examples/LinearProgramming.m
@@ -4,10 +4,10 @@
 % them using the OPTI Toolbox. You should complete BasicUsage.m before
 % completing this file.
 %
-%   Copyright (C) 2014 Jonathan Currie (IPL)
+%   Copyright (C) 2014 Jonathan Currie (Control Engineering)
 
 % There is also a page on the Wiki which supplements this example:
-web('https://www.inverseproblem.co.nz/OPTI/index.php/Probs/LP');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Probs/LP');
 
 %% Example 1
 % This is a simple two decision variable LP which will use for the next few

diff --git a/Examples/MATLAB_Overloads.m b/Examples/MATLAB_Overloads.m
@@ -17,10 +17,10 @@
 % As well as setting up OPTI solver options which can be used with the
 % overloaded functions.
 %
-%   Copyright (C) 2018 Jonathan Currie (IPL)
+%   Copyright (C) 2018 Jonathan Currie (Control Engineering)
 
 % There is also a page on the Wiki which supplements this example:
-web('https://www.inverseproblem.co.nz/OPTI/index.php/GetStart/Overloads');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/GetStart/Overloads');
 
 %% Example 1 - opti_linprog()
 % Solved using an OPTI LP solver. Note the function prototype is identical

diff --git a/Examples/MixedInteger_LinearProgramming.m b/Examples/MixedInteger_LinearProgramming.m
@@ -4,10 +4,10 @@
 % solve them using the OPTI Toolbox. You should read and complete
 % BasicUsage.m & LinearProgramming.m BEFORE running the below examples.
 %
-%   Copyright (C) 2014 Jonathan Currie (IPL)
+%   Copyright (C) 2014 Jonathan Currie (Control Engineering)
 
 % There is also a page on the Wiki which supplements this example:
-web('https://www.inverseproblem.co.nz/OPTI/index.php/Probs/MILP');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Probs/MILP');
 
 %% Determing which Solver to Use
 % OPTI Toolbox comes with a number of MILP solvers, thus to determine which

diff --git a/Examples/NonlinearProgramming.m b/Examples/NonlinearProgramming.m
@@ -4,10 +4,10 @@
 % solve them using the OPTI Toolbox. You should read and complete
 % BasicUsage.m & LinearProgramming.m BEFORE running the below examples.
 %
-%   Copyright (C) 2014 Jonathan Currie (IPL)
+%   Copyright (C) 2014 Jonathan Currie (Control Engineering)
 
 % There is also a page on the Wiki which supplements this example:
-web('https://www.inverseproblem.co.nz/OPTI/index.php/Probs/NLP');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Probs/NLP');
 
 %% Determing which Solver to Use
 % OPTI Toolbox comes with a number of NLP solvers, thus to determine which

diff --git a/Examples/QuadraticProgramming.m b/Examples/QuadraticProgramming.m
@@ -4,10 +4,10 @@
 % solve them using the OPTI Toolbox. You should read and complete
 % BasicUsage.m & LinearProgramming.m BEFORE running the below examples.
 %
-%   Copyright (C) 2014 Jonathan Currie (IPL)
+%   Copyright (C) 2014 Jonathan Currie (Control Engineering)
 
 % There is also a page on the Wiki which supplements this example:
-web('https://www.inverseproblem.co.nz/OPTI/index.php/Probs/QP');
+web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Probs/QP');
 
 %% Determing which Solver to Use
 % OPTI Toolbox comes with a number of QP solvers, thus to determine which