changeset 9477:331814898d0c octave-forge

move finished functions from package "control-devel" to "control" (3)
author paramaniac
date Wed, 22 Feb 2012 19:54:36 +0000
parents bd763272440e
children 0d5fed55ab22
files main/control/inst/test_control.m main/control/src/Makefile
diffstat 2 files changed, 55 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/main/control/inst/test_control.m	Wed Feb 22 19:46:06 2012 +0000
+++ b/main/control/inst/test_control.m	Wed Feb 22 19:54:36 2012 +0000
@@ -1,4 +1,4 @@
-## Copyright (C) 2010, 2011   Lukas F. Reichlin
+## Copyright (C) 2010, 2011, 2012   Lukas F. Reichlin
 ##
 ## This file is part of LTI Syncope.
 ##
@@ -22,7 +22,7 @@
 
 ## Author: Lukas Reichlin <lukas.reichlin@gmail.com>
 ## Created: May 2010
-## Version: 0.3
+## Version: 0.4
 
 ## test collection
 test ltimodels
@@ -59,6 +59,21 @@
 test lyap
 test lyapchol
 
+## model order reduction
+test bstmodred
+test btamodred
+test hnamodred
+## test spamodred  # TODO: create test case
+
+## controller order reduction
+test btaconred
+test cfconred
+test fwcfconred
+## test spaconred  # TODO: create test case
+
+## identification
+test fitfrd
+
 ## various oct-files
 test ctrbf
 test hsvd
--- a/main/control/src/Makefile	Wed Feb 22 19:46:06 2012 +0000
+++ b/main/control/src/Makefile	Wed Feb 22 19:54:36 2012 +0000
@@ -10,7 +10,9 @@
      sltb01pd.oct slsb03od.oct slsg03bd.oct slag08bd.oct sltg01jd.oct \
      sltg01hd.oct sltg01id.oct slsg02ad.oct sltg04bx.oct sltb01id.oct \
      sltg01ad.oct slsb10id.oct slsb10kd.oct slsb10zd.oct sltb04bd.oct \
-     slab04md.oct slsb10jd.oct sltd04ad.oct sltb01ud.oct \
+     slab04md.oct slsb10jd.oct sltd04ad.oct sltb01ud.oct slab09hd.oct \
+     slab09id.oct slab09jd.oct slsb16ad.oct slsb16bd.oct slsb16cd.oct \
+     slsb10yd.oct \
      is_real_scalar.oct is_real_vector.oct is_real_matrix.oct \
      is_real_square_matrix.oct \
      copy_NEWS
@@ -203,6 +205,41 @@
 	mkoctfile sltb01ud.cc slicotlibrary.a \
               ${LAPACK_LIBS} ${BLAS_LIBS}
 
+# balanced stochastic truncation model reduction
+slab09hd.oct: slab09hd.cc slicotlibrary.a
+	mkoctfile slab09hd.cc slicotlibrary.a \
+              ${LAPACK_LIBS} ${BLAS_LIBS}
+
+# balanced truncation & singular perturbation approximation model reduction
+slab09id.oct: slab09id.cc slicotlibrary.a
+	mkoctfile slab09id.cc slicotlibrary.a \
+              ${LAPACK_LIBS} ${BLAS_LIBS}
+
+# hankel-norm approximation model reduction
+slab09jd.oct: slab09jd.cc slicotlibrary.a
+	mkoctfile slab09jd.cc slicotlibrary.a \
+              ${LAPACK_LIBS} ${BLAS_LIBS}
+
+# balanced truncation & singular perturbation approximation controller reduction
+slsb16ad.oct: slsb16ad.cc slicotlibrary.a
+	mkoctfile slsb16ad.cc slicotlibrary.a \
+              ${LAPACK_LIBS} ${BLAS_LIBS}
+
+# coprime factorization state-feedback controller reduction
+slsb16bd.oct: slsb16bd.cc slicotlibrary.a
+	mkoctfile slsb16bd.cc slicotlibrary.a \
+              ${LAPACK_LIBS} ${BLAS_LIBS}
+
+# frequency-weighted coprime factorization state-feedback controller reduction
+slsb16cd.oct: slsb16cd.cc slicotlibrary.a
+	mkoctfile slsb16cd.cc slicotlibrary.a \
+              ${LAPACK_LIBS} ${BLAS_LIBS}
+
+# fit state-space model to frequency response data
+slsb10yd.oct: slsb10yd.cc slicotlibrary.a
+	mkoctfile slsb10yd.cc slicotlibrary.a \
+              ${LAPACK_LIBS} ${BLAS_LIBS}
+
 # helpers
 is_real_scalar.oct: is_real_scalar.cc
 	mkoctfile is_real_scalar.cc