Mercurial > octave-nkf
view liboctave/array/chMatrix.cc @ 19632:76478d2da117
unconditionally disable the octave_allocator class
* configure.ac: Delete the --enable-octave-allocator option.
* oct-alloc.h: Delete octave_allocator class. Warn if file is
included. Unconditionally define macros to be empty.
* NEWS: Make note of these changes.
* oct-alloc.cc: Delete.
* liboctave/util/module.mk (UTIL_SRC): Remove it from the list.
* make_int.cc, Cell.h, oct-obj.cc, oct-obj.h, audiodevinfo.cc,
ov-base-int.h, ov-base-scalar.h, ov-bool-mat.cc, ov-bool-mat.h,
ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h,
ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.h,
ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc,
ov-complex.h, ov-cs-list.cc, ov-cs-list.h, ov-cx-diag.cc,
ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc,
ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc,
ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-fcn.cc,
ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc,
ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h,
ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc,
ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-java.cc,
ov-java.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-perm.cc, ov-perm.h,
ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc,
ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, ov.h, pt-const.cc, pt-const.h, idx-vector.cc,
idx-vector.h: Delete uses of oct-alloc.h and OCTAVE_ALLOCATOR macros.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 20 Jan 2015 13:43:29 -0500 |
parents | 8b4a24081e47 |
children | 4197fc428c7d |
line wrap: on
line source
// Matrix manipulations. /* Copyright (C) 1995-2013 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <cstring> #include <iostream> #include <string> #include "lo-error.h" #include "str-vec.h" #include "mx-base.h" #include "mx-inlines.cc" #include "mx-op-defs.h" // charMatrix class. bool charMatrix::operator == (const charMatrix& a) const { if (rows () != a.rows () || cols () != a.cols ()) return 0; return mx_inline_equal (length (), data (), a.data ()); } bool charMatrix::operator != (const charMatrix& a) const { return !(*this == a); } charMatrix& charMatrix::insert (const char *s, octave_idx_type r, octave_idx_type c) { if (s) { octave_idx_type s_len = strlen (s); if (r < 0 || r >= rows () || c < 0 || c + s_len - 1 > cols ()) { (*current_liboctave_error_handler) ("range error for insert"); return *this; } for (octave_idx_type i = 0; i < s_len; i++) elem (r, c+i) = s[i]; } return *this; } charMatrix& charMatrix::insert (const charMatrix& a, octave_idx_type r, octave_idx_type c) { Array<char>::insert (a, r, c); return *this; } std::string charMatrix::row_as_string (octave_idx_type r, bool strip_ws) const { std::string retval; octave_idx_type nr = rows (); octave_idx_type nc = cols (); if (r == 0 && (nr == 0 || nc == 0)) return retval; if (r < 0 || r >= nr) { (*current_liboctave_error_handler) ("range error for row_as_string"); return retval; } retval.resize (nc, '\0'); for (octave_idx_type i = 0; i < nc; i++) retval[i] = elem (r, i); if (strip_ws) { while (--nc >= 0) { char c = retval[nc]; if (c && c != ' ') break; } retval.resize (nc+1); } return retval; } charMatrix charMatrix::extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const { if (r1 > r2) { std::swap (r1, r2); } if (c1 > c2) { std::swap (c1, c2); } octave_idx_type new_r = r2 - r1 + 1; octave_idx_type new_c = c2 - c1 + 1; charMatrix result (new_r, new_c); for (octave_idx_type j = 0; j < new_c; j++) for (octave_idx_type i = 0; i < new_r; i++) result.elem (i, j) = elem (r1+i, c1+j); return result; } MS_CMP_OPS (charMatrix, char) MS_BOOL_OPS (charMatrix, char) SM_CMP_OPS (char, charMatrix) SM_BOOL_OPS (char, charMatrix) MM_CMP_OPS (charMatrix, charMatrix) MM_BOOL_OPS (charMatrix, charMatrix)