Commit c53a2dbe authored by Jens Saak's avatar Jens Saak

more last minute changes

parent 67f2bb28
......@@ -13,7 +13,7 @@
- Patrick Kuerschner (RADI)
- Jens Saak (improved MOR functions, test framework, unit and
system tests, code and toolbox restructuring)
- Tony Stillfjord (splitting schemes for Differential Riccati equations)
- Tony Stillfjord (splitting schemes for DREs)
- Steffen Werner (RADI, improved Operator Manager,
improved Riccati iteration)
......
......@@ -66,10 +66,17 @@ if nargin<2
else
opts.irka.r = r;
end
if nargin < 3
istest = 0;
end
opts.irka.maxiter =20;
opts.irka.shift_tol = 1e-2;
opts.irka.h2_tol = 1e-6;
opts.irka.info = 1;
if istest
opts.irka.info = 1;
else
opts.irka.info = 2;
end
opts.irka.init = 'logspace';
[Er,Ar,Br,Cr,~,~,~,~,~] = mess_tangential_irka(E,A,B,C,opts);
......
......@@ -64,14 +64,22 @@ end
eqn = getrail(k);
%%
if nargin<2
opts.irka.r = 10;
opts.irka.r = 20;
else
opts.irka.r = r;
end
if nargin < 3
istest = 0;
end
opts.irka.maxiter =20;
opts.irka.shift_tol = 1e-3;
opts.irka.h2_tol = 1e-6;
opts.irka.info = 1;
if istest
opts.irka.info = 1;
else
opts.irka.info = 2;
end
opts.irka.init = 'logspace';
[Er,Ar,Br,Cr] = mess_tangential_irka(eqn.E_,eqn.A_,eqn.B,eqn.C,opts);
......
function out = LQR_rail_splitting(k, exp_action, method)
function out = LQR_rail_splitting(k, exp_action, method,istest)
% Computes the optimal feedback via low-rank splitting schemes [1, 2] for
% the selective cooling of Steel profiles application described in [3,4,5].
......@@ -79,7 +79,9 @@ if nargin < 3
method.additive = false;
method.symmetric = false;
end
if nargin < 4
istest = 0;
end
%% Equation parameters
% Default (E, A, B, C) system
oper = operatormanager('default');
......@@ -115,7 +117,9 @@ tic;
toc;
%%
t = opts.splitting.time_steps;
figure;
plot(t, out.ms);
title('Ranks of approximations over time');
\ No newline at end of file
if not(istest)
t = opts.splitting.time_steps;
figure;
plot(t, out.ms);
title('Ranks of approximations over time');
end
\ No newline at end of file
......@@ -61,7 +61,9 @@ narginchk(0,2);
if nargin==0
version = 'FO';
end
if nargin<2
istest=0;
end
format longe;
% set operation
oper = operatormanager('so_2');
......
......@@ -6,10 +6,10 @@ Matlab R2014a and above, or Octave 4.0 and above.
Some functions can benefit from the Control Systems Toolbox in either
of the above, but fallbacks exist in case it is not available.
Matlab R2017a has improved handling negative definite matrices with "\".
Matlab R2017a has improved handling negative definite matrices with "backslash".
We recommend using this version or later ones for optimal performance.
Note that Matlab R2017a R2017b contain a bug in "\" that can cause
Note that Matlab R2017a R2017b contain a bug in "backslash" that can cause
extraordinarily slow computations with certain block structured
matrices. Use spparms('usema57', 0); to fix this, or upgrade to at
least R2017b update 5.
......@@ -14,7 +14,7 @@
% constant terms, and low-rank solutions.
%
% Using the user supplied functions (usfs) framework,
% M-M.E.S.S. enables the solution of no equations for several
% M-M.E.S.S. enables the solution of equations for several
% system structures. While implicitly M-M.E.S.S. always treats a
% system
% .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment