Mercurial > hg > octave-nkf
diff src/ov-re-mat.cc @ 5958:85c7dc4afe6b
[project @ 2006-08-23 18:35:38 by jwe]
author | jwe |
---|---|
date | Wed, 23 Aug 2006 18:35:39 +0000 |
parents | cdef72fcd206 |
children | 2aad75fcc93a |
line wrap: on
line diff
--- a/src/ov-re-mat.cc +++ b/src/ov-re-mat.cc @@ -255,21 +255,15 @@ } bool -octave_matrix::save_ascii (std::ostream& os, bool& infnan_warned, - int strip_nan_and_inf) +octave_matrix::save_ascii (std::ostream& os, bool& infnan_warned) { dim_vector d = dims (); + if (d.length () > 2) { NDArray tmp = array_value (); - if (strip_nan_and_inf) - { - warning ("save: Can not strip Inf or NaN values"); - warning ("save: Inf or NaN values may not be reloadable"); - infnan_warned = true; - } - else if (! infnan_warned && tmp.any_element_is_inf_or_nan ()) + if (! infnan_warned && tmp.any_element_is_inf_or_nan ()) { warning ("save: Inf or NaN values may not be reloadable"); infnan_warned = true; @@ -289,9 +283,7 @@ os << "# rows: " << rows () << "\n" << "# columns: " << columns () << "\n"; - Matrix tmp = matrix_value (); - - tmp.save_ascii (os, infnan_warned, strip_nan_and_inf); + os << matrix_value (); } return true;