Mercurial > hg > octave-lyh

diff liboctave/MSparse.cc @ 10350:12884915a8e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge MArray classes & improve Array interface
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 23 Jan 2010 21:41:03 +0100
parents 07ebe522dac2
children fd0a3ac60b0e
line wrap: on
line diff
--- a/liboctave/MSparse.cc
+++ b/liboctave/MSparse.cc
@@ -27,7 +27,7 @@
 
 #include "quit.h"
 #include "lo-error.h"
-#include "MArray2.h"
+#include "MArray.h"
 #include "Array-util.h"
 
 #include "MSparse.h"
@@ -187,13 +187,13 @@
 
 #define SPARSE_A2S_OP_1(OP) \
   template <class T> \
-  MArray2<T> \
+  MArray<T> \
   operator OP (const MSparse<T>& a, const T& s) \
   { \
     octave_idx_type nr = a.rows (); \
     octave_idx_type nc = a.cols (); \
  \
-    MArray2<T> r (nr, nc, (0.0 OP s));  \
+    MArray<T> r (nr, nc, (0.0 OP s));  \
  \
     for (octave_idx_type j = 0; j < nc; j++) \
       for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) \
@@ -233,13 +233,13 @@
 
 #define SPARSE_SA2_OP_1(OP) \
   template <class T> \
-  MArray2<T> \
+  MArray<T> \
   operator OP (const T& s, const MSparse<T>& a) \
   { \
     octave_idx_type nr = a.rows (); \
     octave_idx_type nc = a.cols (); \
  \
-    MArray2<T> r (nr, nc, (s OP 0.0));  \
+    MArray<T> r (nr, nc, (s OP 0.0));  \
  \
     for (octave_idx_type j = 0; j < nc; j++) \
       for (octave_idx_type i = a.cidx(j); i < a.cidx(j+1); i++) \