Mercurial > hg > octave-max

changeset 2844:71a47e9360c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-03-26 21:35:06 by jwe]
author jwe
date Wed, 26 Mar 1997 21:35:15 +0000
parents 79841c89e27d
children b11fb5e85dc5
files liboctave/ChangeLog liboctave/Makefile.in liboctave/boolMatrix.h
diffstat 3 files changed, 18 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,11 @@
+Wed Mar 26 15:31:57 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* MArray-b.cc: Delete.
+	* Makefile.in: Delete it from the lists.
+
+	* boolMatrix.h (class bboolMatrix): Derive from Array2, not
+	MArray2, since most of the numeric ops don't really make sense.
+
 Tue Mar 25 17:37:25 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* boolMatrix.cc (boolMatrix::all, boolMatrix::any): New functions.
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -56,8 +56,7 @@
 
 TI_SRC := Array-C.cc Array-b.cc Array-ch.cc Array-i.cc Array-d.cc \
 	Array-s.cc Array-str.cc \
-	MArray-C.cc MArray-b.cc MArray-ch.cc MArray-i.cc \
-	MArray-d.cc MArray-s.cc
+	MArray-C.cc MArray-ch.cc MArray-i.cc MArray-d.cc MArray-s.cc
 
 MATRIX_SRC := Array-flags.cc CColVector.cc CDiagMatrix.cc CMatrix.cc \
 	CRowVector.cc CmplxAEPBAL.cc CmplxCHOL.cc CmplxDET.cc \
--- a/liboctave/boolMatrix.h
+++ b/liboctave/boolMatrix.h
@@ -27,24 +27,24 @@
 #pragma interface
 #endif
 
-#include "MArray2.h"
+#include "Array2.h"
 
 #include "mx-defs.h"
 
 class
-boolMatrix : public MArray2<bool>
+boolMatrix : public Array2<bool>
 {
 public:
 
-  boolMatrix (void) : MArray2<bool> () { }
-  boolMatrix (int r, int c) : MArray2<bool> (r, c) { }
-  boolMatrix (int r, int c, bool val) : MArray2<bool> (r, c, val) { }
-  boolMatrix (const MArray2<bool>& a) : MArray2<bool> (a) { }
-  boolMatrix (const boolMatrix& a) : MArray2<bool> (a) { }
+  boolMatrix (void) : Array2<bool> () { }
+  boolMatrix (int r, int c) : Array2<bool> (r, c) { }
+  boolMatrix (int r, int c, bool val) : Array2<bool> (r, c, val) { }
+  boolMatrix (const Array2<bool>& a) : Array2<bool> (a) { }
+  boolMatrix (const boolMatrix& a) : Array2<bool> (a) { }
 
   boolMatrix& operator = (const boolMatrix& a)
     {
-      MArray2<bool>::operator = (a);
+      Array2<bool>::operator = (a);
       return *this;
     }
 
@@ -69,7 +69,7 @@
 
 private:
 
-  boolMatrix (bool *b, int r, int c) : MArray2<bool> (b, r, c) { }
+  boolMatrix (bool *b, int r, int c) : Array2<bool> (b, r, c) { }
 };
 
 #endif