# HG changeset patch
# User jwe
# Date 1035411054 0
# Node ID 19a1626b8d578cd88e23b00de578402865eaac42
# Parent  a0c710c20da585bed79032782bd0a3c50d20ebfb
[project @ 2002-10-23 22:10:53 by jwe]

diff -r a0c710c20da5 -r 19a1626b8d57 ChangeLog
--- a/ChangeLog	Wed Oct 23 03:34:11 2002 +0000
+++ b/ChangeLog	Wed Oct 23 22:10:54 2002 +0000
@@ -1,3 +1,8 @@
+2002-10-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* mk-opts.pl (emit_opt_class_header): Make set_options another
+	name for copy.
+
 2002-10-17  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makeconf.in (do-subst-config-vals): Don't substitute
diff -r a0c710c20da5 -r 19a1626b8d57 mk-opts.pl
--- a/mk-opts.pl	Wed Oct 23 03:34:11 2002 +0000
+++ b/mk-opts.pl	Wed Oct 23 22:10:54 2002 +0000
@@ -406,6 +406,11 @@
   print "      reset = opt.reset;
     }\n";
 
+  ## For backward compatibility and because set_options is probably
+  ## a better name in some contexts:
+
+  print "\n  void set_options (const ${class_name}& opt) { copy (opt); }\n";
+
   print "\n  void set_default_options (void) { init (); }\n";
 
   for ($i = 0; $i < $opt_num; $i++)
diff -r a0c710c20da5 -r 19a1626b8d57 src/ChangeLog
--- a/src/ChangeLog	Wed Oct 23 03:34:11 2002 +0000
+++ b/src/ChangeLog	Wed Oct 23 22:10:54 2002 +0000
@@ -1,3 +1,13 @@
+2002-10-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* DLD-FUNCTIONS/daspk.cc (daspk): Use set_options, not copy. 
+	* DLD-FUNCTIONS/dasrt.cc (dasrt): Likewise.
+	* DLD-FUNCTIONS/dassl.cc (dassl): Likewise.
+	* DLD-FUNCTIONS/fsolve.cc (fsolve): Likewise.
+	* DLD-FUNCTIONS/lsode.cc (lsode): Likewise.
+	* DLD-FUNCTIONS/odessa.cc (Fodessa): Likewise.
+	* DLD-FUNCTIONS/quad.cc (Fquad): Likewise.
+
 2002-10-22  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* oct-map.cc (Octave_map::assign): Fix typo in resizing.
diff -r a0c710c20da5 -r 19a1626b8d57 src/DLD-FUNCTIONS/daspk.cc
--- a/src/DLD-FUNCTIONS/daspk.cc	Wed Oct 23 03:34:11 2002 +0000
+++ b/src/DLD-FUNCTIONS/daspk.cc	Wed Oct 23 22:10:54 2002 +0000
@@ -289,7 +289,7 @@
 
       DAEFunc func (daspk_user_function);
       DASPK dae (state, deriv, tzero, func);
-      dae.copy (daspk_opts);
+      dae.set_options (daspk_opts);
 
       Matrix output;
       Matrix deriv_output;
diff -r a0c710c20da5 -r 19a1626b8d57 src/DLD-FUNCTIONS/dasrt.cc
--- a/src/DLD-FUNCTIONS/dasrt.cc	Wed Oct 23 03:34:11 2002 +0000
+++ b/src/DLD-FUNCTIONS/dasrt.cc	Wed Oct 23 22:10:54 2002 +0000
@@ -494,7 +494,7 @@
 
   DASRT dae = DASRT (state, stateprime, tzero, func);
 
-  dae.copy (dasrt_opts);
+  dae.set_options (dasrt_opts);
 
   if (crit_times_set)
     output = dae.integrate (out_times, crit_times);
diff -r a0c710c20da5 -r 19a1626b8d57 src/DLD-FUNCTIONS/dassl.cc
--- a/src/DLD-FUNCTIONS/dassl.cc	Wed Oct 23 03:34:11 2002 +0000
+++ b/src/DLD-FUNCTIONS/dassl.cc	Wed Oct 23 22:10:54 2002 +0000
@@ -394,7 +394,7 @@
 
       DASSL dae (state, deriv, tzero, func);
 
-      dae.copy (dassl_opts);
+      dae.set_options (dassl_opts);
 
       Matrix output;
       Matrix deriv_output;
diff -r a0c710c20da5 -r 19a1626b8d57 src/DLD-FUNCTIONS/fsolve.cc
--- a/src/DLD-FUNCTIONS/fsolve.cc	Wed Oct 23 03:34:11 2002 +0000
+++ b/src/DLD-FUNCTIONS/fsolve.cc	Wed Oct 23 22:10:54 2002 +0000
@@ -193,7 +193,7 @@
 
       NLFunc nleqn_fcn (fsolve_user_function);
       NLEqn nleqn (x, nleqn_fcn);
-      nleqn.copy (fsolve_opts);
+      nleqn.set_options (fsolve_opts);
 
       int info;
       ColumnVector soln = nleqn.solve (info);
diff -r a0c710c20da5 -r 19a1626b8d57 src/DLD-FUNCTIONS/lsode.cc
--- a/src/DLD-FUNCTIONS/lsode.cc	Wed Oct 23 03:34:11 2002 +0000
+++ b/src/DLD-FUNCTIONS/lsode.cc	Wed Oct 23 22:10:54 2002 +0000
@@ -358,7 +358,7 @@
 
       LSODE ode (state, tzero, func);
 
-      ode.copy (lsode_opts);
+      ode.set_options (lsode_opts);
 
       Matrix output;
       if (crit_times_set)
diff -r a0c710c20da5 -r 19a1626b8d57 src/DLD-FUNCTIONS/odessa.cc
--- a/src/DLD-FUNCTIONS/odessa.cc	Wed Oct 23 03:34:11 2002 +0000
+++ b/src/DLD-FUNCTIONS/odessa.cc	Wed Oct 23 22:10:54 2002 +0000
@@ -517,7 +517,7 @@
 	? ODESSA (state, theta, sensitivity_guess, tzero, func)
 	: ODESSA (state, tzero, func);
 	  
-      ode.copy (odessa_opts);
+      ode.set_options (odessa_opts);
 
       if (crit_times_set)
 	output = ode.integrate (out_times, crit_times);
diff -r a0c710c20da5 -r 19a1626b8d57 src/DLD-FUNCTIONS/quad.cc
--- a/src/DLD-FUNCTIONS/quad.cc	Wed Oct 23 03:34:11 2002 +0000
+++ b/src/DLD-FUNCTIONS/quad.cc	Wed Oct 23 22:10:54 2002 +0000
@@ -249,7 +249,7 @@
 	  if (indefinite)
 	    {
 	      IndefQuad iq (quad_user_function, bound, indef_type);
-	      iq.copy (quad_opts);
+	      iq.set_options (quad_opts);
 	      val = iq.integrate (ier, nfun, abserr);
 	    }
 	  else
@@ -257,13 +257,13 @@
 	      if (have_sing)
 		{
 		  DefQuad dq (quad_user_function, a, b, sing);
-		  dq.copy (quad_opts);
+		  dq.set_options (quad_opts);
 		  val = dq.integrate (ier, nfun, abserr);
 		}
 	      else
 		{
 		  DefQuad dq (quad_user_function, a, b);
-		  dq.copy (quad_opts);
+		  dq.set_options (quad_opts);
 		  val = dq.integrate (ier, nfun, abserr);
 		}
 	    }