# HG changeset patch # User jwe # Date 744782111 0 # Node ID c9d293a496cf060aa2f77bc2073df57ba7f3f0bb # Parent bd072d0a95f9fa2b2f929f78cad2abdff94ffd75 [project @ 1993-08-08 03:55:11 by jwe] diff --git a/src/Makefile.in b/src/Makefile.in --- a/src/Makefile.in +++ b/src/Makefile.in @@ -51,24 +51,27 @@ mv $@.tmp $@ ; \ fi -INCLUDES = arith-ops.h builtins.h dynamic-ld.h error.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 tree-base.h tree-const.h tree.h \ - unwind-prot.h user-prefs.h utils.h variables.h version.h \ - xdiv.h xpow.h SLStack.h Stack.h +INCLUDES = arith-ops.h builtins.h dynamic-ld.h error.h f-colloc.h \ + f-dassl.h f-det.h f-eig.h f-fft.h f-fsolve.h f-fsqp.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 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 \ + tree-base.h tree-const.h tree.h unwind-prot.h user-prefs.h \ + utils.h variables.h version.h xdiv.h xpow.h SLStack.h Stack.h SOURCES = arith-ops.cc builtins.cc dynamic-ld.cc error.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 \ - sysdep.cc t-builtins.cc tc-assign.cc tc-colloc.cc \ - tc-dassl.cc tc-det.cc tc-eig.cc tc-extras.cc tc-fft.cc \ - tc-fsolve.cc tc-fsqp.cc tc-hess.cc tc-ifft.cc tc-index.cc \ - tc-inlines.cc tc-inv.cc tc-lpsolve.cc tc-lsode.cc tc-lu.cc \ - tc-npsol.cc tc-qpsol.cc tc-qr.cc tc-quad.cc tc-rand.cc \ - tc-schur.cc tc-svd.cc tree.cc tree-const.cc tree-plot.cc \ + sysdep.cc t-builtins.cc tc-assign.cc f-colloc.cc \ + f-dassl.cc f-det.cc f-eig.cc tc-extras.cc f-fft.cc \ + f-fsolve.cc f-fsqp.cc f-hess.cc f-ifft.cc tc-index.cc \ + tc-inlines.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 tree.cc tree-const.cc tree-plot.cc \ unwind-prot.cc user-prefs.cc utils.cc variables.cc xdiv.cc \ xpow.cc @@ -76,10 +79,10 @@ DEP_SOURCES = $(patsubst %.y, %.cc, $(DEP_SOURCES_1)) MAKEDEPS = $(patsubst %.cc, %.d, $(DEP_SOURCES)) -DLD_OBJECTS = tc-colloc.o tc-dassl.o tc-det.o tc-eig.o \ - tc-fft.o tc-fsolve.o tc-fsqp.o tc-hess.o tc-ifft.o tc-inv.o \ - tc-lpsolve.o tc-lsode.o tc-lu.o tc-npsol.o tc-qpsol.o tc-qr.o \ - tc-quad.o tc-rand.o tc-schur.o tc-svd.o +DLD_OBJECTS = f-colloc.o f-dassl.o f-det.o f-eig.o \ + f-fft.o f-fsolve.o f-fsqp.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 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 \ diff --git a/src/g-builtins.cc b/src/g-builtins.cc --- a/src/g-builtins.cc +++ b/src/g-builtins.cc @@ -46,6 +46,27 @@ #include #include +#include "f-colloc.h" +#include "f-dassl.h" +#include "f-det.h" +#include "f-eig.h" +#include "f-fft.h" +#include "f-fsolve.h" +#include "f-fsqp.h" +#include "f-hess.h" +#include "f-ifft.h" +#include "f-inv.h" +#include "f-lpsolve.h" +#include "f-lsode.h" +#include "f-lu.h" +#include "f-npsol.h" +#include "f-qpsol.h" +#include "f-qr.h" +#include "f-quad.h" +#include "f-rand.h" +#include "f-schur.h" +#include "f-svd.h" + #include "procstream.h" #include "error.h" #include "variables.h" @@ -54,6 +75,7 @@ #include "user-prefs.h" #include "utils.h" #include "tree.h" +#include "tree-const.h" #include "input.h" #include "pager.h" #include "octave.h" diff --git a/src/pt-const.h b/src/pt-const.h --- a/src/pt-const.h +++ b/src/pt-const.h @@ -466,9 +466,6 @@ tree_constant diag (void); tree_constant diag (tree_constant& a); - friend tree_constant fft (tree_constant& a); - friend tree_constant ifft (tree_constant& a); - friend tree_constant fill_matrix (tree_constant& a, double d, char *warn_for); friend tree_constant fill_matrix (tree_constant& a, tree_constant& b, @@ -477,55 +474,18 @@ friend tree_constant identity_matrix (tree_constant& a); friend tree_constant identity_matrix (tree_constant& a, tree_constant& b); - friend tree_constant inverse (tree_constant& a); - friend tree_constant determinant (tree_constant& a); - friend tree_constant find_nonzero_elem_idx (tree_constant& a); - friend tree_constant *lu (tree_constant& a, int nargout); - friend tree_constant *qr (tree_constant& a, int nargout); - friend tree_constant *matrix_exp (tree_constant& a); friend tree_constant *matrix_log (tree_constant& a); friend tree_constant *matrix_sqrt (tree_constant& a); - friend tree_constant *collocation_weights (tree_constant *args, - int nargin); - friend tree_constant *column_max (tree_constant *args, int nargin, int nargout); friend tree_constant *column_min (tree_constant *args, int nargin, int nargout); - friend tree_constant *hess (tree_constant *args, int nargin, int nargout); - friend tree_constant *eig (tree_constant *args, int nargin, int nargout); - friend tree_constant *schur (tree_constant *args, int nargin, int nargout); - friend tree_constant *svd (tree_constant *args, int nargin, int nargout); - friend tree_constant *lsode (tree_constant *args, int nargin, int nargout); - friend tree_constant *dassl (tree_constant *args, int nargin, int nargout); - -#ifndef NPSOL_MISSING - friend tree_constant *npsol (tree_constant *args, int nargin, int nargout); -#endif - -#ifndef QPSOL_MISSING - friend tree_constant *qpsol (tree_constant *args, int nargin, int nargout); -#endif - -#ifndef FSQP_MISSING - friend tree_constant *fsqp (tree_constant *args, int nargin, int nargout); -#endif - - friend tree_constant *lpsolve (tree_constant *args, int nargin, int nargout); - - friend tree_constant *fsolve (tree_constant *args, int nargin, int nargout); - - friend tree_constant *do_quad (tree_constant *args, int nargin, int nargout); - - friend tree_constant *rand_internal (tree_constant *args, int nargin, - int nargout); - friend tree_constant *sort (tree_constant *args, int nargin, int nargout); friend tree_constant *feval (tree_constant *args, int nargin, int nargout);