Skip to content

Commit 755423c

Browse files
jonathancurriejonathancurrie
committed
Merge branch 'feature/2023Update'
2 parents f85f789 + 76f4577 commit 755423c

File tree

275 files changed

+590
-591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+590
-591
lines changed

‎.vscode/c_cpp_properties.json

-78
This file was deleted.

‎.vscode/settings.json

-71
This file was deleted.

‎@opti/buildConfig.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% solving a problem with a specified solver. It is not designed to be
66
% called by the user.
77

8-
% Copyright (C) 2011 Jonathan Currie (IPL)
8+
% Copyright (C) 2011 Jonathan Currie (Control Engineering)
99

1010
%Get Warning Level
1111
if(strcmpi(opts.warnings,'all'))

‎@opti/buildOpti.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
%
44
% Called By OPTI Constructor
55

6-
% Copyright (C) 2011-2012 Jonathan Currie (IPL)
6+
% Copyright (C) 2011-2012 Jonathan Currie (Control Engineering)
77

88
% Build Settings
99
settings.QUAD_EIG_MAX_SIZE = 1e8; %Maximum size (rows*cols) for a quadratic matrix before skipping eig() for non-convex check

‎@opti/calcStatistics.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
%
44
% Called By opti fitStats
55

6-
% Copyright (C) 2011-2014 Jonathan Currie (IPL)
6+
% Copyright (C) 2011-2014 Jonathan Currie (Control Engineering)
77

88
% This function uses ideas from:
99
% - David M. Himmelblau. Process Analysis by Statistical Methods.

‎@opti/checkOptiSol.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
%
44
% Called by OPTI / checkSol
55

6-
% Copyright (C) 2011 Jonathan Currie (IPL)
6+
% Copyright (C) 2011 Jonathan Currie (Control Engineering)
77

88
ok = 1;
99
msg = sprintf('Solver Status:');

‎@opti/displayOPTI.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ function displayOPTI(O)
33
%
44
% Called By OPTI Class
55

6-
% Copyright (C) 2011 Jonathan Currie (IPL)
6+
% Copyright (C) 2011 Jonathan Currie (Control Engineering)
77

88
%Distribute Structure Variables;
99
prob = O.prob;

‎@opti/multiSolveOpti.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
% pretty much an exhaustive search. However it has been very useful on
88
% problems where an initial guess is hard to find!
99

10-
% Copyright (C) 2013 Jonathan Currie (IPL)
10+
% Copyright (C) 2013 Jonathan Currie (Control Engineering)
1111

1212
%Number of 'best points' to keep during search
1313
nbestpts = 10;

‎@opti/opti.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
%
3333
%
3434
% For detailed documentation see the Wiki:
35-
% https://inverseproblem.co.nz/OPTI
35+
% https://controlengineering.co.nz/Wikis/OPTI
3636
%
3737
%
3838
% See also opti.solve optiset opti.plot
3939
%
40-
% Copyright (C) 2011-2018 Jonathan Currie (www.inverseproblem.co.nz)
40+
% Copyright (C) 2011-2018 Jonathan Currie (www.controlengineering.co.nz)
4141

4242
properties (SetAccess = private)
4343
prob % Problem Structure (optiprob)

‎@opti/solveOpti.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
%
44
% Called By opti Solve
55

6-
% Copyright (C) 2011-2013 Jonathan Currie (IPL)
6+
% Copyright (C) 2011-2013 Jonathan Currie (Control Engineering)
77

88
%Allocate input args
99
prob = optObj.prob;

‎@opti/testProblem.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
% [times,results] = testProblems(optObj,solvers) runs only the selected
88
% solvers across the supplied problem.
99

10-
% Copyright (C) 2011 Jonathan Currie (IPL)
10+
% Copyright (C) 2011 Jonathan Currie (Control Engineering)
1111

1212

1313
%Setup default arguments

‎Examples/AMPL_Examples.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
%
77
% The underlying parser uses Netlib's AMPL Solver Library (ASL) Interface.
88
%
9-
% Copyright (C) 2014 Jonathan Currie (IPL)
9+
% Copyright (C) 2014 Jonathan Currie (Control Engineering)
1010

1111
% There is also a page on the Wiki which supplements this example:
12-
web('https://www.inverseproblem.co.nz/OPTI/index.php/File/AMPL');
12+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/File/AMPL');
1313

1414
%% Loading an AMPL Problem
1515
% OPTI Toolbox is supplied with a number of example AMPL problems ranging

‎Examples/Basic_Usage.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
% - Validating the solution
1616
% - Plotting the solution
1717
%
18-
% Copyright (C) 2014 Jonathan Currie (IPL)
18+
% Copyright (C) 2014 Jonathan Currie (Control Engineering)
1919

2020
% There is also a page on the Wiki which supplements this example:
21-
web('https://www.inverseproblem.co.nz/OPTI/index.php/GetStart/Basics');
21+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/GetStart/Basics');
2222

2323
%% Checking solvers available with your OPTI distribution
2424
% Not all solvers are supplied with the OPTI Toolbox, so to check which are
@@ -65,7 +65,7 @@
6565
clc
6666
optiset
6767

68-
web('https://www.inverseproblem.co.nz/OPTI/index.php/Advanced/Opts','-new');
68+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Advanced/Opts','-new');
6969

7070
%% Example 1
7171
% This is a simple two decision variable Linear Program (LP) which we will

‎Examples/Differentiation_Examples.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
% supplied with the OPTI Toolbox. Note you should be familiar with the
55
% operation of OPTI Toolbox by reading the accompanying examples.
66
%
7-
% Copyright (C) 2014 Jonathan Currie (IPL)
7+
% Copyright (C) 2014 Jonathan Currie (Control Engineering)
88

99
%Also see the following webpage for more examples:
10-
web('https://www.inverseproblem.co.nz/OPTI/index.php/Advanced/Deriv1');
10+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Advanced/Deriv1');
1111

1212
%% Gradient vs Jacobian
1313
% The terms Gradient and Jacobian are associated with differentiation

‎Examples/FileIO_Examples.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
% The underlying parser uses CoinUtils + GLPK for reading and writing all
88
% file types.
99
%
10-
% Copyright (C) 2014 Jonathan Currie (IPL)
10+
% Copyright (C) 2014 Jonathan Currie (Control Engineering)
1111

1212
%This page is supplemented by examples on the following pages:
13-
web('https://www.inverseproblem.co.nz/OPTI/index.php/File/MPS');
14-
web('https://www.inverseproblem.co.nz/OPTI/index.php/File/SDPA','-new');
15-
web('https://www.inverseproblem.co.nz/OPTI/index.php/File/GAMS','-new');
13+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/File/MPS');
14+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/File/SDPA','-new');
15+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/File/GAMS','-new');
1616

1717
%% Loading a MPS Problem
1818
% OPTI Toolbox is supplied with a number of example LP, MILP & QP problems

‎Examples/Global_NonlinearProgramming.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
% to solve them using the OPTI Toolbox. You should read and complete
55
% BasicUsage.m & NonlinearProgramming.m BEFORE running the below examples.
66
%
7-
% Copyright (C) 2014 Jonathan Currie (IPL)
7+
% Copyright (C) 2014 Jonathan Currie (Control Engineering)
88

99
% There is also a page on the Wiki which supplements this example:
10-
web('https://www.inverseproblem.co.nz/OPTI/index.php/Probs/GNLP');
10+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Probs/GNLP');
1111

1212
%% Determing which Solver to Use
1313
% OPTI Toolbox comes with a number of NLP solvers, thus to determine which
@@ -175,7 +175,7 @@
175175
% algorithm for searching the problem space for a global solution. See the
176176
% following page for more examples:
177177

178-
web('https://www.inverseproblem.co.nz/OPTI/index.php/Advanced/MultiSolve');
178+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Advanced/MultiSolve');
179179

180180
clc
181181
Opt = opti(Opt,'solver','ipopt');

‎Examples/LinearProgramming.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
% them using the OPTI Toolbox. You should complete BasicUsage.m before
55
% completing this file.
66
%
7-
% Copyright (C) 2014 Jonathan Currie (IPL)
7+
% Copyright (C) 2014 Jonathan Currie (Control Engineering)
88

99
% There is also a page on the Wiki which supplements this example:
10-
web('https://www.inverseproblem.co.nz/OPTI/index.php/Probs/LP');
10+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Probs/LP');
1111

1212
%% Example 1
1313
% This is a simple two decision variable LP which will use for the next few

‎Examples/MATLAB_Overloads.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
% As well as setting up OPTI solver options which can be used with the
1818
% overloaded functions.
1919
%
20-
% Copyright (C) 2018 Jonathan Currie (IPL)
20+
% Copyright (C) 2018 Jonathan Currie (Control Engineering)
2121

2222
% There is also a page on the Wiki which supplements this example:
23-
web('https://www.inverseproblem.co.nz/OPTI/index.php/GetStart/Overloads');
23+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/GetStart/Overloads');
2424

2525
%% Example 1 - opti_linprog()
2626
% Solved using an OPTI LP solver. Note the function prototype is identical

‎Examples/MixedInteger_LinearProgramming.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
% solve them using the OPTI Toolbox. You should read and complete
55
% BasicUsage.m & LinearProgramming.m BEFORE running the below examples.
66
%
7-
% Copyright (C) 2014 Jonathan Currie (IPL)
7+
% Copyright (C) 2014 Jonathan Currie (Control Engineering)
88

99
% There is also a page on the Wiki which supplements this example:
10-
web('https://www.inverseproblem.co.nz/OPTI/index.php/Probs/MILP');
10+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Probs/MILP');
1111

1212
%% Determing which Solver to Use
1313
% OPTI Toolbox comes with a number of MILP solvers, thus to determine which

‎Examples/NonlinearProgramming.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
% solve them using the OPTI Toolbox. You should read and complete
55
% BasicUsage.m & LinearProgramming.m BEFORE running the below examples.
66
%
7-
% Copyright (C) 2014 Jonathan Currie (IPL)
7+
% Copyright (C) 2014 Jonathan Currie (Control Engineering)
88

99
% There is also a page on the Wiki which supplements this example:
10-
web('https://www.inverseproblem.co.nz/OPTI/index.php/Probs/NLP');
10+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Probs/NLP');
1111

1212
%% Determing which Solver to Use
1313
% OPTI Toolbox comes with a number of NLP solvers, thus to determine which

‎Examples/QuadraticProgramming.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
% solve them using the OPTI Toolbox. You should read and complete
55
% BasicUsage.m & LinearProgramming.m BEFORE running the below examples.
66
%
7-
% Copyright (C) 2014 Jonathan Currie (IPL)
7+
% Copyright (C) 2014 Jonathan Currie (Control Engineering)
88

99
% There is also a page on the Wiki which supplements this example:
10-
web('https://www.inverseproblem.co.nz/OPTI/index.php/Probs/QP');
10+
web('https://www.controlengineering.co.nz/Wikis/OPTI/index.php/Probs/QP');
1111

1212
%% Determing which Solver to Use
1313
% OPTI Toolbox comes with a number of QP solvers, thus to determine which

0 commit comments

Comments
 (0)