changeset 1986:d2c56366fece

[project @ 1996-03-02 00:15:50 by jwe]
author jwe
date Sat, 02 Mar 1996 00:17:26 +0000
parents a9abae46d75f
children 6df7b42db205
files src/filter.cc src/fsolve.cc
diffstat 2 files changed, 27 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/filter.cc
+++ b/src/filter.cc
@@ -38,17 +38,17 @@
 #include "oct-obj.h"
 #include "help.h"
 
-extern Array<double>
-filter (Array<double>&, Array<double>&, Array<double>&);
+extern MArray<double>
+filter (MArray<double>&, MArray<double>&, MArray<double>&);
 
-extern Array<Complex>
-filter (Array<Complex>&, Array<Complex>&, Array<Complex>&);
+extern MArray<Complex>
+filter (MArray<Complex>&, MArray<Complex>&, MArray<Complex>&);
 
 template <class T>
-Array<T>
-filter (Array<T>& b, Array<T>& a, Array<T>& x, Array<T>& si)
+MArray<T>
+filter (MArray<T>& b, MArray<T>& a, MArray<T>& x, MArray<T>& si)
 {
-  Array<T> y;
+  MArray<T> y;
 
   int a_len  = a.length ();
   int b_len  = b.length ();
@@ -127,22 +127,24 @@
   return y;
 }
 
-extern Array<double>
-filter (Array<double>&, Array<double>&, Array<double>&, Array<double>&);
+extern MArray<double>
+filter (MArray<double>&, MArray<double>&, MArray<double>&,
+	MArray<double>&);
 
-extern Array<Complex>
-filter (Array<Complex>&, Array<Complex>&, Array<Complex>&, Array<Complex>&);
+extern MArray<Complex>
+filter (MArray<Complex>&, MArray<Complex>&, MArray<Complex>&,
+	MArray<Complex>&);
 
 template <class T>
-Array<T>
-filter (Array<T>& b, Array<T>& a, Array<T>& x)
+MArray<T>
+filter (MArray<T>& b, MArray<T>& a, MArray<T>& x)
 {
   int a_len = a.length ();
   int b_len = b.length ();
 
   int si_len = (a_len > b_len ? a_len : b_len) - 1;
 
-  Array<T> si (si_len, 0.0);
+  MArray<T> si (si_len, 0.0);
 
   return filter (b, a, x, si);
 }
@@ -273,17 +275,19 @@
   return retval;
 }
 
-template Array<double>
-filter (Array<double>&, Array<double>&, Array<double>&, Array<double>&);
+template MArray<double>
+filter (MArray<double>&, MArray<double>&, MArray<double>&,
+	MArray<double>&);
 
-template Array<double>
-filter (Array<double>&, Array<double>&, Array<double>&);
+template MArray<double>
+filter (MArray<double>&, MArray<double>&, MArray<double>&);
 
-template Array<Complex>
-filter (Array<Complex>&, Array<Complex>&, Array<Complex>&, Array<Complex>&);
+template MArray<Complex>
+filter (MArray<Complex>&, MArray<Complex>&, MArray<Complex>&,
+	MArray<Complex>&);
 
-template Array<Complex>
-filter (Array<Complex>&, Array<Complex>&, Array<Complex>&);
+template MArray<Complex>
+filter (MArray<Complex>&, MArray<Complex>&, MArray <Complex>&);
 
 /*
 ;;; Local Variables: ***
--- a/src/fsolve.cc
+++ b/src/fsolve.cc
@@ -283,7 +283,7 @@
   return retval;
 }
 
-DEFUN_DLD_BUILTIN (fsolve_options, args, nargout,
+DEFUN_DLD_BUILTIN (fsolve_options, args, ,
   "fsolve_options (KEYWORD, VALUE)\n\
 \n\
 Set or show options for fsolve.  Keywords may be abbreviated\n\