diff liboctave/dNDArray.cc @ 4532:01ee68d18069

[project @ 2003-10-10 00:49:54 by jwe]
author jwe
date Fri, 10 Oct 2003 00:49:55 +0000
parents 508238e65af7
children 79df15d4470c
line wrap: on
line diff
--- a/liboctave/dNDArray.cc	Tue Oct 07 14:57:39 2003 +0000
+++ b/liboctave/dNDArray.cc	Fri Oct 10 00:49:55 2003 +0000
@@ -34,6 +34,8 @@
 #include "lo-error.h"
 #include "lo-ieee.h"
 
+#include "ArrayN-inline.h"
+
 // XXX FIXME XXX -- this is not quite the right thing.
 
 boolMatrix
@@ -70,6 +72,40 @@
   return retval;
 }
 
+Matrix
+NDArray::matrix_value (void) const
+{
+  Matrix retval;
+
+  int nd = ndims ();
+
+  switch (nd)
+    {
+    case 1:
+      retval = Matrix (Array2<double> (*this, dimensions(0), 1));
+      break;
+
+    case 2:
+      retval = Matrix (Array2<double> (*this, dimensions(0), dimensions(1)));
+      break;
+
+    default:
+      (*current_liboctave_error_handler)
+	("invalid converstion of NDArray to Matrix");
+      break;
+    }
+
+  return retval;
+}
+
+void
+NDArray::increment_index (Array<int>& ra_idx,
+			  const dim_vector& dimensions,
+			  int start_dimension)
+{
+  ::increment_index (ra_idx, dimensions, start_dimension);
+}
+
 bool
 NDArray::any_element_is_negative (bool neg_zero) const
 {
@@ -120,32 +156,6 @@
   return true;
 }
 
-Matrix
-NDArray::matrix_value (void) const
-{
-  Matrix retval;
-
-  int nd = ndims ();
-
-  switch (nd)
-    {
-    case 1:
-      retval = Matrix (Array2<double> (*this, dimensions(0), 1));
-      break;
-
-    case 2:
-      retval = Matrix (Array2<double> (*this, dimensions(0), dimensions(1)));
-      break;
-
-    default:
-      (*current_liboctave_error_handler)
-	("invalid converstion of NDArray to Matrix");
-      break;
-    }
-
-  return retval;
-}
-
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***