[Octave-cvsupdate] SF.net SVN: octave:[8065] trunk/octave-forge/main/control

[<par...@us...>]

Revision: 8065
          http://octave.svn.sourceforge.net/octave/?rev=8065&view=rev
Author:   paramaniac
Date:     2011-01-23 22:52:28 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
control: minor cosmetic changes

Modified Paths:
--------------
    trunk/octave-forge/main/control/doc/references.txt
    trunk/octave-forge/main/control/inst/Boeing707.m
    trunk/octave-forge/main/control/inst/optiPID.m
    trunk/octave-forge/main/control/inst/optiPIDfun.m

Modified: trunk/octave-forge/main/control/doc/references.txt
===================================================================
--- trunk/octave-forge/main/control/doc/references.txt	2011-01-21 23:05:47 UTC (rev 8064)
+++ trunk/octave-forge/main/control/doc/references.txt	2011-01-23 22:52:28 UTC (rev 8065)
@@ -4,55 +4,53 @@
 German
 ******
 
+Geering, H.P.
+Regelungstechnik
+Springer
+2004
+
 Meyer, M.
 Signalverarbeitung
 Vieweg & Teubner
 2009
 
-Geering, H.P.
-Regelungstechnik
-Springer
-2004
 
-
 English
 *******
 
-Guzzella, L.
-Analysis and Design of SISO Control Systems
-VDF Hochschulverlag ETH Zurich
-2007
-
-Kailath, T.
-Linear Systems
-Prentice Hall
-1980
-
 Anderson, B.D.O. and Moore, J.B.
 Optimal Control
 Linear Quadratic Methods
 Dover Publications
 1990
 
-Skogestad, S. and Postlethwaite, I.
-Multivariable Feedback Control
-Analysis and Design
+Astr\x9Am, K. and H\x8Agglund, T.
+PID Controllers
+Theory, Design and Tuning
 Second Edition
-Wiley
-2005
+Instrument Society of America
+1995
 
 Doyle, J.C., Francis, B.A. and Tannenbaum, A.R.
 Feedback Control Theory
 Dover Publications
 1992
 
-Astr\x9Am, K. and H\x8Agglund, T.
-PID Controllers
-Theory, Design and Tuning
-Second Edition
-Instrument Society of America
-1995
+Geering, H.P.
+Optimal Control with Engineering Applications
+Springer
+2007
 
+Guzzella, L.
+Analysis and Design of SISO Control Systems
+VDF Hochschulverlag ETH Zurich
+2007
+
+Kailath, T.
+Linear Systems
+Prentice Hall
+1980
+
 Leigh, J.R.
 Applied Digital Control
 Theory, Design and Implementation
@@ -60,14 +58,16 @@
 Dover Publications
 1992
 
-Geering, H.P.
-Optimal Control with Engineering Applications
-Springer
-2007
-
 Ljung, L.
 System Identification
 Theory for the User
 Second Edition
 Prentice Hall
 1999
+
+Skogestad, S. and Postlethwaite, I.
+Multivariable Feedback Control
+Analysis and Design
+Second Edition
+Wiley
+2005

Modified: trunk/octave-forge/main/control/inst/Boeing707.m
===================================================================
--- trunk/octave-forge/main/control/inst/Boeing707.m	2011-01-21 23:05:47 UTC (rev 8064)
+++ trunk/octave-forge/main/control/inst/Boeing707.m	2011-01-23 22:52:28 UTC (rev 8065)
@@ -62,8 +62,8 @@
 
   inam = {"thrust"; "rudder"};
   onam = {"speed"; "pitch"};
-  snam = {"x1"; "x2"; "x3"; "x4"};
+  ## snam = {"x1"; "x2"; "x3"; "x4"};
 
-  outsys = ss (a, b, c, d, "stname", snam, "inname", inam, "outname", onam);
+  outsys = ss (a, b, c, d, "inname", inam, "outname", onam);
 
 endfunction

Modified: trunk/octave-forge/main/control/inst/optiPID.m
===================================================================
--- trunk/octave-forge/main/control/inst/optiPID.m	2011-01-21 23:05:47 UTC (rev 8064)
+++ trunk/octave-forge/main/control/inst/optiPID.m	2011-01-23 22:52:28 UTC (rev 8065)
@@ -2,7 +2,7 @@
 % optiPID                          Lukas Reichlin                       July 2009
 % ===============================================================================
 % Numerical Optimization of an A/H PID Controller
-% Required OCTAVE Packages: control, miscellaneous, optim
+% Required OCTAVE Packages: control, optim (and its dependencies)
 % Required MATLAB Toolboxes: Control, Optimization
 % ===============================================================================
 
@@ -18,9 +18,9 @@
 P = tf (numP, denP);
 
 % Relative Weighting Factors: PLAY AROUND WITH THESE!
-mu_1 = 1;       % Minimize ITAE Criterion
-mu_2 = 10;      % Minimize Max Overshoot
-mu_3 = 20;      % Minimize Sensitivity Ms
+mu_1 = 1;               % Minimize ITAE Criterion
+mu_2 = 10;              % Minimize Max Overshoot
+mu_3 = 20;              % Minimize Sensitivity Ms
 
 % Simulation Settings: PLANT-DEPENDENT!
 t_sim = 30;             % Simulation Time [s]

Modified: trunk/octave-forge/main/control/inst/optiPIDfun.m
===================================================================
--- trunk/octave-forge/main/control/inst/optiPIDfun.m	2011-01-21 23:05:47 UTC (rev 8064)
+++ trunk/octave-forge/main/control/inst/optiPIDfun.m	2011-01-23 22:52:28 UTC (rev 8065)
@@ -2,8 +2,8 @@
 % optiPIDfun                       Lukas Reichlin                       July 2009
 % ===============================================================================
 % Objective Function
-% See "Analysis and Synthesis of SISO Control Systems"
-% by Lino Guzzella for further details
+% Reference: Guzzella, L. (2007) Analysis and Synthesis of SISO Control Systems.
+%            vdf, Zurich
 % ===============================================================================
 
 function J = optiPIDfun (C_par)
@@ -18,8 +18,8 @@
   tau = Td / 10;
 
   % PID Controller with Roll-Off
-  numC = kp * [Ti * Td,  Ti,  1];
-  denC = conv ([Ti, 0], [tau^2,  2 * tau,  1]);
+  numC = kp * [Ti*Td, Ti, 1];
+  denC = conv ([Ti, 0], [tau^2, 2*tau, 1]);
   C = tf (numC, denC);
 
   % Open Loop
@@ -32,11 +32,11 @@
   SUML = append (SUM, L);
 
   % Build System Interconnections
-  CM = [3, 1;   % Controller Input with Sum Block Output 
-        2, 2];  % Sum Block Negative Input with Plant Output
+  CM = [3, 1;          % Controller Input with Sum Block Output 
+        2, 2];         % Sum Block Negative Input with Plant Output
 
-  inputs = [1];      % Input 1: reference r(t)
-  outputs = [1, 2];  % Output 1: error e(t), Output 2: output y(t)
+  inputs = [1];        % Input 1: reference r(t)
+  outputs = [1, 2];    % Output 1: error e(t), Output 2: output y(t)
 
   SUML = connect (SUML, CM, inputs, outputs);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.