Mercurial > octave

diff liboctave/DASRT.h @ 11502:4638800cd660

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
delete data pointer members from liboctave ODE/DAE classes; make destuctors virtual in ODE/DAE base classes
author John W. Eaton <jwe@octave.org>
date Thu, 13 Jan 2011 03:16:40 -0500
parents cbc402e64d83
children fd0a3ac60b0e
line wrap: on
line diff
--- a/liboctave/DASRT.h	Thu Jan 13 03:04:51 2011 -0500
+++ b/liboctave/DASRT.h	Thu Jan 13 03:16:40 2011 -0500
@@ -33,7 +33,8 @@
 {
 public:
 
-  DASRT_result (void) { }
+  DASRT_result (void)
+    : x (), xdot (), t () { }
 
   DASRT_result (const Matrix& xx, const Matrix& xxdot, const ColumnVector& tt)
     : x (xx), xdot (xxdot), t (tt) { }
@@ -71,14 +72,24 @@
 {
 public:
 
-  DASRT (void) : DAERT (), DASRT_options (), initialized (false) { }
+  DASRT (void)
+    : DAERT (), DASRT_options (), initialized (false),
+      liw (0), lrw (0), ng (0), info (), iwork (), jroot (), rwork (),
+      abs_tol (), rel_tol ()
+    { }
 
   DASRT (const ColumnVector& s, double tm, DAERTFunc& f)
-    : DAERT (s, tm, f), DASRT_options (), initialized (false) { }
+    : DAERT (s, tm, f), DASRT_options (), initialized (false),
+      liw (0), lrw (0), ng (0), info (), iwork (), jroot (), rwork (),
+      abs_tol (), rel_tol ()
+    { }
 
   DASRT (const ColumnVector& s, const ColumnVector& deriv,
          double tm, DAERTFunc& f)
-    : DAERT (s, deriv, tm, f), DASRT_options (), initialized (false) { }
+    : DAERT (s, deriv, tm, f), DASRT_options (), initialized (false),
+      liw (0), lrw (0), ng (0), info (), iwork (), jroot (), rwork (),
+      abs_tol (), rel_tol ()
+    { }
 
   ~DASRT (void) { }
 
@@ -107,15 +118,6 @@
   Array<double> abs_tol;
   Array<double> rel_tol;
 
-  double *px;
-  double *pxdot;
-  double *pabs_tol;
-  double *prel_tol;
-  octave_idx_type *pinfo;
-  octave_idx_type *piwork;
-  double *prwork;
-  octave_idx_type *pjroot;
-
   void integrate (double t);
 };