changeset 46:80ea39e3c917

[project @ 1993-08-10 22:58:17 by jwe]
author jwe
date Tue, 10 Aug 1993 22:58:49 +0000
parents 53764ee8f358
children ed620db95182
files src/Makefile.in src/g-builtins.cc src/syl.cc
diffstat 3 files changed, 18 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.in	Tue Aug 10 22:34:19 1993 +0000
+++ b/src/Makefile.in	Tue Aug 10 22:58:49 1993 +0000
@@ -52,11 +52,11 @@
 	fi
 
 INCLUDES = arith-ops.h builtins.h dynamic-ld.h defaults.h.in error.h \
-	f-balance.h f-colloc.h f-dassl.h f-det.h f-eig.h f-fft.h \ 
+	f-balance.h f-colloc.h f-dassl.h f-det.h f-eig.h f-fft.h \
 	f-fsolve.h f-fsqp.h f-givens.h f-hess.h f-ifft.h f-inv.h \
 	f-lpsolve.h f-lsode.h f-lu.h f-npsol.h f-qpsol.h f-qr.h \
-	f-quad.h f-rand.h f-schur.h f-svd.h f-syl.h file-io.h \
-	g-builtins.h gripes.h help.h \
+	f-quad.h f-qzval.h f-rand.h f-schur.h f-svd.h f-syl.h \
+	file-io.h g-builtins.h gripes.h help.h \
 	idx-vector.h input.h lex.h mappers.h missing-math.h octave.h \
 	octave-hist.h pager.h parse.h pr-output.h procstream.h \
 	sighandlers.h statdefs.h symtab.h sysdep.h t-builtins.h \
@@ -68,7 +68,7 @@
 	f-eig.cc tc-extras.cc f-fft.cc f-fsolve.cc f-fsqp.cc \
 	f-givens.cc f-hess.cc f-ifft.cc f-inv.cc f-lpsolve.cc \
 	f-lsode.cc f-lu.cc f-npsol.cc f-qpsol.cc f-qr.cc f-quad.cc \
-	f-rand.cc f-schur.cc f-svd.cc f-syl.cc file-io.cc \
+	f-qzval.cc f-rand.cc f-schur.cc f-svd.cc f-syl.cc file-io.cc \
 	g-builtins.cc gripes.cc help.cc idx-vector.cc input.cc lex.l \
 	mappers.cc octave.cc octave-hist.cc pager.cc parse.y \
 	pr-output.cc procstream.cc sighandlers.cc symtab.cc \
@@ -84,7 +84,7 @@
 DLD_OBJECTS = f-balance.o f-colloc.o f-dassl.o f-det.o f-eig.o \
 	f-fft.o f-fsolve.o f-fsqp.o f-givens.o f-hess.o f-ifft.o \
 	f-inv.o f-lpsolve.o f-lsode.o f-lu.o f-npsol.o f-qpsol.o \
-	f-qr.o f-quad.o f-rand.o f-schur.o f-svd.o f-syl.o
+	f-qr.o f-quad.o f-qzval.o f-rand.o f-schur.o f-svd.o f-syl.o
 
 OBJECTS = arith-ops.o builtins.o error.o file-io.o g-builtins.o \
 	gripes.o help.o idx-vector.o input.o lex.o mappers.o \
--- a/src/g-builtins.cc	Tue Aug 10 22:34:19 1993 +0000
+++ b/src/g-builtins.cc	Tue Aug 10 22:58:49 1993 +0000
@@ -65,6 +65,7 @@
 #include "f-qpsol.h"
 #include "f-qr.h"
 #include "f-quad.h"
+#include "f-qzval.h"
 #include "f-rand.h"
 #include "f-schur.h"
 #include "f-svd.h"
--- a/src/syl.cc	Tue Aug 10 22:34:19 1993 +0000
+++ b/src/syl.cc	Tue Aug 10 22:58:49 1993 +0000
@@ -34,15 +34,17 @@
 #include "gripes.h"
 #include "error.h"
 
-int F77_FCN (dtrsyl) (const char*, const char*, const int*, const
-		      int*, const int*, const double*, const int*,
-		      const double*, const int*, const double*, const
-		      int*, double*, int*, long, long);
+int F77_FCN (dtrsyl) (const char*, const char*, const int*,
+		      const int*, const int*, const double*,
+		      const int*, const double*, const int*,
+		      const double*, const int*, double*, int*, long,
+		      long);
  
-int F77_FCN (ztrsyl) (const char*, const char*, const int*, const
-		      int*, const int*, const Complex*, const int*,
-		      const Complex*, const int*, const Complex*,
-		      const int*, double*, int*, long, long);
+int F77_FCN (ztrsyl) (const char*, const char*, const int*,
+		      const int*, const int*, const Complex*,
+		      const int*, const Complex*, const int*,
+		      const Complex*, const int*, double*, int*, long,
+		      long);
 
 // Local function: check for empty matrix arguments.  Probably should make 
 // this available elsewhere, since tc-xxx functions do this a lot.
@@ -188,7 +190,7 @@
 	ComplexMatrix ub = bs.unitary_matrix ();
 	ComplexMatrix sch_b = bs.schur_matrix ();
   
-	cx = ua.hermitian () * cc * ub;
+	ComplexMatrix cx = ua.hermitian () * cc * ub;
   
 // Solve the sylvester equation, back-transform, and return the solution.
   
@@ -227,7 +229,7 @@
 	Matrix ub = bs.unitary_matrix ();
 	Matrix sch_b = bs.schur_matrix ();
   
-	cx = ua.transpose () * cc * ub;
+	Matrix cx = ua.transpose () * cc * ub;
   
 // Solve the sylvester equation, back-transform, and return the solution.