From: <par...@us...> - 2012-06-25 07:51:52
|
Revision: 10686 http://octave.svn.sourceforge.net/octave/?rev=10686&view=rev Author: paramaniac Date: 2012-06-25 07:51:40 +0000 (Mon, 25 Jun 2012) Log Message: ----------- control: prepare release of control-2.3.52 Modified Paths: -------------- trunk/octave-forge/main/control/DESCRIPTION trunk/octave-forge/main/control/NEWS trunk/octave-forge/main/control/devel/pdfdoc/function_doc.m trunk/octave-forge/main/control/doc/control.pdf Added Paths: ----------- trunk/octave-forge/main/control/devel/Makefile.ReferenceLapack trunk/octave-forge/main/control/doc/control.tex trunk/octave-forge/main/control/doc/functions.texi Modified: trunk/octave-forge/main/control/DESCRIPTION =================================================================== --- trunk/octave-forge/main/control/DESCRIPTION 2012-06-24 21:40:15 UTC (rev 10685) +++ trunk/octave-forge/main/control/DESCRIPTION 2012-06-25 07:51:40 UTC (rev 10686) @@ -1,6 +1,6 @@ Name: Control Version: 2.3.52 -Date: 2012-06-24 +Date: 2012-06-25 Author: Lukas Reichlin <luk...@gm...> Maintainer: Lukas Reichlin <luk...@gm...> Title: Control Systems Modified: trunk/octave-forge/main/control/NEWS =================================================================== --- trunk/octave-forge/main/control/NEWS 2012-06-24 21:40:15 UTC (rev 10685) +++ trunk/octave-forge/main/control/NEWS 2012-06-25 07:51:40 UTC (rev 10686) @@ -1,7 +1,7 @@ Summary of important user-visible changes for releases of the control package =============================================================================== -control-2.3.52 Release Date: 2012-06-24 Release Manager: Lukas Reichlin +control-2.3.52 Release Date: 2012-06-25 Release Manager: Lukas Reichlin =============================================================================== ** Fixed a silly mistake in MIMO transfer function to state-space conversion. @@ -12,7 +12,16 @@ Added new functions for linear quadratic estimators. (Thanks to Megan Zagrobelny) +** Upon request of the Debian maintainers, the tex-files control.tex and + functions.texi for generating control.pdf are included in the doc folder, + next to control.pdf. Note that functions.texi is generated automatically + by the scripts in the control/devel folder and the package generate_html. + They are not included in the control package and can be found on the + OctaveForge SVN server. +** Minor improvements in various help texts. + + =============================================================================== control-2.3.51 Release Date: 2012-06-03 Release Manager: Lukas Reichlin =============================================================================== @@ -43,7 +52,10 @@ ** Makefile fixed to work with non-standard linker options e.g on Apple. +** The conversion to state-space of multi-input transfer functions with common + row denominators is now handled more efficiently. + =============================================================================== control-2.3.50 Release Date: 2012-03-06 Release Manager: Lukas Reichlin =============================================================================== Added: trunk/octave-forge/main/control/devel/Makefile.ReferenceLapack =================================================================== --- trunk/octave-forge/main/control/devel/Makefile.ReferenceLapack (rev 0) +++ trunk/octave-forge/main/control/devel/Makefile.ReferenceLapack 2012-06-25 07:51:40 UTC (rev 10686) @@ -0,0 +1,77 @@ +MKOCTFILE ?= mkoctfile + +ifndef LAPACK_LIBS +LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS) +endif +ifndef BLAS_LIBS +BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) +endif +ifndef FLIBS +FLIBS := $(shell $(MKOCTFILE) -p FLIBS) +endif +MKOCTFILE ?= mkoctfile + +# LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS) +# BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) +FLIBS := $(shell $(MKOCTFILE) -p FLIBS) + +all: control_slicot_functions.oct \ + is_real_scalar.oct \ + is_real_vector.oct \ + is_real_matrix.oct \ + is_real_square_matrix.oct + +# TODO: Private oct-files for control package. + +# unpack and compile SLICOT library +# Note that TG04BX is a custom routine. +# It has the extension .fortran such that +# it is not deleted by rm *.f when using +# the developer makefile makefile_control.m +slicotlibrary.a: slicot.tar.gz + tar -xzf slicot.tar.gz + mv slicot/src/*.f . + mv slicot/src_aux/*.f . + cp TG04BX.fortran TG04BX.f + $(MKOCTFILE) -c *.f + ar -rc slicotlibrary.a *.o + rm -rf *.o *.f slicot + +# reference lapack is just included for debugging purposes +# it will be removed again before an official release of the control package +lapacklibrary.a: lapack-3.4.1.tgz + tar -xzf lapack-3.4.1.tgz + mv lapack-3.4.1/BLAS/SRC/*.f . + mv lapack-3.4.1/INSTALL/*.f . + mv lapack-3.4.1/SRC/*.f . + $(MKOCTFILE) -c *.f + ar -rc lapacklibrary.a *.o + rm -rf *.o *.f lapack-3.4.1 + +# slicot functions +control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a lapacklibrary.a + $(MKOCTFILE) control_slicot_functions.cc common.cc slicotlibrary.a lapacklibrary.a \ + ${FLIBS} +# slicot functions +#control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a +# $(MKOCTFILE) control_slicot_functions.cc common.cc slicotlibrary.a \ +# ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS} + +# helpers +is_real_scalar.oct: is_real_scalar.cc + $(MKOCTFILE) is_real_scalar.cc + +is_real_vector.oct: is_real_vector.cc + $(MKOCTFILE) is_real_vector.cc + +is_real_matrix.oct: is_real_matrix.cc + $(MKOCTFILE) is_real_matrix.cc + +is_real_square_matrix.oct: is_real_square_matrix.cc + $(MKOCTFILE) is_real_square_matrix.cc + +clean: + rm -rf *.o core octave-core *.oct *~ *.f slicot lapack-3.4.1 + +realclean: clean + rm -rf *.a \ No newline at end of file Modified: trunk/octave-forge/main/control/devel/pdfdoc/function_doc.m =================================================================== --- trunk/octave-forge/main/control/devel/pdfdoc/function_doc.m 2012-06-24 21:40:15 UTC (rev 10685) +++ trunk/octave-forge/main/control/devel/pdfdoc/function_doc.m 2012-06-25 07:51:40 UTC (rev 10686) @@ -14,6 +14,9 @@ % Open output file fid = fopen ("functions.texi", "w"); +fprintf (fid, '@c This file is generated automatically\n'); +fprintf (fid, '@c Do not edit\n\n'); + for k = 1:numel (list {1}.provides) group = list {1}.provides{k}; Modified: trunk/octave-forge/main/control/doc/control.pdf =================================================================== --- trunk/octave-forge/main/control/doc/control.pdf 2012-06-24 21:40:15 UTC (rev 10685) +++ trunk/octave-forge/main/control/doc/control.pdf 2012-06-25 07:51:40 UTC (rev 10686) @@ -42,7 +42,7 @@ >> stream xڅ\x90MK1\x86\xEF\xFB+rL3\x99\xCC&\xB9*\xB6 \xE2Gݞ\xC4ònk\xE9n\xAB\xE0\xBF7i\/\x8A\xC3̛y\x9F\xBC(L:(\xBC>\xF2\xA2\xDBV\xE6\xD4\x96\xA2\xB3i\x85_:\xC7\xEC(\xD5\xCA\xF4\xA8\xD3H\xDD?Kur\x8Eb\x9E7\xD5\xD9ij\xB0j,\x9AEƫ -\x817A4\xCF\xE2Qv\xFB\x9D"\x94\xC7a\xBFQ\x9A<K\xC9\xD5SsU]6\xD5\xEB\xF7\xEA\xF4\x90#\x83\xA70"\x8Cd\x89+\xEDz\xB1\xA8\xEE\x8B%\xB3@\xD1D̖d j\x8C\x82\x83\xF4\xBE\xF8^$_F_"\xF9\xF0q8\xF6[\xA5QJ\xE3.\xCF\xDB.\xDFk\xC5,\xDBe_\x8B\xFDP\x8A\xE9\xCD<N\xDEv\xC76\xEB\xDE\xF3\xD5g\xF6ӷ\xD1\xB9\xDAfmO\xDA\xC5 |