diff liboctave/base-de.h @ 3984:addebffd4961

[project @ 2002-07-11 03:39:33 by jwe]
author jwe
date Thu, 11 Jul 2002 03:39:34 +0000
parents d92134062783
children ee0304212be0
line wrap: on
line diff
--- a/liboctave/base-de.h
+++ b/liboctave/base-de.h
@@ -49,69 +49,11 @@
       return *this;
     }
 
-  // Derived classes must provide functions to actually do the
-  // integration.
-
-  // Return the vector of states at output time t.
-  virtual ColumnVector do_integrate (double tt) = 0;
+  // There must be a way for us to force the integration to restart.
 
-  // Return a matrix of states at each output time specified by t.
-  // The rows of the result matrix should each correspond to a new
-  // output time.
-  virtual Matrix do_integrate (const ColumnVector& tt) = 0;
-
-  virtual Matrix do_integrate (const ColumnVector& tt,
-			       const ColumnVector& ttcrit) = 0;
-
-  // There must also be a way for us to force the integration to
-  // restart.
   virtual void force_restart (void) = 0;
 
-  // Lots of ways to call the single function and optionally set and
-  // get additional information.
-
-  // Integrate to t from current point.
-  virtual ColumnVector integrate (double tt)
-    { return do_integrate (tt); }
-
-  // Set new x0, t0 and integrate to t.
-  virtual ColumnVector integrate (const ColumnVector& x0, double t0, double tt)
-    {
-      initialize (x0, t0);
-      return do_integrate (tt);
-    }
-
-  // Integrate from current point and return output at all points
-  // specified by t.
-  virtual Matrix integrate (const ColumnVector& tt)
-    { return do_integrate (tt); }
-
-  // Set new x0, t0 and integrate to return output at all points
-  // specified by t.
-  virtual Matrix integrate (const ColumnVector& x0, double t0,
-			    const ColumnVector& tt)
-    {
-      initialize (x0, t0);
-      return do_integrate (tt);
-    }
-
-  // Integrate from current point and return output at all points
-  // specified by t.
-  virtual Matrix integrate (const ColumnVector& tt,
-			    const ColumnVector& ttcrit)
-    { return do_integrate (tt, ttcrit); }
-
-  // Set new x0, t0 and integrate to return output at all points
-  // specified by t.
-  virtual Matrix integrate (const ColumnVector& x0, double t0,
-			    const ColumnVector& tt,
-			    const ColumnVector& ttcrit)
-    {
-      initialize (x0, t0);
-      return do_integrate (tt, ttcrit);
-    }
-
-  virtual void initialize (const ColumnVector& x0, double t0)
+  void initialize (const ColumnVector& x0, double t0)
     {
       x = x0;
       t = t0;