Mercurial > hg > octave-nkf

diff src/DLD-FUNCTIONS/dassl.cc @ 4628:c0121a3b9cbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-11-17 20:19:07 by jwe]
author jwe
date Mon, 17 Nov 2003 20:19:07 +0000
parents 303b28a7a7e4
children 737fd5c0ae06
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/dassl.cc
+++ b/src/DLD-FUNCTIONS/dassl.cc
@@ -62,36 +62,13 @@
 {
   ColumnVector retval;
 
-  int nstates = x.capacity ();
-
-  assert (nstates == xdot.capacity ());
+  assert (x.capacity () == xdot.capacity ());
 
   octave_value_list args;
+
   args(2) = t;
-
-  if (nstates > 1)
-    {
-      Matrix m1 (nstates, 1);
-      Matrix m2 (nstates, 1);
-      for (int i = 0; i < nstates; i++)
-	{
-	  m1 (i, 0) = x (i);
-	  m2 (i, 0) = xdot (i);
-	}
-      octave_value state (m1);
-      octave_value deriv (m2);
-      args(1) = deriv;
-      args(0) = state;
-    }
-  else
-    {
-      double d1 = x (0);
-      double d2 = xdot (0);
-      octave_value state (d1);
-      octave_value deriv (d2);
-      args(1) = deriv;
-      args(0) = state;
-    }
+  args(1) = xdot;
+  args(0) = x;
 
   if (dassl_fcn)
     {
@@ -133,38 +110,14 @@
 {
   Matrix retval;
 
-  int nstates = x.capacity ();
-
-  assert (nstates == xdot.capacity ());
+  assert (x.capacity () == xdot.capacity ());
 
   octave_value_list args;
 
   args(3) = cj;
   args(2) = t;
-
-  if (nstates > 1)
-    {
-      Matrix m1 (nstates, 1);
-      Matrix m2 (nstates, 1);
-      for (int i = 0; i < nstates; i++)
-	{
-	  m1 (i, 0) = x (i);
-	  m2 (i, 0) = xdot (i);
-	}
-      octave_value state (m1);
-      octave_value deriv (m2);
-      args(1) = deriv;
-      args(0) = state;
-    }
-  else
-    {
-      double d1 = x (0);
-      double d2 = xdot (0);
-      octave_value state (d1);
-      octave_value deriv (d2);
-      args(1) = deriv;
-      args(0) = state;
-    }
+  args(1) = xdot;
+  args(0) = x;
 
   if (dassl_jac)
     {