Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[10959] trunk/octave-forge/main/control
|
From: <par...@us...> - 2012-09-04 09:09:58
|
Revision: 10959
http://octave.svn.sourceforge.net/octave/?rev=10959&view=rev
Author: paramaniac
Date: 2012-09-04 09:09:48 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
control: add underscores to slicot functions to emphasize their private nature
Modified Paths:
--------------
trunk/octave-forge/main/control/devel/bug_minreal.m
trunk/octave-forge/main/control/devel/test_ss2tf.m
trunk/octave-forge/main/control/devel/test_tf2ss.m
trunk/octave-forge/main/control/inst/@lti/c2d.m
trunk/octave-forge/main/control/inst/@lti/norm.m
trunk/octave-forge/main/control/inst/@lti/prescale.m
trunk/octave-forge/main/control/inst/@ss/__c2d__.m
trunk/octave-forge/main/control/inst/@ss/__d2c__.m
trunk/octave-forge/main/control/inst/@ss/__minreal__.m
trunk/octave-forge/main/control/inst/@ss/__prescale__.m
trunk/octave-forge/main/control/inst/@ss/__sys2tf__.m
trunk/octave-forge/main/control/inst/@ss/__zero__.m
trunk/octave-forge/main/control/inst/@tf/__sys2ss__.m
trunk/octave-forge/main/control/inst/__conred_sb16ad__.m
trunk/octave-forge/main/control/inst/__dss2ss__.m
trunk/octave-forge/main/control/inst/__modred_ab09id__.m
trunk/octave-forge/main/control/inst/__slicot_identification__.m
trunk/octave-forge/main/control/inst/arx.m
trunk/octave-forge/main/control/inst/bstmodred.m
trunk/octave-forge/main/control/inst/care.m
trunk/octave-forge/main/control/inst/cfconred.m
trunk/octave-forge/main/control/inst/ctrbf.m
trunk/octave-forge/main/control/inst/dare.m
trunk/octave-forge/main/control/inst/dlyap.m
trunk/octave-forge/main/control/inst/dlyapchol.m
trunk/octave-forge/main/control/inst/fitfrd.m
trunk/octave-forge/main/control/inst/fwcfconred.m
trunk/octave-forge/main/control/inst/h2syn.m
trunk/octave-forge/main/control/inst/hinfsyn.m
trunk/octave-forge/main/control/inst/hnamodred.m
trunk/octave-forge/main/control/inst/hsvd.m
trunk/octave-forge/main/control/inst/isctrb.m
trunk/octave-forge/main/control/inst/isstabilizable.m
trunk/octave-forge/main/control/inst/ltimodels.m
trunk/octave-forge/main/control/inst/lyap.m
trunk/octave-forge/main/control/inst/lyapchol.m
trunk/octave-forge/main/control/inst/ncfsyn.m
trunk/octave-forge/main/control/inst/place.m
trunk/octave-forge/main/control/src/Makefile
trunk/octave-forge/main/control/src/slab01od.cc
trunk/octave-forge/main/control/src/slab04md.cc
trunk/octave-forge/main/control/src/slab08nd.cc
trunk/octave-forge/main/control/src/slab09hd.cc
trunk/octave-forge/main/control/src/slab09id.cc
trunk/octave-forge/main/control/src/slab09jd.cc
trunk/octave-forge/main/control/src/slab13ad.cc
trunk/octave-forge/main/control/src/slab13bd.cc
trunk/octave-forge/main/control/src/slab13dd.cc
trunk/octave-forge/main/control/src/slag08bd.cc
trunk/octave-forge/main/control/src/slib01ad.cc
trunk/octave-forge/main/control/src/slib01cd.cc
trunk/octave-forge/main/control/src/slident.cc
trunk/octave-forge/main/control/src/slsb01bd.cc
trunk/octave-forge/main/control/src/slsb02od.cc
trunk/octave-forge/main/control/src/slsb03md.cc
trunk/octave-forge/main/control/src/slsb03od.cc
trunk/octave-forge/main/control/src/slsb04md.cc
trunk/octave-forge/main/control/src/slsb04qd.cc
trunk/octave-forge/main/control/src/slsb10dd.cc
trunk/octave-forge/main/control/src/slsb10ed.cc
trunk/octave-forge/main/control/src/slsb10fd.cc
trunk/octave-forge/main/control/src/slsb10hd.cc
trunk/octave-forge/main/control/src/slsb10id.cc
trunk/octave-forge/main/control/src/slsb10jd.cc
trunk/octave-forge/main/control/src/slsb10kd.cc
trunk/octave-forge/main/control/src/slsb10yd.cc
trunk/octave-forge/main/control/src/slsb10zd.cc
trunk/octave-forge/main/control/src/slsb16ad.cc
trunk/octave-forge/main/control/src/slsb16bd.cc
trunk/octave-forge/main/control/src/slsb16cd.cc
trunk/octave-forge/main/control/src/slsg02ad.cc
trunk/octave-forge/main/control/src/slsg03ad.cc
trunk/octave-forge/main/control/src/slsg03bd.cc
trunk/octave-forge/main/control/src/sltb01id.cc
trunk/octave-forge/main/control/src/sltb01pd.cc
trunk/octave-forge/main/control/src/sltb01ud.cc
trunk/octave-forge/main/control/src/sltb04bd.cc
trunk/octave-forge/main/control/src/sltd04ad.cc
trunk/octave-forge/main/control/src/sltg01ad.cc
trunk/octave-forge/main/control/src/sltg01hd.cc
trunk/octave-forge/main/control/src/sltg01id.cc
trunk/octave-forge/main/control/src/sltg01jd.cc
trunk/octave-forge/main/control/src/sltg04bx.cc
Added Paths:
-----------
trunk/octave-forge/main/control/src/__control_slicot_functions__.cc
Removed Paths:
-------------
trunk/octave-forge/main/control/src/control_slicot_functions.cc
Modified: trunk/octave-forge/main/control/devel/bug_minreal.m
===================================================================
--- trunk/octave-forge/main/control/devel/bug_minreal.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/devel/bug_minreal.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -4,7 +4,7 @@
%{
** On entry to TG01JD parameter number 20 had an illegal value
-error: sltg01jd: exception encountered in Fortran subroutine tg01jd_
+error: __sl_tg01jd__: exception encountered in Fortran subroutine tg01jd_
error: called from:
error: /Users/lukas/control/inst/@ss/__minreal__.m at line 39, column 19
error: /Users/lukas/control/inst/@lti/minreal.m at line 38, column 7
Modified: trunk/octave-forge/main/control/devel/test_ss2tf.m
===================================================================
--- trunk/octave-forge/main/control/devel/test_ss2tf.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/devel/test_ss2tf.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -14,7 +14,7 @@
[p, m] = size (d);
md = 4
-[gn, gd, ign, igd] = sltb04bd (a, b, c, d)
+[gn, gd, ign, igd] = __sl_tb04bd__ (a, b, c, d)
num = reshape (gn, md, p, m)
den = reshape (gd, md, p, m)
@@ -53,7 +53,7 @@
%num = gn(1:ign+1)
%den = gd(1:igd+1)
%{
-[gn, gd, ign, igd] = sltb04bd (-2, 3, 4, 5)
+[gn, gd, ign, igd] = __sl_tb04bd__ (-2, 3, 4, 5)
% for i = 1 : size (gn, 1)
@@ -68,16 +68,16 @@
S = ss (P);
-[num, den, ign, igd] = sltb04bd (S.a, S.b, S.c, S.d)
+[num, den, ign, igd] = __sl_tb04bd__ (S.a, S.b, S.c, S.d)
P
-[num, den, ign, igd] = sltb04bd (0, 1, 1, 0)
+[num, den, ign, igd] = __sl_tb04bd__ (0, 1, 1, 0)
sys = WestlandLynx;
-[num, den, ign, igd] = sltb04bd (sys.a, sys.b, sys.c, sys.d);
+[num, den, ign, igd] = __sl_tb04bd__ (sys.a, sys.b, sys.c, sys.d);
%}
Modified: trunk/octave-forge/main/control/devel/test_tf2ss.m
===================================================================
--- trunk/octave-forge/main/control/devel/test_tf2ss.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/devel/test_tf2ss.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -15,5 +15,5 @@
ucoeff(2,1,:) = u21;
ucoeff(2,2,:) = u22;
-[a, b, c, d] = sltd04ad (ucoeff, dcoeff, index, 0)
+[a, b, c, d] = __sl_td04ad__ (ucoeff, dcoeff, index, 0)
Modified: trunk/octave-forge/main/control/inst/@lti/c2d.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/c2d.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/@lti/c2d.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -98,7 +98,7 @@
%! D = [ 1.0 0.0
%! 0.0 -1.0 ].';
%!
-%! [Ao, Bo, Co, Do] = slab04md (A, B, C, D, 1.0, 1.0, false);
+%! [Ao, Bo, Co, Do] = __sl_ab04md__ (A, B, C, D, 1.0, 1.0, false);
%!
%! Ae = [ -1.0000 -4.0000
%! -4.0000 -1.0000 ];
Modified: trunk/octave-forge/main/control/inst/@lti/norm.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/norm.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/@lti/norm.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -72,7 +72,7 @@
if (! discrete && any (d(:))) # continuous and non-zero feedthrough
gain = inf;
else
- gain = slab13bd (a, b, c, d, discrete);
+ gain = __sl_ab13bd__ (a, b, c, d, discrete);
endif
else
gain = inf;
@@ -88,14 +88,14 @@
tol = max (tol, 100*eps);
if (isempty (e))
- [fpeak, gpeak] = slab13dd (a, a, b, c, d, discrete, false, tol, scaled); # TODO: avoid dummy argument
+ [fpeak, gpeak] = __sl_ab13dd__ (a, a, b, c, d, discrete, false, tol, scaled); # TODO: avoid dummy argument
else
if (rcond (e) < eps)
gain = inf;
wpeak = inf;
return;
else
- [fpeak, gpeak] = slab13dd (a, e, b, c, d, discrete, true, tol, scaled);
+ [fpeak, gpeak] = __sl_ab13dd__ (a, e, b, c, d, discrete, true, tol, scaled);
endif
endif
Modified: trunk/octave-forge/main/control/inst/@lti/prescale.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/prescale.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/@lti/prescale.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -103,7 +103,7 @@
%!
%! MAXRED = 0.0;
%!
-%! [Ao, Bo, Co, MAXREDo, SCALEo] = sltb01id (A, B, C, MAXRED);
+%! [Ao, Bo, Co, MAXREDo, SCALEo] = __sl_tb01id__ (A, B, C, MAXRED);
%!
%! Ae = [ 0.0000000D+00 0.1000000D+05 0.0000000D+00 0.0000000D+00 0.0000000D+00
%! -0.1580000D+03 -0.1257000D+04 0.0000000D+00 0.0000000D+00 0.0000000D+00
@@ -156,7 +156,7 @@
%!
%! TRESH = 0.0;
%!
-%! [Ao, Eo, Bo, Co, LSCALEo, RSCALEo] = sltg01ad (A, E, B, C, TRESH);
+%! [Ao, Eo, Bo, Co, LSCALEo, RSCALEo] = __sl_tg01ad__ (A, E, B, C, TRESH);
%!
%! Ae = [ -1.0000 0.0000 0.0000 0.3000
%! 0.0000 0.0000 1.0000 2.0000
Modified: trunk/octave-forge/main/control/inst/@ss/__c2d__.m
===================================================================
--- trunk/octave-forge/main/control/inst/@ss/__c2d__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/@ss/__c2d__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -40,7 +40,7 @@
beta = 2/tsam;
endif
if (isempty (sys.e))
- [sys.a, sys.b, sys.c, sys.d] = slab04md (sys.a, sys.b, sys.c, sys.d, 1, beta, false);
+ [sys.a, sys.b, sys.c, sys.d] = __sl_ab04md__ (sys.a, sys.b, sys.c, sys.d, 1, beta, false);
else
[sys.a, sys.b, sys.c, sys.d, sys.e] = __dss_bilin__ (sys.a, sys.b, sys.c, sys.d, sys.e, beta, false);
endif
Modified: trunk/octave-forge/main/control/inst/@ss/__d2c__.m
===================================================================
--- trunk/octave-forge/main/control/inst/@ss/__d2c__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/@ss/__d2c__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -42,7 +42,7 @@
beta = 2/tsam;
endif
if (isempty (sys.e))
- [sys.a, sys.b, sys.c, sys.d] = slab04md (sys.a, sys.b, sys.c, sys.d, 1, beta, true);
+ [sys.a, sys.b, sys.c, sys.d] = __sl_ab04md__ (sys.a, sys.b, sys.c, sys.d, 1, beta, true);
else
[sys.a, sys.b, sys.c, sys.d, sys.e] = __dss_bilin__ (sys.a, sys.b, sys.c, sys.d, sys.e, beta, true);
endif
Modified: trunk/octave-forge/main/control/inst/@ss/__minreal__.m
===================================================================
--- trunk/octave-forge/main/control/inst/@ss/__minreal__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/@ss/__minreal__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -33,10 +33,10 @@
endif
if (isempty (sys.e))
- [a, b, c] = sltb01pd (sys.a, sys.b, sys.c, tol, sys.scaled);
+ [a, b, c] = __sl_tb01pd__ (sys.a, sys.b, sys.c, tol, sys.scaled);
retsys = ss (a, b, c, sys.d);
else
- [a, e, b, c] = sltg01jd (sys.a, sys.e, sys.b, sys.c, tol, sys.scaled, 0, 0);
+ [a, e, b, c] = __sl_tg01jd__ (sys.a, sys.e, sys.b, sys.c, tol, sys.scaled, 0, 0);
retsys = dss (a, b, c, sys.d, e);
endif
Modified: trunk/octave-forge/main/control/inst/@ss/__prescale__.m
===================================================================
--- trunk/octave-forge/main/control/inst/@ss/__prescale__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/@ss/__prescale__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -27,12 +27,12 @@
function [retsys, lscale, rscale] = __prescale__ (sys, optarg = 0.0)
if (isempty (sys.e))
- [a, b, c, ~, scale] = sltb01id (sys.a, sys.b, sys.c, optarg);
+ [a, b, c, ~, scale] = __sl_tb01id__ (sys.a, sys.b, sys.c, optarg);
retsys = ss (a, b, c, sys.d);
lscale = scale.^-1;
rscale = scale;
else
- [a, e, b, c, lscale, rscale] = sltg01ad (sys.a, sys.e, sys.b, sys.c, optarg);
+ [a, e, b, c, lscale, rscale] = __sl_tg01ad__ (sys.a, sys.e, sys.b, sys.c, optarg);
retsys = dss (a, b, c, sys.d, e);
endif
Modified: trunk/octave-forge/main/control/inst/@ss/__sys2tf__.m
===================================================================
--- trunk/octave-forge/main/control/inst/@ss/__sys2tf__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/@ss/__sys2tf__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -27,7 +27,7 @@
try
[a, b, c, d, tsam, scaled] = ssdata (sys); # system could be a descriptor model
- [num, den, ign, igd, md, p, m] = sltb04bd (a, b, c, d, scaled);
+ [num, den, ign, igd, md, p, m] = __sl_tb04bd__ (a, b, c, d, scaled);
num = reshape (num, md, p, m);
den = reshape (den, md, p, m);
Modified: trunk/octave-forge/main/control/inst/@ss/__zero__.m
===================================================================
--- trunk/octave-forge/main/control/inst/@ss/__zero__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/@ss/__zero__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -27,12 +27,12 @@
function [zer, gain] = __zero__ (sys, argc)
if (isempty (sys.e))
- [zer, gain] = slab08nd (sys.a, sys.b, sys.c, sys.d, sys.scaled);
+ [zer, gain] = __sl_ab08nd__ (sys.a, sys.b, sys.c, sys.d, sys.scaled);
else
- zer = slag08bd (sys.a, sys.e, sys.b, sys.c, sys.d, sys.scaled);
+ zer = __sl_ag08bd__ (sys.a, sys.e, sys.b, sys.c, sys.d, sys.scaled);
if (argc > 1 && issiso (sys))
pol = pole (sys);
- gain = sltg04bx (sys.a, sys.e, sys.b, sys.c, sys.d, \
+ gain = __sl_tg04bx__ (sys.a, sys.e, sys.b, sys.c, sys.d, \
real (pol), imag (pol), real (zer), imag (zer));
else
gain = [];
Modified: trunk/octave-forge/main/control/inst/@tf/__sys2ss__.m
===================================================================
--- trunk/octave-forge/main/control/inst/@tf/__sys2ss__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/@tf/__sys2ss__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -123,7 +123,7 @@
endfor
tol = min (sqrt (eps), eps*prod (index));
- [a, b, c, d] = sltd04ad (ucoeff, dcoeff, index, tol);
+ [a, b, c, d] = __sl_td04ad__ (ucoeff, dcoeff, index, tol);
endfunction
@@ -144,7 +144,7 @@
c2 = horzcat (zeros (p, p*(max_len_numq-1)), -eye (p));
## remove uncontrollable part
- [a2, e2, b2, c2] = sltg01jd (a2, e2, b2, c2, 0.0, true, 1, 2);
+ [a2, e2, b2, c2] = __sl_tg01jd__ (a2, e2, b2, c2, 0.0, true, 1, 2);
endfunction
Modified: trunk/octave-forge/main/control/inst/__conred_sb16ad__.m
===================================================================
--- trunk/octave-forge/main/control/inst/__conred_sb16ad__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/__conred_sb16ad__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -169,9 +169,9 @@
## perform model order reduction
- [acr, bcr, ccr, dcr, ncr, hsvc, ncs] = slsb16ad (a, b, c, d, dt, equil, ncr, ordsel, alpha, jobmr, \
- ac, bc, cc, dc, \
- weight, jobc, jobo, tol1, tol2);
+ [acr, bcr, ccr, dcr, ncr, hsvc, ncs] = __sl_sb16ad__ (a, b, c, d, dt, equil, ncr, ordsel, alpha, jobmr, \
+ ac, bc, cc, dc, \
+ weight, jobc, jobo, tol1, tol2);
## assemble reduced order controller
Kr = ss (acr, bcr, ccr, dcr, tsamc);
Modified: trunk/octave-forge/main/control/inst/__dss2ss__.m
===================================================================
--- trunk/octave-forge/main/control/inst/__dss2ss__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/__dss2ss__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -29,7 +29,7 @@
elseif (rcond (e) < eps) # check for singularity
error ("ss: dss2ss: descriptor matrice 'e' singular");
else
- [a, b, c, d] = slsb10jd (a, b, c, d, e);
+ [a, b, c, d] = __sl_sb10jd__ (a, b, c, d, e);
e = [];
endif
Modified: trunk/octave-forge/main/control/inst/__modred_ab09id__.m
===================================================================
--- trunk/octave-forge/main/control/inst/__modred_ab09id__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/__modred_ab09id__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -159,7 +159,7 @@
## perform model order reduction
- [ar, br, cr, dr, nr, hsv, ns] = slab09id (a, b, c, d, dt, equil, nr, ordsel, alpha, job, \
+ [ar, br, cr, dr, nr, hsv, ns] = __sl_ab09id__ (a, b, c, d, dt, equil, nr, ordsel, alpha, job, \
av, bv, cv, dv, \
aw, bw, cw, dw, \
weight, jobc, jobo, alphac, alphao, \
Modified: trunk/octave-forge/main/control/inst/__slicot_identification__.m
===================================================================
--- trunk/octave-forge/main/control/inst/__slicot_identification__.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/__slicot_identification__.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -153,7 +153,7 @@
if (nout == 0)
## compute singular values
- [sv, nrec] = slib01ad (dat.y, dat.u, nobr, n, meth, alg, conct, ctrl, rcond, tol);
+ [sv, nrec] = __sl_ib01ad__ (dat.y, dat.u, nobr, n, meth, alg, conct, ctrl, rcond, tol);
## there is no 'logbar' function
svl = log10 (sv);
@@ -170,7 +170,7 @@
grid on
else
## perform system identification
- [a, b, c, d, q, ry, s, k, x0] = slident (dat.y, dat.u, nobr, n, meth, alg, conct, ctrl, rcond, tol);
+ [a, b, c, d, q, ry, s, k, x0] = __sl_ident__ (dat.y, dat.u, nobr, n, meth, alg, conct, ctrl, rcond, tol);
## compute noise variance matrix factor L
## L L' = Ry, e = L v
Modified: trunk/octave-forge/main/control/inst/arx.m
===================================================================
--- trunk/octave-forge/main/control/inst/arx.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/arx.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -228,7 +228,7 @@
## this makes only sense for state-space models, therefore convert TF to SS
if (nargout > 1)
sys = prescale (ss (sys(:,1:m)));
- x0 = slib01cd (Y, U, sys.a, sys.b, sys.c, sys.d, 0.0);
+ x0 = __sl_ib01cd__ (Y, U, sys.a, sys.b, sys.c, sys.d, 0.0);
## return x0 as vector for single-experiment data
## instead of a cell containing one vector
if (numel (x0) == 1)
Modified: trunk/octave-forge/main/control/inst/bstmodred.m
===================================================================
--- trunk/octave-forge/main/control/inst/bstmodred.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/bstmodred.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -278,7 +278,7 @@
endfor
## perform model order reduction
- [ar, br, cr, dr, nr, hsv, ns] = slab09hd (a, b, c, d, dt, scaled, job, nr, ordsel, alpha, beta, \
+ [ar, br, cr, dr, nr, hsv, ns] = __sl_ab09hd__ (a, b, c, d, dt, scaled, job, nr, ordsel, alpha, beta, \
tol1, tol2);
## assemble reduced order model
Modified: trunk/octave-forge/main/control/inst/care.m
===================================================================
--- trunk/octave-forge/main/control/inst/care.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/care.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -159,18 +159,18 @@
## solve the riccati equation
if (isempty (e))
if (isempty (s))
- [x, l] = slsb02od (a, b, q, r, b, false, false);
+ [x, l] = __sl_sb02od__ (a, b, q, r, b, false, false);
g = r \ (b.'*x); # gain matrix
else
- [x, l] = slsb02od (a, b, q, r, s, false, true);
+ [x, l] = __sl_sb02od__ (a, b, q, r, s, false, true);
g = r \ (b.'*x + s.'); # gain matrix
endif
else
if (isempty (s))
- [x, l] = slsg02ad (a, e, b, q, r, b, false, false);
+ [x, l] = __sl_sg02ad__ (a, e, b, q, r, b, false, false);
g = r \ (b.'*x*e); # gain matrix
else
- [x, l] = slsg02ad (a, e, b, q, r, s, false, true);
+ [x, l] = __sl_sg02ad__ (a, e, b, q, r, s, false, true);
g = r \ (b.'*x*e + s.'); # gain matrix
endif
endif
Modified: trunk/octave-forge/main/control/inst/cfconred.m
===================================================================
--- trunk/octave-forge/main/control/inst/cfconred.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/cfconred.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -260,8 +260,8 @@
endif
## perform model order reduction
- [acr, bcr, ccr, dcr, ncr, hsv] = slsb16bd (a, b, c, d, dt, equil, ncr, ordsel, jobd, jobmr, \
- F, L, jobcf, tol1, tol2);
+ [acr, bcr, ccr, dcr, ncr, hsv] = __sl_sb16bd__ (a, b, c, d, dt, equil, ncr, ordsel, jobd, jobmr, \
+ F, L, jobcf, tol1, tol2);
## assemble reduced order controller
Kr = ss (acr, bcr, ccr, dcr, tsam);
Modified: trunk/octave-forge/main/control/inst/ctrbf.m
===================================================================
--- trunk/octave-forge/main/control/inst/ctrbf.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/ctrbf.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -80,7 +80,7 @@
error ("ctrbf: tol must be a real scalar");
endif
- [ac, bc, cc, z, ncont] = sltb01ud (a, b, c, tol);
+ [ac, bc, cc, z, ncont] = __sl_tb01ud__ (a, b, c, tol);
if (islti)
ac = set (sys, "a", ac, "b", bc, "c", cc, "scaled", false);
Modified: trunk/octave-forge/main/control/inst/dare.m
===================================================================
--- trunk/octave-forge/main/control/inst/dare.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/dare.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -159,18 +159,18 @@
## solve the riccati equation
if (isempty (e))
if (isempty (s))
- [x, l] = slsb02od (a, b, q, r, b, true, false);
+ [x, l] = __sl_sb02od__ (a, b, q, r, b, true, false);
g = (r + b.'*x*b) \ (b.'*x*a); # gain matrix
else
- [x, l] = slsb02od (a, b, q, r, s, true, true);
+ [x, l] = __sl_sb02od__ (a, b, q, r, s, true, true);
g = (r + b.'*x*b) \ (b.'*x*a + s.'); # gain matrix
endif
else
if (isempty (s))
- [x, l] = slsg02ad (a, e, b, q, r, b, true, false);
+ [x, l] = __sl_sg02ad__ (a, e, b, q, r, b, true, false);
g = (r + b.'*x*b) \ (b.'*x*a); # gain matrix
else
- [x, l] = slsg02ad (a, e, b, q, r, s, true, true);
+ [x, l] = __sl_sg02ad__ (a, e, b, q, r, s, true, true);
g = (r + b.'*x*b) \ (b.'*x*a + s.'); # gain matrix
endif
endif
Modified: trunk/octave-forge/main/control/inst/dlyap.m
===================================================================
--- trunk/octave-forge/main/control/inst/dlyap.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/dlyap.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -62,7 +62,7 @@
inputname (1), inputname (2));
endif
- [x, scale] = slsb03md (a, -b, true); # AXA' - X = -B
+ [x, scale] = __sl_sb03md__ (a, -b, true); # AXA' - X = -B
## x /= scale; # 0 < scale <= 1
@@ -80,7 +80,7 @@
rows (a), columns (b), inputname (3));
endif
- x = slsb04qd (-a, b, c); # AXB' - X = -C
+ x = __sl_sb04qd__ (-a, b, c); # AXB' - X = -C
case 4 # generalized Lyapunov equation
@@ -106,7 +106,7 @@
inputname (2));
endif
- [x, scale] = slsg03ad (a, e, -b, true); # AXA' - EXE' = -B
+ [x, scale] = __sl_sg03ad__ (a, e, -b, true); # AXA' - EXE' = -B
## x /= scale; # 0 < scale <= 1
Modified: trunk/octave-forge/main/control/inst/dlyapchol.m
===================================================================
--- trunk/octave-forge/main/control/inst/dlyapchol.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/dlyapchol.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -63,7 +63,7 @@
inputname (1), inputname (2));
endif
- [u, scale] = slsb03od (a.', b.', true);
+ [u, scale] = __sl_sb03od__ (a.', b.', true);
## NOTE: TRANS = 'T' not suitable because we need U' U, not U U'
@@ -87,7 +87,7 @@
inputname (1), inputname (2), inputname (3));
endif
- [u, scale] = slsg03bd (a.', e.', b.', true);
+ [u, scale] = __sl_sg03bd__ (a.', e.', b.', true);
## NOTE: TRANS = 'T' not suitable because we need U' U, not U U'
Modified: trunk/octave-forge/main/control/inst/fitfrd.m
===================================================================
--- trunk/octave-forge/main/control/inst/fitfrd.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/fitfrd.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -81,7 +81,7 @@
error ("fitfrd: require n <= length (dat.w)");
endif
- [a, b, c, d, n] = slsb10yd (real (H), imag (H), w, n, dt, logical (flag));
+ [a, b, c, d, n] = __sl_sb10yd__ (real (H), imag (H), w, n, dt, logical (flag));
sys = ss (a, b, c, d, tsam);
Modified: trunk/octave-forge/main/control/inst/fwcfconred.m
===================================================================
--- trunk/octave-forge/main/control/inst/fwcfconred.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/fwcfconred.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -225,8 +225,8 @@
endif
## perform model order reduction
- [acr, bcr, ccr, ncr, hsv] = slsb16cd (a, b, c, d, dt, ncr, ordsel, jobd, jobmr, \
- F, L, jobcf, tol1);
+ [acr, bcr, ccr, ncr, hsv] = __sl_sb16cd__ (a, b, c, d, dt, ncr, ordsel, jobd, jobmr, \
+ F, L, jobcf, tol1);
## assemble reduced order controller
Kr = ss (acr, bcr, ccr, [], tsam);
Modified: trunk/octave-forge/main/control/inst/h2syn.m
===================================================================
--- trunk/octave-forge/main/control/inst/h2syn.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/h2syn.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -129,9 +129,9 @@
## H-2 synthesis
if (isct (P)) # continuous plant
- [ak, bk, ck, dk, rcond] = slsb10hd (a, b, c, d, ncon, nmeas);
+ [ak, bk, ck, dk, rcond] = __sl_sb10hd__ (a, b, c, d, ncon, nmeas);
else # discrete plant
- [ak, bk, ck, dk, rcond] = slsb10ed (a, b, c, d, ncon, nmeas);
+ [ak, bk, ck, dk, rcond] = __sl_sb10ed__ (a, b, c, d, ncon, nmeas);
endif
## controller
Modified: trunk/octave-forge/main/control/inst/hinfsyn.m
===================================================================
--- trunk/octave-forge/main/control/inst/hinfsyn.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/hinfsyn.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -132,9 +132,9 @@
## H-infinity synthesis
if (isct (P)) # continuous plant
- [ak, bk, ck, dk, rcond] = slsb10fd (a, b, c, d, ncon, nmeas, gmax);
+ [ak, bk, ck, dk, rcond] = __sl_sb10fd__ (a, b, c, d, ncon, nmeas, gmax);
else # discrete plant
- [ak, bk, ck, dk, rcond] = slsb10dd (a, b, c, d, ncon, nmeas, gmax);
+ [ak, bk, ck, dk, rcond] = __sl_sb10dd__ (a, b, c, d, ncon, nmeas, gmax);
endif
## controller
Modified: trunk/octave-forge/main/control/inst/hnamodred.m
===================================================================
--- trunk/octave-forge/main/control/inst/hnamodred.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/hnamodred.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -394,7 +394,7 @@
## perform model order reduction
- [ar, br, cr, dr, nr, hsv, ns] = slab09jd (a, b, c, d, dt, scaled, nr, ordsel, alpha, \
+ [ar, br, cr, dr, nr, hsv, ns] = __sl_ab09jd__ (a, b, c, d, dt, scaled, nr, ordsel, alpha, \
jobv, av, bv, cv, dv, \
jobw, aw, bw, cw, dw, \
jobinv, tol1, tol2);
Modified: trunk/octave-forge/main/control/inst/hsvd.m
===================================================================
--- trunk/octave-forge/main/control/inst/hsvd.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/hsvd.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -62,7 +62,7 @@
error ("hsvd: second argument invalid");
endswitch
- [hsv, ns] = slab13ad (a, b, c, discrete, alpha, scaled);
+ [hsv, ns] = __sl_ab13ad__ (a, b, c, discrete, alpha, scaled);
if (nargout)
hsv_r = hsv;
Modified: trunk/octave-forge/main/control/inst/isctrb.m
===================================================================
--- trunk/octave-forge/main/control/inst/isctrb.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/isctrb.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -89,9 +89,9 @@
endif
if (isempty (e))
- [~, ~, ~, ncont] = slab01od (a, b, tol);
+ [~, ~, ~, ncont] = __sl_ab01od__ (a, b, tol);
else
- [~, ~, ~, ~, ~, ~, ncont] = sltg01hd (a, e, b, zeros (1, columns (a)), tol);
+ [~, ~, ~, ~, ~, ~, ncont] = __sl_tg01hd__ (a, e, b, zeros (1, columns (a)), tol);
endif
bool = (ncont == rows (a));
Modified: trunk/octave-forge/main/control/inst/isstabilizable.m
===================================================================
--- trunk/octave-forge/main/control/inst/isstabilizable.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/isstabilizable.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -103,7 +103,7 @@
if (isempty (e))
## controllability staircase form
- [ac, ~, ~, ncont] = slab01od (a, b, tol);
+ [ac, ~, ~, ncont] = __sl_ab01od__ (a, b, tol);
## extract uncontrollable part of staircase form
uncont_idx = ncont+1 : rows (a);
@@ -113,7 +113,7 @@
pol = eig (auncont);
else
## controllability staircase form - output matrix c has no influence
- [ac, ec, ~, ~, ~, ~, ncont] = sltg01hd (a, e, b, zeros (1, columns (a)), tol);
+ [ac, ec, ~, ~, ~, ~, ncont] = __sl_tg01hd__ (a, e, b, zeros (1, columns (a)), tol);
## extract uncontrollable part of staircase form
uncont_idx = ncont+1 : rows (a);
Modified: trunk/octave-forge/main/control/inst/ltimodels.m
===================================================================
--- trunk/octave-forge/main/control/inst/ltimodels.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/ltimodels.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -128,7 +128,7 @@
%! A = A.'; # There's a little mistake in the example
%! # program of routine AB01OD in SLICOT 5.0
%!
-%! [Ac, Bc, U, ncont] = slab01od (A, B, tol);
+%! [Ac, Bc, U, ncont] = __sl_ab01od__ (A, B, tol);
%!
%! Ace = [ 12.8848 3.2345 11.8211 3.3758 -0.8982
%! 4.4741 -12.5544 5.3509 5.9403 1.4360
@@ -178,7 +178,7 @@
%!
%! tol = 0;
%!
-%! [ac, ec, bc, cc, q, z, ncont] = sltg01hd (a, e, b, c, tol);
+%! [ac, ec, bc, cc, q, z, ncont] = __sl_tg01hd__ (a, e, b, c, tol);
%!
%! ncont_e = 3;
%!
@@ -267,7 +267,7 @@
%!
%! tol = 0;
%!
-%! [ao, eo, bo, co, q, z, nobsv] = sltg01id (a, e, b, c, tol);
+%! [ao, eo, bo, co, q, z, nobsv] = __sl_tg01id__ (a, e, b, c, tol);
%!
%! nobsv_e = 3;
%!
@@ -391,7 +391,7 @@
%! UCOEFF(2,1,:) = u21;
%! UCOEFF(2,2,:) = u22;
%!
-%! [Ao, Bo, Co, Do] = sltd04ad (UCOEFF, DCOEFF, INDEX, 0);
+%! [Ao, Bo, Co, Do] = __sl_td04ad__ (UCOEFF, DCOEFF, INDEX, 0);
%!
%! Ae = [ 0.5000 -0.8028 0.9387
%! 4.4047 -2.3380 2.5076
Modified: trunk/octave-forge/main/control/inst/lyap.m
===================================================================
--- trunk/octave-forge/main/control/inst/lyap.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/lyap.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -63,7 +63,7 @@
endif
- [x, scale] = slsb03md (a, -b, false); # AX + XA' = -B
+ [x, scale] = __sl_sb03md__ (a, -b, false); # AX + XA' = -B
## x /= scale; # 0 < scale <= 1
@@ -81,7 +81,7 @@
rows (a), columns (b), inputname (3));
endif
- x = slsb04md (a, b, -c); # AX + XB = -C
+ x = __sl_sb04md__ (a, b, -c); # AX + XB = -C
case 4 # generalized Lyapunov equation
@@ -107,7 +107,7 @@
inputname (2));
endif
- [x, scale] = slsg03ad (a, e, -b, false); # AXE' + EXA' = -B
+ [x, scale] = __sl_sg03ad__ (a, e, -b, false); # AXE' + EXA' = -B
## x /= scale; # 0 < scale <= 1
Modified: trunk/octave-forge/main/control/inst/lyapchol.m
===================================================================
--- trunk/octave-forge/main/control/inst/lyapchol.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/lyapchol.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -63,7 +63,7 @@
inputname (1), inputname (2));
endif
- [u, scale] = slsb03od (a.', b.', false);
+ [u, scale] = __sl_sb03od__ (a.', b.', false);
## NOTE: TRANS = 'T' not suitable because we need U' U, not U U'
@@ -87,7 +87,7 @@
inputname (1), inputname (2), inputname (3));
endif
- [u, scale] = slsg03bd (a.', e.', b.', false);
+ [u, scale] = __sl_sg03bd__ (a.', e.', b.', false);
## NOTE: TRANS = 'T' not suitable because we need U' U, not U U'
Modified: trunk/octave-forge/main/control/inst/ncfsyn.m
===================================================================
--- trunk/octave-forge/main/control/inst/ncfsyn.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/ncfsyn.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -110,11 +110,11 @@
## synthesis
if (isct (Gs)) # continuous-time
- [ak, bk, ck, dk, rcond] = slsb10id (a, b, c, d, factor);
+ [ak, bk, ck, dk, rcond] = __sl_sb10id__ (a, b, c, d, factor);
elseif (any (d(:))) # discrete-time, d != 0
- [ak, bk, ck, dk, rcond] = slsb10zd (a, b, c, d, factor, 0.0);
+ [ak, bk, ck, dk, rcond] = __sl_sb10zd__ (a, b, c, d, factor, 0.0);
else # discrete-time, d == 0
- [ak, bk, ck, dk, rcond] = slsb10kd (a, b, c, factor);
+ [ak, bk, ck, dk, rcond] = __sl_sb10kd__ (a, b, c, factor);
endif
## controller
@@ -198,7 +198,7 @@
%!
%! FACTOR = 1.0;
%!
-%! [AK, BK, CK, DK, RCOND] = slsb10id (A, B, C, D, FACTOR);
+%! [AK, BK, CK, DK, RCOND] = __sl_sb10id__ (A, B, C, D, FACTOR);
%!
%! AKe = [ -39.0671 9.9293 22.2322 -27.4113 43.8655
%! -6.6117 3.0006 11.0878 -11.4130 15.4269
@@ -304,7 +304,7 @@
%!
%! FACTOR = 1.1;
%!
-%! [AK, BK, CK, DK, RCOND] = slsb10kd (A, B, C, FACTOR);
+%! [AK, BK, CK, DK, RCOND] = __sl_sb10kd__ (A, B, C, FACTOR);
%!
%! AKe = [ 0.0337 0.0222 0.0858 0.1264 -0.1872 0.1547
%! 0.4457 0.0668 -0.2255 -0.3204 -0.4548 -0.0691
@@ -414,7 +414,7 @@
%!
%! FACTOR = 1.1;
%!
-%! [AK, BK, CK, DK, RCOND] = slsb10zd (A, B, C, D, FACTOR, 0.0);
+%! [AK, BK, CK, DK, RCOND] = __sl_sb10zd__ (A, B, C, D, FACTOR, 0.0);
%!
%! AKe = [ 1.0128 0.5101 -0.1546 1.1300 3.3759 0.4911
%! -2.1257 -1.4517 -0.4486 0.3493 -1.5506 -1.4296
Modified: trunk/octave-forge/main/control/inst/place.m
===================================================================
--- trunk/octave-forge/main/control/inst/place.m 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/inst/place.m 2012-09-04 09:09:48 UTC (rev 10959)
@@ -136,7 +136,7 @@
tol = 0;
endif
- [f, nfp, nap, nup, z] = slsb01bd (a, b, wr, wi, discrete, alpha, tol);
+ [f, nfp, nap, nup, z] = __sl_sb01bd__ (a, b, wr, wi, discrete, alpha, tol);
f = -f; # A + B*F --> A - B*F
info = struct ("nfp", nfp, "nap", nap, "nup", nup, "z", z);
Modified: trunk/octave-forge/main/control/src/Makefile
===================================================================
--- trunk/octave-forge/main/control/src/Makefile 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/Makefile 2012-09-04 09:09:48 UTC (rev 10959)
@@ -11,7 +11,7 @@
endif
LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
-all: control_slicot_functions.oct \
+all: __control_slicot_functions__.oct \
is_real_scalar.oct \
is_real_vector.oct \
is_real_matrix.oct \
@@ -35,9 +35,9 @@
rm -rf *.o *.f slicot
# slicot functions
-control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a
+__control_slicot_functions__.oct: __control_slicot_functions__.cc slicotlibrary.a
LFLAGS="$(LFLAGS)" \
- $(MKOCTFILE) control_slicot_functions.cc common.cc slicotlibrary.a
+ $(MKOCTFILE) __control_slicot_functions__.cc common.cc slicotlibrary.a
# helpers
is_real_scalar.oct: is_real_scalar.cc
Copied: trunk/octave-forge/main/control/src/__control_slicot_functions__.cc (from rev 10958, trunk/octave-forge/main/control/src/control_slicot_functions.cc)
===================================================================
--- trunk/octave-forge/main/control/src/__control_slicot_functions__.cc (rev 0)
+++ trunk/octave-forge/main/control/src/__control_slicot_functions__.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -0,0 +1,58 @@
+#include "slab08nd.cc" // transmission zeros of state-space models
+#include "slab13dd.cc" // L-infinity norm
+#include "slsb10hd.cc" // H-2 controller synthesis - continuous-time
+#include "slsb10ed.cc" // H-2 controller synthesis - discrete-time
+#include "slab13bd.cc" // H-2 norm
+#include "slsb01bd.cc" // Pole assignment
+#include "slsb10fd.cc" // H-infinity controller synthesis - continuous-time
+#include "slsb10dd.cc" // H-infinity controller synthesis - discrete-time
+#include "slsb03md.cc" // Lyapunov equations
+#include "slsb04md.cc" // Sylvester equations - continuous-time
+#include "slsb04qd.cc" // Sylvester equations - discrete-time
+#include "slsg03ad.cc" // generalized Lyapunov equations
+#include "slsb02od.cc" // algebraic Riccati equations
+#include "slab13ad.cc" // Hankel singular values
+#include "slab01od.cc" // staircase form using orthogonal transformations
+#include "sltb01pd.cc" // minimal realization of state-space models
+#include "slsb03od.cc" // Cholesky factor of Lyapunov equations
+#include "slsg03bd.cc" // Cholesky factor of generalized Lyapunov equations
+#include "slag08bd.cc" // transmission zeros of descriptor state-space models
+#include "sltg01jd.cc" // minimal realization of descriptor state-space models
+#include "sltg01hd.cc" // controllability staircase form of descriptor state-space models
+#include "sltg01id.cc" // observability staircase form of descriptor state-space models
+#include "slsg02ad.cc" // solution of algebraic Riccati equations for descriptor systems
+#include "sltg04bx.cc" // gain of descriptor state-space models
+#include "sltb01id.cc" // scaling of state-space models
+#include "sltg01ad.cc" // scaling of descriptor state-space models
+#include "slsb10id.cc" // H-infinity loop shaping - continuous-time
+#include "slsb10kd.cc" // H-infinity loop shaping - discrete-time - strictly proper case
+#include "slsb10zd.cc" // H-infinity loop shaping - discrete-time - proper case
+#include "sltb04bd.cc" // State-space to transfer function conversion
+#include "slab04md.cc" // bilinear transformation
+#include "slsb10jd.cc" // descriptor to regular state-space conversion
+#include "sltd04ad.cc" // transfer function to state-space conversion
+#include "sltb01ud.cc" // controllable block Hessenberg realization
+#include "slab09hd.cc" // balanced stochastic truncation model reduction
+#include "slab09id.cc" // balanced truncation & singular perturbation approximation model reduction
+#include "slab09jd.cc" // hankel-norm approximation model reduction
+#include "slsb16ad.cc" // balanced truncation & singular perturbation approximation controller reduction
+#include "slsb16bd.cc" // coprime factorization state-feedback controller reduction
+#include "slsb16cd.cc" // frequency-weighted coprime factorization state-feedback controller reduction
+#include "slsb10yd.cc" // fit state-space model to frequency response data
+#include "slident.cc" // system identification
+#include "slib01cd.cc" // compute initial state vector
+#include "slib01ad.cc" // compute singular values
+
+
+// stub function to avoid gen_doc_cache warning upon package installation
+DEFUN_DLD (__control_slicot_functions__, args, nargout,
+ "-*- texinfo -*-\n\
+Slicot Release 5.0\n\
+No argument checking.\n\
+For internal use only.")
+{
+ octave_value_list retval;
+ error ("__control_slicot_functions__: for internal use only");
+ return retval;
+}
+
Deleted: trunk/octave-forge/main/control/src/control_slicot_functions.cc
===================================================================
--- trunk/octave-forge/main/control/src/control_slicot_functions.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/control_slicot_functions.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -1,58 +0,0 @@
-#include "slab08nd.cc" // transmission zeros of state-space models
-#include "slab13dd.cc" // L-infinity norm
-#include "slsb10hd.cc" // H-2 controller synthesis - continuous-time
-#include "slsb10ed.cc" // H-2 controller synthesis - discrete-time
-#include "slab13bd.cc" // H-2 norm
-#include "slsb01bd.cc" // Pole assignment
-#include "slsb10fd.cc" // H-infinity controller synthesis - continuous-time
-#include "slsb10dd.cc" // H-infinity controller synthesis - discrete-time
-#include "slsb03md.cc" // Lyapunov equations
-#include "slsb04md.cc" // Sylvester equations - continuous-time
-#include "slsb04qd.cc" // Sylvester equations - discrete-time
-#include "slsg03ad.cc" // generalized Lyapunov equations
-#include "slsb02od.cc" // algebraic Riccati equations
-#include "slab13ad.cc" // Hankel singular values
-#include "slab01od.cc" // staircase form using orthogonal transformations
-#include "sltb01pd.cc" // minimal realization of state-space models
-#include "slsb03od.cc" // Cholesky factor of Lyapunov equations
-#include "slsg03bd.cc" // Cholesky factor of generalized Lyapunov equations
-#include "slag08bd.cc" // transmission zeros of descriptor state-space models
-#include "sltg01jd.cc" // minimal realization of descriptor state-space models
-#include "sltg01hd.cc" // controllability staircase form of descriptor state-space models
-#include "sltg01id.cc" // observability staircase form of descriptor state-space models
-#include "slsg02ad.cc" // solution of algebraic Riccati equations for descriptor systems
-#include "sltg04bx.cc" // gain of descriptor state-space models
-#include "sltb01id.cc" // scaling of state-space models
-#include "sltg01ad.cc" // scaling of descriptor state-space models
-#include "slsb10id.cc" // H-infinity loop shaping - continuous-time
-#include "slsb10kd.cc" // H-infinity loop shaping - discrete-time - strictly proper case
-#include "slsb10zd.cc" // H-infinity loop shaping - discrete-time - proper case
-#include "sltb04bd.cc" // State-space to transfer function conversion
-#include "slab04md.cc" // bilinear transformation
-#include "slsb10jd.cc" // descriptor to regular state-space conversion
-#include "sltd04ad.cc" // transfer function to state-space conversion
-#include "sltb01ud.cc" // controllable block Hessenberg realization
-#include "slab09hd.cc" // balanced stochastic truncation model reduction
-#include "slab09id.cc" // balanced truncation & singular perturbation approximation model reduction
-#include "slab09jd.cc" // hankel-norm approximation model reduction
-#include "slsb16ad.cc" // balanced truncation & singular perturbation approximation controller reduction
-#include "slsb16bd.cc" // coprime factorization state-feedback controller reduction
-#include "slsb16cd.cc" // frequency-weighted coprime factorization state-feedback controller reduction
-#include "slsb10yd.cc" // fit state-space model to frequency response data
-#include "slident.cc" // system identification
-#include "slib01cd.cc" // compute initial state vector
-#include "slib01ad.cc" // compute singular values
-
-
-// stub function to avoid gen_doc_cache warning upon package installation
-DEFUN_DLD (control_slicot_functions, args, nargout,
- "-*- texinfo -*-\n\
-Slicot Release 5.0\n\
-No argument checking.\n\
-For internal use only.")
-{
- octave_value_list retval;
- error ("control_slicot_functions: for internal use only");
- return retval;
-}
-
Modified: trunk/octave-forge/main/control/src/slab01od.cc
===================================================================
--- trunk/octave-forge/main/control/src/slab01od.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slab01od.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -49,8 +49,8 @@
int& INFO);
}
-// PKG_ADD: autoload ("slab01od", "control_slicot_functions.oct");
-DEFUN_DLD (slab01od, args, nargout,
+// PKG_ADD: autoload ("__sl_ab01od__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ab01od__, args, nargout,
"-*- texinfo -*-\n\
Slicot AB01OD Release 5.0\n\
No argument checking.\n\
@@ -118,10 +118,10 @@
info));
if (f77_exception_encountered)
- error ("slab01od: exception in SLICOT subroutine AB01OD");
+ error ("__sl_ab01od__: exception in SLICOT subroutine AB01OD");
if (info != 0)
- error ("slab01od: AB01OD returned info = %d", info);
+ error ("__sl_ab01od__: AB01OD returned info = %d", info);
// resize
a.resize (n, n);
Modified: trunk/octave-forge/main/control/src/slab04md.cc
===================================================================
--- trunk/octave-forge/main/control/src/slab04md.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slab04md.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -47,8 +47,8 @@
int& INFO);
}
-// PKG_ADD: autoload ("slab04md", "control_slicot_functions.oct");
-DEFUN_DLD (slab04md, args, nargout,
+// PKG_ADD: autoload ("__sl_ab04md__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ab04md__, args, nargout,
"-*- texinfo -*-\n\
Slicot AB04MD Release 5.0\n\
No argument checking.\n\
@@ -113,10 +113,10 @@
info));
if (f77_exception_encountered)
- error ("slab04md: exception in SLICOT subroutine AB04MD");
+ error ("__sl_ab04md__: exception in SLICOT subroutine AB04MD");
if (info != 0)
- error ("slab04md: AB04MD returned info = %d", info);
+ error ("__sl_ab04md__: AB04MD returned info = %d", info);
// return values
retval(0) = a;
Modified: trunk/octave-forge/main/control/src/slab08nd.cc
===================================================================
--- trunk/octave-forge/main/control/src/slab08nd.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slab08nd.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -64,8 +64,8 @@
int& INFO);
}
-// PKG_ADD: autoload ("slab08nd", "control_slicot_functions.oct");
-DEFUN_DLD (slab08nd, args, nargout,
+// PKG_ADD: autoload ("__sl_ab08nd__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ab08nd__, args, nargout,
"-*- texinfo -*-\n\
Slicot AB08ND Release 5.0\n\
No argument checking.\n\
@@ -151,10 +151,10 @@
info));
if (f77_exception_encountered)
- error ("ss: zero: slab08nd: exception in SLICOT subroutine AB08ND");
+ error ("ss: zero: __sl_ab08nd__: exception in SLICOT subroutine AB08ND");
if (info != 0)
- error ("ss: zero: slab08nd: AB08ND returned info = %d", info);
+ error ("ss: zero: __sl_ab08nd__: AB08ND returned info = %d", info);
// DGGEV Part
@@ -188,10 +188,10 @@
info2));
if (f77_exception_encountered)
- error ("ss: zero: slab08nd: exception in LAPACK subroutine DGGEV");
+ error ("ss: zero: __sl_ab08nd__: exception in LAPACK subroutine DGGEV");
if (info2 != 0)
- error ("ss: zero: slab08nd: DGGEV returned info = %d", info2);
+ error ("ss: zero: __sl_ab08nd__: DGGEV returned info = %d", info2);
// calculate gain
octave_value gain = Matrix (0, 0);;
Modified: trunk/octave-forge/main/control/src/slab09hd.cc
===================================================================
--- trunk/octave-forge/main/control/src/slab09hd.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slab09hd.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -51,8 +51,8 @@
int& IWARN, int& INFO);
}
-// PKG_ADD: autoload ("slab09hd", "control_slicot_functions.oct");
-DEFUN_DLD (slab09hd, args, nargout,
+// PKG_ADD: autoload ("__sl_ab09hd__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ab09hd__, args, nargout,
"-*- texinfo -*-\n\
Slicot AB09HD Release 5.0\n\
No argument checking.\n\
@@ -105,7 +105,7 @@
job = 'P';
break;
default:
- error ("slab09hd: argument job invalid");
+ error ("__sl_ab09hd__: argument job invalid");
}
if (idico == 0)
Modified: trunk/octave-forge/main/control/src/slab09id.cc
===================================================================
--- trunk/octave-forge/main/control/src/slab09id.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slab09id.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -61,8 +61,8 @@
int& IWARN, int& INFO);
}
-// PKG_ADD: autoload ("slab09id", "control_slicot_functions.oct");
-DEFUN_DLD (slab09id, args, nargout,
+// PKG_ADD: autoload ("__sl_ab09id__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ab09id__, args, nargout,
"-*- texinfo -*-\n\
Slicot AB09ID Release 5.0\n\
No argument checking.\n\
@@ -157,7 +157,7 @@
job = 'P';
break;
default:
- error ("slab09id: argument job invalid");
+ error ("__sl_ab09id__: argument job invalid");
}
switch (iweight)
@@ -175,7 +175,7 @@
weight = 'B';
break;
default:
- error ("slab09id: argument weight invalid");
+ error ("__sl_ab09id__: argument weight invalid");
}
int n = a.rows (); // n: number of states
Modified: trunk/octave-forge/main/control/src/slab09jd.cc
===================================================================
--- trunk/octave-forge/main/control/src/slab09jd.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slab09jd.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -59,8 +59,8 @@
int& IWARN, int& INFO);
}
-// PKG_ADD: autoload ("slab09jd", "control_slicot_functions.oct");
-DEFUN_DLD (slab09jd, args, nargout,
+// PKG_ADD: autoload ("__sl_ab09jd__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ab09jd__, args, nargout,
"-*- texinfo -*-\n\
Slicot AB09JD Release 5.0\n\
No argument checking.\n\
@@ -128,7 +128,7 @@
jobv = 'R';
break;
default:
- error ("slab09jd: argument jobv invalid");
+ error ("__sl_ab09jd__: argument jobv invalid");
}
switch (ijobw)
@@ -149,7 +149,7 @@
jobw = 'R';
break;
default:
- error ("slab09jd: argument jobw invalid");
+ error ("__sl_ab09jd__: argument jobw invalid");
}
switch (ijobinv)
@@ -164,7 +164,7 @@
jobinv = 'A';
break;
default:
- error ("slab09jd: argument jobinv invalid");
+ error ("__sl_ab09jd__: argument jobinv invalid");
}
if (idico == 0)
Modified: trunk/octave-forge/main/control/src/slab13ad.cc
===================================================================
--- trunk/octave-forge/main/control/src/slab13ad.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slab13ad.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -46,8 +46,8 @@
int& INFO);
}
-// PKG_ADD: autoload ("slab13ad", "control_slicot_functions.oct");
-DEFUN_DLD (slab13ad, args, nargout,
+// PKG_ADD: autoload ("__sl_ab13ad__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ab13ad__, args, nargout,
"-*- texinfo -*-\n\
Slicot AB13AD Release 5.0\n\
No argument checking.\n\
@@ -120,10 +120,10 @@
info));
if (f77_exception_encountered)
- error ("hsvd: slab13ad: exception in SLICOT subroutine AB13AD");
+ error ("hsvd: __sl_ab13ad__: exception in SLICOT subroutine AB13AD");
if (info != 0)
- error ("hsvd: slab13ad: AB13AD returned info = %d", info);
+ error ("hsvd: __sl_ab13ad__: AB13AD returned info = %d", info);
// resize
hsv.resize (ns);
Modified: trunk/octave-forge/main/control/src/slab13bd.cc
===================================================================
--- trunk/octave-forge/main/control/src/slab13bd.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slab13bd.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -47,8 +47,8 @@
int& INFO);
}
-// PKG_ADD: autoload ("slab13bd", "control_slicot_functions.oct");
-DEFUN_DLD (slab13bd, args, nargout,
+// PKG_ADD: autoload ("__sl_ab13bd__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ab13bd__, args, nargout,
"-*- texinfo -*-\n\
Slicot AB13BD Release 5.\n\
No argument checking.\n\
@@ -120,13 +120,13 @@
info);
if (f77_exception_encountered)
- error ("lti: norm: slab13bd: exception in SLICOT subroutine AB13BD");
+ error ("lti: norm: __sl_ab13bd__: exception in SLICOT subroutine AB13BD");
if (info != 0)
- error ("lti: norm: slab13bd: AB13BD returned info = %d", info);
+ error ("lti: norm: __sl_ab13bd__: AB13BD returned info = %d", info);
if (iwarn != 0)
- warning ("lti: norm: slab13bd: AB13BD returned iwarn = %d", iwarn);
+ warning ("lti: norm: __sl_ab13bd__: AB13BD returned iwarn = %d", iwarn);
// return value
retval(0) = octave_value (norm);
Modified: trunk/octave-forge/main/control/src/slab13dd.cc
===================================================================
--- trunk/octave-forge/main/control/src/slab13dd.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slab13dd.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -51,8 +51,8 @@
int& INFO);
}
-// PKG_ADD: autoload ("slab13dd", "control_slicot_functions.oct");
-DEFUN_DLD (slab13dd, args, nargout,
+// PKG_ADD: autoload ("__sl_ab13dd__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ab13dd__, args, nargout,
"-*- texinfo -*-\n\
Slicot AB13DD Release 5.0\n\
No argument checking.\n\
@@ -145,10 +145,10 @@
info));
if (f77_exception_encountered)
- error ("lti: norm: slab13dd: exception in SLICOT subroutine AB13DD");
+ error ("lti: norm: __sl_ab13dd__: exception in SLICOT subroutine AB13DD");
if (info != 0)
- error ("lti: norm: slab13dd: AB13DD returned info = %d", info);
+ error ("lti: norm: __sl_ab13dd__: AB13DD returned info = %d", info);
// return values
retval(0) = fpeak;
Modified: trunk/octave-forge/main/control/src/slag08bd.cc
===================================================================
--- trunk/octave-forge/main/control/src/slag08bd.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slag08bd.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -64,8 +64,8 @@
int& INFO);
}
-// PKG_ADD: autoload ("slag08bd", "control_slicot_functions.oct");
-DEFUN_DLD (slag08bd, args, nargout,
+// PKG_ADD: autoload ("__sl_ag08bd__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ag08bd__, args, nargout,
"-*- texinfo -*-\n\
Slicot AG08BD Release 5.0\n\
No argument checking.\n\
@@ -154,10 +154,10 @@
info));
if (f77_exception_encountered)
- error ("dss: zero: slag08bd: exception in SLICOT subroutine AG08BD");
+ error ("dss: zero: __sl_ag08bd__: exception in SLICOT subroutine AG08BD");
if (info != 0)
- error ("dss: zero: slag08bd: AG08BD returned info = %d", info);
+ error ("dss: zero: __sl_ag08bd__: AG08BD returned info = %d", info);
// DGGEV Part
@@ -197,10 +197,10 @@
info2));
if (f77_exception_encountered)
- error ("dss: zero: slag08bd: exception in LAPACK subroutine DGGEV");
+ error ("dss: zero: __sl_ag08bd__: exception in LAPACK subroutine DGGEV");
if (info2 != 0)
- error ("dss: zero: slag08bd: DGGEV returned info = %d", info2);
+ error ("dss: zero: __sl_ag08bd__: DGGEV returned info = %d", info2);
// assemble complex vector - adapted from DEFUN complex in data.cc
// LAPACK DGGEV.f says:
Modified: trunk/octave-forge/main/control/src/slib01ad.cc
===================================================================
--- trunk/octave-forge/main/control/src/slib01ad.cc 2012-09-04 01:58:03 UTC (rev 10958)
+++ trunk/octave-forge/main/control/src/slib01ad.cc 2012-09-04 09:09:48 UTC (rev 10959)
@@ -50,8 +50,8 @@
int& IWARN, int& INFO);
}
-// PKG_ADD: autoload ("slib01ad", "control_slicot_functions.oct");
-DEFUN_DLD (slib01ad, args, nargout,
+// PKG_ADD: autoload ("__sl_ib01ad__", "__control_slicot_functions__.oct");
+DEFUN_DLD (__sl_ib01ad__, args, nargout,
"-*- texinfo -*-\n\
Slicot IB01AD Release 5.0\n\
No argument checking.\n\
@@ -111,7 +111,7 @@
meth_b = 'C';
break;
default:
- error ("slib01ad: argument 'meth' invalid");
+ error ("__sl_ib01ad__: argument 'meth' invalid");
}
switch (ialg)
@@ -126,7 +126,7 @@
alg = 'Q';
break;
default:
- error ("slib01ad: argument 'alg' invalid");
+ error ("__sl_ib01ad__: argument 'alg' invalid");
}
if (meth_a == 'M')
@@ -159,7 +159,7 @@
else if (meth_a == 'N' || (meth_a == 'M' && jobd == 'N'))
ldr = 2*(m+l)*nobr;
else
- ...
[truncated message content] |
