Mercurial > hg > octave-nkf

diff liboctave/DAEFunc.h @ 3991:48d2bc4a3729

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-07-16 17:46:50 by jwe]
author jwe
date Tue, 16 Jul 2002 17:46:51 +0000
parents 46388d6a4e44
children a35a3c5d4740
line wrap: on
line diff
--- a/liboctave/DAEFunc.h
+++ b/liboctave/DAEFunc.h
@@ -31,18 +31,17 @@
 {
 public:
 
-  struct DAEJac
-    {
-      Matrix *dfdxdot;
-      Matrix *dfdx;
-    };
-
   typedef ColumnVector (*DAERHSFunc) (const ColumnVector& x,
 				      const ColumnVector& xdot,
 				      double t, int& ires);
 
-  typedef DAEJac (*DAEJacFunc) (const ColumnVector& x,
-				const ColumnVector& xdot, double t);
+  // This is really the form used by DASSL:
+  //
+  //   PD = DG/DY + CJ * DG/DYPRIME
+
+  typedef Matrix (*DAEJacFunc) (const ColumnVector& x,
+				const ColumnVector& xdot,
+				double t, double cj);
 
   DAEFunc (void)
     : fun (0), jac (0) { }