From: <par...@us...> - 2011-12-29 22:49:16
|
Revision: 9484 http://octave.svn.sourceforge.net/octave/?rev=9484&view=rev Author: paramaniac Date: 2011-12-29 22:49:10 +0000 (Thu, 29 Dec 2011) Log Message: ----------- control-devel: apply CDFs fix for octave 3.6.0 compatibility from the control package Modified Paths: -------------- trunk/octave-forge/extra/control-devel/devel/makefile_conred.m trunk/octave-forge/extra/control-devel/devel/makefile_ident.m trunk/octave-forge/extra/control-devel/devel/makefile_modred.m trunk/octave-forge/extra/control-devel/src/Makefile Modified: trunk/octave-forge/extra/control-devel/devel/makefile_conred.m =================================================================== --- trunk/octave-forge/extra/control-devel/devel/makefile_conred.m 2011-12-29 22:22:18 UTC (rev 9483) +++ trunk/octave-forge/extra/control-devel/devel/makefile_conred.m 2011-12-29 22:49:10 UTC (rev 9484) @@ -18,20 +18,26 @@ AB09DD.f AB07ND.f TB01LD.f AB05QD.f SB03OU.f \ MA02AD.f MB03QX.f select.f MB01YD.f MB01ZD.f \ SB03OT.f MB04OY.f MB03QD.f MB04ND.f MB03QY.f \ - SB03OR.f SB03OY.f SB04PX.f MB04NY.f SB03OV.f + SB03OR.f SB03OY.f SB04PX.f MB04NY.f SB03OV.f \ + "$(mkoctfile -p LAPACK_LIBS)" \ + "$(mkoctfile -p BLAS_LIBS)" mkoctfile slsb16bd.cc \ SB16BD.f AB09AD.f AB09BD.f SB08GD.f SB08HD.f \ TB01ID.f AB09AX.f MA02GD.f AB09BX.f TB01WD.f \ MA02DD.f MB03UD.f select.f AB09DD.f SB03OU.f \ MA02AD.f SB03OT.f MB04ND.f MB04OD.f SB03OR.f \ - SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f + SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f \ + "$(mkoctfile -p LAPACK_LIBS)" \ + "$(mkoctfile -p BLAS_LIBS)" mkoctfile slsb16cd.cc \ SB16CD.f SB16CY.f AB09IX.f SB03OD.f MB02UD.f \ AB09DD.f MA02AD.f MB03UD.f select.f SB03OU.f \ MB01SD.f SB03OT.f MB04ND.f MB04OD.f SB03OR.f \ - SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f + SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f \ + "$(mkoctfile -p LAPACK_LIBS)" \ + "$(mkoctfile -p BLAS_LIBS)" system ("rm *.o"); cd (homedir); Modified: trunk/octave-forge/extra/control-devel/devel/makefile_ident.m =================================================================== --- trunk/octave-forge/extra/control-devel/devel/makefile_ident.m 2011-12-29 22:22:18 UTC (rev 9483) +++ trunk/octave-forge/extra/control-devel/devel/makefile_ident.m 2011-12-29 22:49:10 UTC (rev 9484) @@ -15,7 +15,10 @@ ## preprocess the input-output data mkoctfile IB01AD.f IB01MD.f IB01ND.f IB01OD.f IB01MY.f \ MB04OD.f MB03UD.f MB04ID.f MA02AD.f MB03OD.f \ - MB04IY.f IB01OY.f MA02ED.f MA02FD.f MB04OY.f + MB04IY.f IB01OY.f MA02ED.f MA02FD.f MB04OY.f \ + "$(mkoctfile -p LAPACK_LIBS)" \ + "$(mkoctfile -p BLAS_LIBS)" \ + "$(mkoctfile -p FLIBS)" ## estimating system matrices, Kalman gain, and covariances mkoctfile IB01BD.f IB01PD.f MA02AD.f SB02MT.f SB02RD.f \ @@ -25,19 +28,26 @@ MB02PD.f MB01SD.f MB04KD.f MB03UD.f MB04OD.f \ MB04OY.f MB01VD.f select.f MB01UD.f SB03SY.f \ MB01RX.f SB03MX.f SB03SX.f MB01RY.f SB03QY.f \ - SB03QX.f SB03MY.f SB04PX.f SB03MV.f SB03MW.f + SB03QX.f SB03MY.f SB04PX.f SB03MV.f SB03MW.f \ + "$(mkoctfile -p LAPACK_LIBS)" \ + "$(mkoctfile -p BLAS_LIBS)" ## estimating the initial state mkoctfile IB01CD.f TB01WD.f IB01RD.f IB01QD.f select.f \ MB01TD.f MA02AD.f MB04OD.f MB04OY.f MB02UD.f \ - MB03UD.f MB01SD.f + MB03UD.f MB01SD.f \ + "$(mkoctfile -p LAPACK_LIBS)" \ + "$(mkoctfile -p BLAS_LIBS)" \ + "$(mkoctfile -p FLIBS)" ## fit state-space model to frequency response data mkoctfile slsb10yd.cc \ SB10YD.f DG01MD.f AB04MD.f SB10ZP.f AB07ND.f \ MC01PD.f TD04AD.f TD03AY.f TB01PD.f TB01XD.f \ AB07MD.f TB01UD.f TB01ID.f MB01PD.f MB03OY.f \ - MB01QD.f + MB01QD.f \ + "$(mkoctfile -p LAPACK_LIBS)" \ + "$(mkoctfile -p BLAS_LIBS)" system ("rm *.o"); cd (homedir); Modified: trunk/octave-forge/extra/control-devel/devel/makefile_modred.m =================================================================== --- trunk/octave-forge/extra/control-devel/devel/makefile_modred.m 2011-12-29 22:22:18 UTC (rev 9483) +++ trunk/octave-forge/extra/control-devel/devel/makefile_modred.m 2011-12-29 22:49:10 UTC (rev 9484) @@ -18,7 +18,9 @@ SB03OU.f MA02AD.f MB03QX.f select.f SB03OT.f \ SB02MR.f SB02MS.f MB03QD.f SB02MU.f SB02MV.f \ SB02MW.f MB04ND.f MB04OD.f MB03QY.f SB03OR.f \ - SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f + SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f \ + "$(mkoctfile -p LAPACK_LIBS)" \ + "$(mkoctfile -p BLAS_LIBS)" mkoctfile slab09id.cc \ AB09ID.f TB01PD.f SB08DD.f TB01ID.f TB01KD.f \ @@ -28,7 +30,9 @@ MA02BD.f MB03OY.f MB03QX.f MB01PD.f select.f \ MB01YD.f MB04NY.f MB01ZD.f SB03OT.f MB04OX.f \ MB04OY.f MB03QD.f SB03OY.f MB03QY.f MB01QD.f \ - SB03OR.f SB03OV.f SB04PX.f + SB03OR.f SB03OV.f SB04PX.f \ + "$(mkoctfile -p LAPACK_LIBS)" \ + "$(mkoctfile -p BLAS_LIBS)" mkoctfile slab09jd.cc \ AB09JD.f TB01ID.f TB01KD.f AB07ND.f AB09JV.f \ @@ -38,9 +42,10 @@ MB03PY.f MA02DD.f MB03UD.f MB03QX.f select.f \ SB04PX.f SB03OU.f MB03QD.f MB03QY.f SB03OT.f \ MB04ND.f MB04OD.f SB03OR.f SB03OY.f MB04NY.f \ - MB04OY.f SB03OV.f + MB04OY.f SB03OV.f \ + "$(mkoctfile -p LAPACK_LIBS)" \ + "$(mkoctfile -p BLAS_LIBS)" - system ("rm *.o"); cd (homedir); Modified: trunk/octave-forge/extra/control-devel/src/Makefile =================================================================== --- trunk/octave-forge/extra/control-devel/src/Makefile 2011-12-29 22:22:18 UTC (rev 9483) +++ trunk/octave-forge/extra/control-devel/src/Makefile 2011-12-29 22:49:10 UTC (rev 9484) @@ -1,3 +1,7 @@ +LAPACK_LIBS = $$(mkoctfile -p LAPACK_LIBS) +BLAS_LIBS = $$(mkoctfile -p BLAS_LIBS) +FLIBS = $$(mkoctfile -p FLIBS) + all: slab09hd.oct slab09id.oct slab09jd.oct slsb16ad.oct slsb16bd.oct \ slsb16cd.oct slsb10yd.oct @@ -13,7 +17,8 @@ SB03OU.f MA02AD.f MB03QX.f select.f SB03OT.f \ SB02MR.f SB02MS.f MB03QD.f SB02MU.f SB02MV.f \ SB02MW.f MB04ND.f MB04OD.f MB03QY.f SB03OR.f \ - SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f + SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # balanced truncation & singular perturbation approximation model reduction slab09id.oct: slab09id.cc @@ -25,7 +30,8 @@ MA02BD.f MB03OY.f MB03QX.f MB01PD.f select.f \ MB01YD.f MB04NY.f MB01ZD.f SB03OT.f MB04OX.f \ MB04OY.f MB03QD.f SB03OY.f MB03QY.f MB01QD.f \ - SB03OR.f SB03OV.f SB04PX.f + SB03OR.f SB03OV.f SB04PX.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # hankel-norm approximation model reduction slab09jd.oct: slab09jd.cc @@ -37,7 +43,8 @@ MB03PY.f MA02DD.f MB03UD.f MB03QX.f select.f \ SB04PX.f SB03OU.f MB03QD.f MB03QY.f SB03OT.f \ MB04ND.f MB04OD.f SB03OR.f SB03OY.f MB04NY.f \ - MB04OY.f SB03OV.f + MB04OY.f SB03OV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # balanced truncation & singular perturbation approximation controller reduction slsb16ad.oct: slsb16ad.cc @@ -47,7 +54,8 @@ AB09DD.f AB07ND.f TB01LD.f AB05QD.f SB03OU.f \ MA02AD.f MB03QX.f select.f MB01YD.f MB01ZD.f \ SB03OT.f MB04OY.f MB03QD.f MB04ND.f MB03QY.f \ - SB03OR.f SB03OY.f SB04PX.f MB04NY.f SB03OV.f + SB03OR.f SB03OY.f SB04PX.f MB04NY.f SB03OV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # coprime factorization state-feedback controller reduction slsb16bd.oct: slsb16bd.cc @@ -56,7 +64,8 @@ TB01ID.f AB09AX.f MA02GD.f AB09BX.f TB01WD.f \ MA02DD.f MB03UD.f select.f AB09DD.f SB03OU.f \ MA02AD.f SB03OT.f MB04ND.f MB04OD.f SB03OR.f \ - SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f + SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # frequency-weighted coprime factorization state-feedback controller reduction slsb16cd.oct: slsb16cd.cc @@ -64,7 +73,8 @@ SB16CD.f SB16CY.f AB09IX.f SB03OD.f MB02UD.f \ AB09DD.f MA02AD.f MB03UD.f select.f SB03OU.f \ MB01SD.f SB03OT.f MB04ND.f MB04OD.f SB03OR.f \ - SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f + SB03OY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # fit state-space model to frequency response data slsb10yd.oct: slsb10yd.cc @@ -72,7 +82,8 @@ SB10YD.f DG01MD.f AB04MD.f SB10ZP.f AB07ND.f \ MC01PD.f TD04AD.f TD03AY.f TB01PD.f TB01XD.f \ AB07MD.f TB01UD.f TB01ID.f MB01PD.f MB03OY.f \ - MB01QD.f + MB01QD.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} clean: rm *.o core octave-core *.oct *~ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |