Mercurial > hg > octave-nkf
diff liboctave/CMatrix.cc @ 2832:4dff308e9acc
[project @ 1997-03-26 05:16:58 by jwe]
| author | jwe |
|---|---|
| date | Wed, 26 Mar 1997 05:17:00 +0000 |
| parents | 92826d6e8bd9 |
| children | 8b262e771614 |
line wrap: on
line diff
--- a/liboctave/CMatrix.cc +++ b/liboctave/CMatrix.cc @@ -2062,23 +2062,23 @@ return false; } -Matrix +boolMatrix ComplexMatrix::all (void) const { int nr = rows (); int nc = cols (); - Matrix retval; + boolMatrix retval; if (nr > 0 && nc > 0) { if (nr == 1) { retval.resize (1, 1); - retval.elem (0, 0) = 1.0; + retval.elem (0, 0) = true; for (int j = 0; j < nc; j++) { if (elem (0, j) == 0.0) { - retval.elem (0, 0) = 0.0; + retval.elem (0, 0) = false; break; } } @@ -2086,12 +2086,12 @@ else if (nc == 1) { retval.resize (1, 1); - retval.elem (0, 0) = 1.0; + retval.elem (0, 0) = true; for (int i = 0; i < nr; i++) { if (elem (i, 0) == 0.0) { - retval.elem (0, 0) = 0.0; + retval.elem (0, 0) = false; break; } } @@ -2101,12 +2101,12 @@ retval.resize (1, nc); for (int j = 0; j < nc; j++) { - retval.elem (0, j) = 1.0; + retval.elem (0, j) = true; for (int i = 0; i < nr; i++) { if (elem (i, j) == 0.0) { - retval.elem (0, j) = 0.0; + retval.elem (0, j) = false; break; } } @@ -2116,23 +2116,23 @@ return retval; } -Matrix +boolMatrix ComplexMatrix::any (void) const { int nr = rows (); int nc = cols (); - Matrix retval; + boolMatrix retval; if (nr > 0 && nc > 0) { if (nr == 1) { retval.resize (1, 1); - retval.elem (0, 0) = 0.0; + retval.elem (0, 0) = false; for (int j = 0; j < nc; j++) { if (elem (0, j) != 0.0) { - retval.elem (0, 0) = 1.0; + retval.elem (0, 0) = true; break; } } @@ -2140,12 +2140,12 @@ else if (nc == 1) { retval.resize (1, 1); - retval.elem (0, 0) = 0.0; + retval.elem (0, 0) = false; for (int i = 0; i < nr; i++) { if (elem (i, 0) != 0.0) { - retval.elem (0, 0) = 1.0; + retval.elem (0, 0) = true; break; } } @@ -2155,12 +2155,12 @@ retval.resize (1, nc); for (int j = 0; j < nc; j++) { - retval.elem (0, j) = 0.0; + retval.elem (0, j) = false; for (int i = 0; i < nr; i++) { if (elem (i, j) != 0.0) { - retval.elem (0, j) = 1.0; + retval.elem (0, j) = true; break; } }