Mercurial > octave

changeset 272:7ec58832918f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1994-01-06 18:54:08 by jwe]
author jwe
date Thu, 06 Jan 1994 18:54:08 +0000
parents 64b486b19ce4
children dd9b9719b799
files src/builtins.cc src/dassl.cc src/fsolve.cc src/fsqp.cc src/g-builtins.cc src/g-builtins.h src/lpsolve.cc src/lsode.cc src/npsol.cc src/qpsol.cc src/quad.cc
diffstat 11 files changed, 274 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/builtins.cc	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/builtins.cc	Thu Jan 06 18:54:08 1994 +0000
@@ -262,6 +262,9 @@
 \n\
 where x, xdot, and res are vectors, and t is a scalar.", },
 
+  { "dassl_options", -1, 1, builtin_dassl_options,
+    "dassl_options (keyword, value): set or show options for dassl", },
+
   { "date", 1, 0, builtin_date,
     "date (): return current date in a string", },
 
@@ -354,6 +357,9 @@
 \n\
 where y and x are vectors.", },
 
+  { "fsolve_options", -1, 1, builtin_fsolve_options,
+    "fsolve_options (keyword, value): set or show options for fsolve", },
+
   { "fsqp", 11, 3, builtin_fsqp,
 #if defined (FSQP_MISSING)
     "This function requires FSQP, which is not freely\n\
@@ -365,6 +371,9 @@
   must appear in the same relative order shown above.", },
 #endif
 
+  { "fsqp_options", -1, 1, builtin_fsqp_options,
+    "fsqp_options (keyword, value): set or show options for fsqp", },
+
   { "ftell", 2, 1, builtin_ftell,
     "position = ftell (\"filename\" or filenum): returns the current file position", },
 
@@ -410,6 +419,9 @@
   { "lp_solve", 11, 3, builtin_lpsolve,
     "lp_solve (): solve linear programs using lp_solve.", },
 
+  { "lp_solve_options", -1, 1, builtin_lpsolve_options,
+    "lp_solve_options (keyword, value): set or show options for lp_solve", },
+
   { "lsode", 6, 1, builtin_lsode,
     "lsode (\"function_name\", x0, t_out, t_crit)\n\
 \n\
@@ -420,6 +432,9 @@
 \n\
 where xdot and x are vectors and t is a scalar.\n", },
 
+  { "lsode_options", -1, 1, builtin_lsode_options,
+    "lsode_options (keyword, value): set or show options for lsode", },
+
   { "lu", 2, 3, builtin_lu,
     "[L, U, P] = lu (A): LU factorization", },
 
@@ -447,6 +462,9 @@
   where x is a vector and y is a scalar.", },
 #endif
 
+  { "npsol_options", -1, 1, builtin_npsol_options,
+    "npsol_options (keyword, value): set or show options for npsol", },
+
   { "ones", 3, 1, builtin_ones,
     "ones (n), ones (n, m), ones (x): create a matrix of all ones", },
 
@@ -477,6 +495,9 @@
   must appear in the same relative order shown above.", },
 #endif
 
+  { "qpsol_options", -1, 1, builtin_qpsol_options,
+    "qpsol_options (keyword, value): set or show options for qpsol", },
+
   { "qr", 2, 2, builtin_qr,
     "[q, r] = qr (X): form QR factorization of X", },
 
@@ -495,6 +516,9 @@
 accuracy of the result.  The optional argument sing is a vector of\n\
 at which the integrand is singular.\n", },
 
+  { "quad_options", -1, 1, builtin_quad_options,
+    "quad_options (keyword, value): set or show options for quad", },
+
   { "quit", 1, 0, builtin_quit,
     "quit (): exit Octave gracefully", },
 
--- a/src/dassl.cc	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/dassl.cc	Thu Jan 06 18:54:08 1994 +0000
@@ -43,6 +43,12 @@
 {
   return dassl (args, nargin, nargout);
 }
+
+tree_constant *
+builtin_dassl_options_2 (const tree_constant *args, int nargin, int nargout)
+{
+  return dassl_options (args, nargin, nargout);
+}
 #endif
 
 ColumnVector
@@ -162,10 +168,19 @@
   return retval;
 }
 
+tree_constant *
+dassl_options (const tree_constant *args, int nargin, int nargout)
+{
+// Assumes that we have been given the correct number of arguments.
+
+  tree_constant *retval = NULL_TREE_CONST;
+  error ("dassl_options: not implemented yet");
+  return retval;
+}
+
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***
 ;;; page-delimiter: "^/\\*" ***
 ;;; End: ***
 */
-
--- a/src/fsolve.cc	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/fsolve.cc	Thu Jan 06 18:54:08 1994 +0000
@@ -43,6 +43,12 @@
 {
   return fsolve (args, nargin, nargout);
 }
+
+tree_constant *
+builtin_fsolve_options (const tree_constant *args, int nargin, int nargout)
+{
+  return fsolve_options (args, nargin, nargout);
+}
 #endif
 
 int
@@ -162,10 +168,19 @@
   return retval;
 }
 
+tree_constant *
+fsolve_options (const tree_constant *args, int nargin, int nargout)
+{
+// Assumes that we have been given the correct number of arguments.
+
+  tree_constant *retval = NULL_TREE_CONST;
+  error ("fsolve_options: not implemented yet");
+  return retval;
+}
+
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***
 ;;; page-delimiter: "^/\\*" ***
 ;;; End: ***
 */
-
--- a/src/fsqp.cc	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/fsqp.cc	Thu Jan 06 18:54:08 1994 +0000
@@ -43,6 +43,12 @@
 {
   return fsqp (args, nargin, nargout);
 }
+
+tree_constant *
+builtin_fsqp_options_2 (const tree_constant *args, int nargin, int nargout)
+{
+  return fsqp_options (args, nargin, nargout);
+}
 #endif
 
 double
@@ -83,6 +89,16 @@
   return retval;
 }
 
+tree_constant *
+fsqp_options (const tree_constant *args, int nargin, int nargout)
+{
+// Assumes that we have been given the correct number of arguments.
+
+  tree_constant *retval = NULL_TREE_CONST;
+  error ("fsqp_options: not implemented yet");
+  return retval;
+}
+
 #endif
 
 /*
--- a/src/g-builtins.cc	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/g-builtins.cc	Thu Jan 06 18:54:08 1994 +0000
@@ -1,7 +1,7 @@
 // g-builtins.cc                                           -*- C++ -*-
 /*
 
-Copyright (C) 1992, 1993 John W. Eaton
+Copyright (C) 1992, 1993, 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -330,6 +330,20 @@
   return retval;
 }
 
+tree_constant *
+builtin_dassl_options (const tree_constant *args, int nargin, int nargout)
+{
+  tree_constant *retval = NULL_TREE_CONST;
+
+  if (nargin >= 3 && nargin <= 7 && nargout >= 1 && nargout <= 3)
+    DLD_BUILTIN (args, nargin, nargout, dassl_options,
+		 retval = dassl_options (args, nargin, nargout);)
+  else
+    print_usage ("dassl_options");
+
+  return retval;
+}
+
 /*
  * Time in a string.
  */
@@ -778,6 +792,20 @@
   return retval;
 }
 
+tree_constant *
+builtin_fsolve_options (const tree_constant *args, int nargin, int nargout)
+{
+  tree_constant *retval = NULL_TREE_CONST;
+
+  if (nargin >= 3 && nargin <= 7 && nargout >= 1 && nargout <= 3)
+    DLD_BUILTIN (args, nargin, nargout, fsolve_options,
+		 retval = fsolve_options (args, nargin, nargout);)
+  else
+    print_usage ("fsolve_options");
+
+  return retval;
+}
+
 /*
  * NLPs.
  */
@@ -801,6 +829,20 @@
   return retval;
 }
 
+tree_constant *
+builtin_fsqp_options (const tree_constant *args, int nargin, int nargout)
+{
+  tree_constant *retval = NULL_TREE_CONST;
+
+  if (nargin >= 3 && nargin <= 7 && nargout >= 1 && nargout <= 3)
+    DLD_BUILTIN (args, nargin, nargout, fsqp_options,
+		 retval = fsqp_options (args, nargin, nargout);)
+  else
+    print_usage ("fsqp_options");
+
+  return retval;
+}
+
 /*
  * tell current position of file
  */
@@ -1001,6 +1043,20 @@
   return retval;
 }
 
+tree_constant *
+builtin_lpsolve_options (const tree_constant *args, int nargin, int nargout)
+{
+  tree_constant *retval = NULL_TREE_CONST;
+
+  if (nargin >= 3 && nargin <= 7 && nargout >= 1 && nargout <= 3)
+    DLD_BUILTIN (args, nargin, nargout, lpsolve_options,
+		 retval = lpsolve_options (args, nargin, nargout);)
+  else
+    print_usage ("lpsolve_options");
+
+  return retval;
+}
+
 /*
  * ODEs.
  */
@@ -1018,6 +1074,20 @@
   return retval;
 }
 
+tree_constant *
+builtin_lsode_options (const tree_constant *args, int nargin, int nargout)
+{
+  tree_constant *retval = NULL_TREE_CONST;
+
+  if (nargin >= 3 && nargin <= 7 && nargout >= 1 && nargout <= 3)
+    DLD_BUILTIN (args, nargin, nargout, lsode_options,
+		 retval = lsode_options (args, nargin, nargout);)
+  else
+    print_usage ("lsode_options");
+
+  return retval;
+}
+
 /*
  * LU factorization.
  */
@@ -1099,6 +1169,20 @@
   return retval;
 }
 
+tree_constant *
+builtin_npsol_options (const tree_constant *args, int nargin, int nargout)
+{
+  tree_constant *retval = NULL_TREE_CONST;
+
+  if (nargin >= 3 && nargin <= 7 && nargout >= 1 && nargout <= 3)
+    DLD_BUILTIN (args, nargin, nargout, npsol_options,
+		 retval = npsol_options (args, nargin, nargout);)
+  else
+    print_usage ("npsol_options");
+
+  return retval;
+}
+
 /*
  * A matrix of ones.
  */
@@ -1260,6 +1344,20 @@
   return retval;
 }
 
+tree_constant *
+builtin_qpsol_options (const tree_constant *args, int nargin, int nargout)
+{
+  tree_constant *retval = NULL_TREE_CONST;
+
+  if (nargin >= 3 && nargin <= 7 && nargout >= 1 && nargout <= 3)
+    DLD_BUILTIN (args, nargin, nargout, qpsol_options,
+		 retval = qpsol_options (args, nargin, nargout);)
+  else
+    print_usage ("qpsol_options");
+
+  return retval;
+}
+
 /*
  * QR factorization.
  */
@@ -1311,6 +1409,20 @@
   return retval;
 }
 
+tree_constant *
+builtin_quad_options (const tree_constant *args, int nargin, int nargout)
+{
+  tree_constant *retval = NULL_TREE_CONST;
+
+  if (nargin >= 3 && nargin <= 7 && nargout >= 1 && nargout <= 3)
+    DLD_BUILTIN (args, nargin, nargout, quad_options,
+		 retval = quad_options (args, nargin, nargout);)
+  else
+    print_usage ("quad_options");
+
+  return retval;
+}
+
 /*
  * I'm outta here.
  */
@@ -1722,7 +1834,7 @@
 {
   ostrstream output_buf;
   output_buf << "\n    Octave, version " << version_string
-	     << ".  Copyright (C) 1992, 1993, John W. Eaton\n"
+	     << ".  Copyright (C) 1992, 1993, 1994 John W. Eaton\n"
 	     << "\n\
     This program is free software; you can redistribute it and/or modify\n\
     it under the terms of the GNU General Public License as published by\n\
--- a/src/g-builtins.h	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/g-builtins.h	Thu Jan 06 18:54:08 1994 +0000
@@ -46,6 +46,7 @@
 extern tree_constant *builtin_cumprod (const tree_constant *, int, int);
 extern tree_constant *builtin_cumsum (const tree_constant *, int, int);
 extern tree_constant *builtin_dassl (const tree_constant *, int, int);
+extern tree_constant *builtin_dassl_options (const tree_constant *, int, int);
 extern tree_constant *builtin_date (const tree_constant *, int, int);
 extern tree_constant *builtin_det (const tree_constant *, int, int);
 extern tree_constant *builtin_diag (const tree_constant *, int, int);
@@ -70,7 +71,9 @@
 extern tree_constant *builtin_fscanf (const tree_constant *, int, int);
 extern tree_constant *builtin_fseek (const tree_constant *, int, int);
 extern tree_constant *builtin_fsolve (const tree_constant *, int, int);
+extern tree_constant *builtin_fsolve_options (const tree_constant *, int, int);
 extern tree_constant *builtin_fsqp (const tree_constant *, int, int);
+extern tree_constant *builtin_fsqp_options (const tree_constant *, int, int);
 extern tree_constant *builtin_ftell (const tree_constant *, int, int);
 extern tree_constant *builtin_getenv (const tree_constant *, int, int);
 extern tree_constant *builtin_givens (const tree_constant *, int, int);
@@ -83,11 +86,14 @@
 extern tree_constant *builtin_keyboard (const tree_constant *, int, int);
 extern tree_constant *builtin_logm (const tree_constant *, int, int);
 extern tree_constant *builtin_lpsolve (const tree_constant *, int, int);
+extern tree_constant *builtin_lpsolve_options (const tree_constant *, int, int);
 extern tree_constant *builtin_lsode (const tree_constant *, int, int);
+extern tree_constant *builtin_lsode_options (const tree_constant *, int, int);
 extern tree_constant *builtin_lu (const tree_constant *, int, int);
 extern tree_constant *builtin_max (const tree_constant *, int, int);
 extern tree_constant *builtin_min (const tree_constant *, int, int);
 extern tree_constant *builtin_npsol (const tree_constant *, int, int);
+extern tree_constant *builtin_npsol_options (const tree_constant *, int, int);
 extern tree_constant *builtin_ones (const tree_constant *, int, int);
 extern tree_constant *builtin_pause (const tree_constant *, int, int);
 extern tree_constant *builtin_purge_tmp_files (const tree_constant *,
@@ -96,8 +102,10 @@
 extern tree_constant *builtin_prod (const tree_constant *, int, int);
 extern tree_constant *builtin_pwd (const tree_constant *, int, int);
 extern tree_constant *builtin_qpsol (const tree_constant *, int, int);
+extern tree_constant *builtin_qpsol_options (const tree_constant *, int, int);
 extern tree_constant *builtin_qr (const tree_constant *, int, int);
 extern tree_constant *builtin_quad (const tree_constant *, int, int);
+extern tree_constant *builtin_quad_options (const tree_constant *, int, int);
 extern tree_constant *builtin_quit (const tree_constant *, int, int);
 extern tree_constant *builtin_qzval (const tree_constant *, int, int);
 extern tree_constant *builtin_rand (const tree_constant *, int, int);
--- a/src/lpsolve.cc	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/lpsolve.cc	Thu Jan 06 18:54:08 1994 +0000
@@ -37,6 +37,12 @@
 {
   return lpsolve (args, nargin, nargout);
 }
+
+tree_constant *
+builtin_lpsolve_options_2 (const tree_constant *args, int nargin, int nargout) 
+{
+  return lpsolve_options (args, nargin, nargout);
+}
 #endif
 
 tree_constant *
@@ -49,6 +55,16 @@
   return retval;
 }
 
+tree_constant *
+lpsolve_options (const tree_constant *args, int nargin, int nargout)
+{
+// Assumes that we have been given the correct number of arguments.
+
+  tree_constant *retval = NULL_TREE_CONST;
+  error ("lpsolve_options: not implemented yet");
+  return retval;
+}
+
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***
--- a/src/lsode.cc	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/lsode.cc	Thu Jan 06 18:54:08 1994 +0000
@@ -43,6 +43,12 @@
 {
   return lsode (args, nargin, nargout);
 }
+
+tree_constant *
+builtin_lsode_options_2 (const tree_constant *args, int nargin, int nargout)
+{
+  return lsode_options (args, nargin, nargout);
+}
 #endif
 
 ColumnVector
@@ -144,6 +150,16 @@
   return retval;
 }
 
+tree_constant *
+lsode_options (const tree_constant *args, int nargin, int nargout)
+{
+// Assumes that we have been given the correct number of arguments.
+
+  tree_constant *retval = NULL_TREE_CONST;
+  error ("lsode_options: not implemented yet");
+  return retval;
+}
+
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***
--- a/src/npsol.cc	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/npsol.cc	Thu Jan 06 18:54:08 1994 +0000
@@ -46,6 +46,12 @@
 {
   return npsol (args, nargin, nargout);
 }
+
+tree_constant *
+builtin_npsol_options_2 (const tree_constant *args, int nargin, int nargout)
+{
+  return npsol_options (args, nargin, nargout);
+}
 #endif
 
 double
@@ -480,6 +486,16 @@
   return retval;
 }
 
+tree_constant *
+npsol_options (const tree_constant *args, int nargin, int nargout)
+{
+// Assumes that we have been given the correct number of arguments.
+
+  tree_constant *retval = NULL_TREE_CONST;
+  error ("npsol_options: not implemented yet");
+  return retval;
+}
+
 #endif
 
 /*
--- a/src/qpsol.cc	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/qpsol.cc	Thu Jan 06 18:54:08 1994 +0000
@@ -49,6 +49,12 @@
 {
   return qpsol (args, nargin, nargout);
 }
+
+tree_constant *
+builtin_qpsol_options_2 (const tree_constant *args, int nargin, int nargout)
+{
+  return qpsol_options (args, nargin, nargout);
+}
 #endif
 
 tree_constant *
@@ -185,6 +191,16 @@
   return retval;
 }
 
+tree_constant *
+qpsol_options (const tree_constant *args, int nargin, int nargout)
+{
+// Assumes that we have been given the correct number of arguments.
+
+  tree_constant *retval = NULL_TREE_CONST;
+  error ("qpsol_options: not implemented yet");
+  return retval;
+}
+
 #endif
 
 /*
--- a/src/quad.cc	Thu Jan 06 18:34:12 1994 +0000
+++ b/src/quad.cc	Thu Jan 06 18:54:08 1994 +0000
@@ -44,6 +44,12 @@
 {
   return do_quad (args, nargin, nargout);
 }
+
+tree_constant *
+builtin_quad_options_2 (const tree_constant *args, int nargin, int nargout)
+{
+  return quad_options (args, nargin, nargout);
+}
 #endif
 
 double
@@ -189,10 +195,19 @@
   return retval;
 }
 
+tree_constant *
+quad_options (const tree_constant *args, int nargin, int nargout)
+{
+// Assumes that we have been given the correct number of arguments.
+
+  tree_constant *retval = NULL_TREE_CONST;
+  error ("quad_options: not implemented yet");
+  return retval;
+}
+
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***
 ;;; page-delimiter: "^/\\*" ***
 ;;; End: ***
 */
-