--- a/liboctave/DASSL.cc	Fri Oct 06 06:14:45 1995 +0000
+++ b/liboctave/DASSL.cc	Sat Oct 07 03:39:26 1995 +0000
@@ -102,7 +102,7 @@
     info [i] = 0;
 }
 
-DAE::DAE (const Vector& state, double time, DAEFunc& f)
+DAE::DAE (const ColumnVector& state, double time, DAEFunc& f)
 {
   n = state.capacity ();
   t = time;
@@ -129,7 +129,8 @@
     info [i] = 0;
 }
 
-DAE::DAE (const Vector& state, const Vector& deriv, double time, DAEFunc& f)
+DAE::DAE (const ColumnVector& state, const ColumnVector& deriv,
+	  double time, DAEFunc& f)
 {
   if (deriv.capacity () != state.capacity ())
     {
@@ -169,14 +170,14 @@
   delete iwork;
 }
 
-Vector
+ColumnVector
 DAE::deriv (void)
 {
   return xdot;
 }
 
 void
-DAE::initialize (const Vector& state, double time)
+DAE::initialize (const ColumnVector& state, double time)
 {
   integration_error = 0;
   restart = 1;
@@ -187,7 +188,8 @@
 }
 
 void
-DAE::initialize (const Vector& state, const Vector& deriv, double time)
+DAE::initialize (const ColumnVector& state,
+		 const ColumnVector& deriv, double time)
 {
   integration_error = 0;
   restart = 1;
@@ -200,9 +202,9 @@
 ddassl_f (const double& time, double *state, double *deriv,
 	  double *delta, int& ires, double *, int *)
 {
-  Vector tmp_deriv (nn);
-  Vector tmp_state (nn);
-  Vector tmp_delta (nn);
+  ColumnVector tmp_deriv (nn);
+  ColumnVector tmp_state (nn);
+  ColumnVector tmp_delta (nn);
 
   for (int i = 0; i < nn; i++)
     {
@@ -227,8 +229,8 @@
 ddassl_j (const double& time, double *, double *, double *pd, const
 	  double& cj, double *, int *)
 {
-  Vector tmp_state (nn);
-  Vector tmp_deriv (nn);
+  ColumnVector tmp_state (nn);
+  ColumnVector tmp_deriv (nn);
 
   // XXX FIXME XXX
 
@@ -252,7 +254,7 @@
   return 0;
 }
 
-Vector
+ColumnVector
 DAE::integrate (double tout)
 {
   integration_error = 0;
@@ -361,7 +363,7 @@
 }
 
 Matrix
-DAE::integrate (const Vector& tout, Matrix& xdot_out)
+DAE::integrate (const ColumnVector& tout, Matrix& xdot_out)
 {
   Matrix retval;
   int n_out = tout.capacity ();
@@ -396,7 +398,8 @@
 }
 
 Matrix
-DAE::integrate (const Vector& tout, Matrix& xdot_out, const Vector& tcrit) 
+DAE::integrate (const ColumnVector& tout, Matrix& xdot_out,
+		const ColumnVector& tcrit) 
 {
   Matrix retval;
   int n_out = tout.capacity ();