Mercurial > octave
view liboctave/util/str-vec.cc @ 20232:a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
* liboctave/array/Array.h (Array::length): deprecate for ::numel.
* liboctave/array/Sparse.h (Sparse::length): deprecate for ::numel.
* libgui/graphics/QtHandlesUtils.cc, libgui/src/octave-qt-link.cc,
libinterp/corefcn/Cell.cc, libinterp/corefcn/__contourc__.cc,
libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc,
libinterp/corefcn/cellfun.cc, libinterp/corefcn/daspk.cc,
libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc,
libinterp/corefcn/data.cc, libinterp/corefcn/filter.cc,
libinterp/corefcn/find.cc, libinterp/corefcn/gl-render.cc,
libinterp/corefcn/gl-render.h, libinterp/corefcn/graphics.cc,
libinterp/corefcn/graphics.in.h, libinterp/corefcn/help.cc,
libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc,
libinterp/corefcn/load-path.cc, libinterp/corefcn/load-save.cc,
libinterp/corefcn/ls-oct-ascii.h, libinterp/corefcn/lsode.cc,
libinterp/corefcn/matrix_type.cc, libinterp/corefcn/oct-hist.cc,
libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h,
libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-stream.cc,
libinterp/corefcn/oct-stream.h, libinterp/corefcn/pr-output.cc,
libinterp/corefcn/quadcc.cc, libinterp/corefcn/rand.cc,
libinterp/corefcn/regexp.cc, libinterp/corefcn/strfns.cc,
libinterp/corefcn/sub2ind.cc, libinterp/corefcn/symtab.h,
libinterp/corefcn/syscalls.cc, libinterp/corefcn/tsearch.cc,
libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc,
libinterp/corefcn/variables.cc, libinterp/corefcn/xdiv.cc,
libinterp/corefcn/xpow.cc, libinterp/dldfcn/__glpk__.cc,
libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__magick_read__.cc,
libinterp/dldfcn/audiodevinfo.cc, libinterp/dldfcn/ccolamd.cc,
libinterp/dldfcn/colamd.cc, libinterp/octave-value/ov-cell.cc,
libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h,
libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-java.cc,
libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-struct.cc,
libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov.cc,
libinterp/operators/op-int.h, libinterp/parse-tree/pt-pr-code.cc,
liboctave/array/Array-util.cc, liboctave/array/Array.cc,
liboctave/array/CColVector.cc, liboctave/array/CDiagMatrix.cc,
liboctave/array/CMatrix.cc, liboctave/array/CRowVector.cc,
liboctave/array/DiagArray2.cc, liboctave/array/DiagArray2.h,
liboctave/array/MArray.cc, liboctave/array/PermMatrix.cc,
liboctave/array/PermMatrix.h, liboctave/array/Sparse.cc,
liboctave/array/boolMatrix.cc, liboctave/array/chMatrix.cc,
liboctave/array/chNDArray.cc, liboctave/array/dColVector.cc,
liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc,
liboctave/array/dRowVector.cc, liboctave/array/fCColVector.cc,
liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc,
liboctave/array/fCRowVector.cc, liboctave/array/fColVector.cc,
liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc,
liboctave/array/fRowVector.cc, liboctave/array/idx-vector.cc,
liboctave/array/intNDArray.cc, liboctave/numeric/CmplxCHOL.cc,
liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc,
liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc,
liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc,
liboctave/numeric/ODES.cc, liboctave/numeric/ODES.h,
liboctave/numeric/base-dae.h, liboctave/numeric/base-lu.cc,
liboctave/numeric/dbleCHOL.cc, liboctave/numeric/dbleLU.cc,
liboctave/numeric/dbleQR.cc, liboctave/numeric/eigs-base.cc,
liboctave/numeric/fCmplxCHOL.cc, liboctave/numeric/fCmplxLU.cc,
liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatCHOL.cc,
liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc,
liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-rand.cc,
liboctave/numeric/oct-spparms.cc, liboctave/numeric/sparse-base-chol.cc,
liboctave/operators/mx-inlines.cc, liboctave/system/file-ops.cc,
liboctave/util/glob-match.h, liboctave/util/kpse.cc,
liboctave/util/lo-regexp.cc, liboctave/util/oct-glob.cc,
liboctave/util/pathsearch.cc, liboctave/util/str-vec.cc,
liboctave/util/str-vec.h, liboctave/util/url-transfer.cc: replace all usage
of Array::length() and Sparse::length() with ::numel().
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Sat, 30 May 2015 03:14:07 +0100 |
parents | 4197fc428c7d |
children | f7121e111991 |
line wrap: on
line source
/* Copyright (C) 1996-2015 John W. Eaton 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/>. */ /* The function string_vector::list_in_columns was adapted from a similar function distributed in the GNU file utilities, copyright (C) 85, 88, 90, 91, 95, 1996 Free Software Foundation, Inc. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <iostream> #include <string> #include "cmd-edit.h" #include "lo-utils.h" #include "str-vec.h" // FIXME: isn't there some STL trick that could be used to make this // work for all STL containers of std::string objects? string_vector::string_vector (const std::list<std::string>& lst) : Array<std::string> () { size_t n = lst.size (); resize (n); octave_idx_type i = 0; for (std::list<std::string>::const_iterator p = lst.begin (); p != lst.end (); p++) elem (i++) = *p; } string_vector::string_vector (const std::set<std::string>& lst) : Array<std::string> () { size_t n = lst.size (); resize (n); octave_idx_type i = 0; for (std::set<std::string>::const_iterator p = lst.begin (); p != lst.end (); p++) elem (i++) = *p; } // Create a string vector from a NULL terminated list of C strings. string_vector::string_vector (const char * const *s) : Array<std::string> () { octave_idx_type n = 0; if (s) { const char * const *t = s; while (*t++) n++; } resize (n); for (octave_idx_type i = 0; i < n; i++) elem (i) = s[i]; } // Create a string vector from up to N C strings. Assumes that N is // nonnegative. string_vector::string_vector (const char * const *s, octave_idx_type n) : Array<std::string> (dim_vector (n, 1)) { for (octave_idx_type i = 0; i < n; i++) elem (i) = s[i]; } string_vector& string_vector::sort (bool make_uniq) { // Don't use Array<std::string>::sort () to allow sorting in place. octave_sort<std::string> lsort; lsort.sort (Array<std::string>::fortran_vec (), numel ()); if (make_uniq) uniq (); return *this; } string_vector& string_vector::uniq (void) { octave_idx_type len = numel (); if (len > 0) { octave_idx_type k = 0; for (octave_idx_type i = 1; i < len; i++) if (elem (i) != elem (k)) if (++k != i) elem (k) = elem (i); if (len != ++k) resize (k); } return *this; } string_vector& string_vector::append (const std::string& s) { octave_idx_type len = numel (); resize (len + 1); elem (len) = s; return *this; } string_vector& string_vector::append (const string_vector& sv) { octave_idx_type len = numel (); octave_idx_type sv_len = sv.numel (); octave_idx_type new_len = len + sv_len; resize (new_len); for (octave_idx_type i = 0; i < sv_len; i++) elem (len + i) = sv[i]; return *this; } std::string string_vector::join (const std::string& sep) const { std::string retval; octave_idx_type len = numel (); if (len > 0) { octave_idx_type i; for (i = 0; i < len - 1; i++) retval += elem (i) + sep; retval += elem (i); } return retval; } char ** string_vector::c_str_vec (void) const { octave_idx_type len = numel (); char **retval = new char * [len + 1]; retval[len] = 0; for (octave_idx_type i = 0; i < len; i++) retval[i] = strsave (elem (i).c_str ()); return retval; } void string_vector::delete_c_str_vec (const char * const *v) { const char * const *p = v; while (*p) delete [] *p++; delete [] v; } // Format a list in neat columns. std::ostream& string_vector::list_in_columns (std::ostream& os, int width, const std::string& prefix) const { // Compute the maximum name length. octave_idx_type max_name_length = 0; octave_idx_type total_names = numel (); if (total_names == 0) { // List empty, remember to end output with a newline. os << "\n"; return os; } for (octave_idx_type i = 0; i < total_names; i++) { octave_idx_type name_length = elem (i).length (); if (name_length > max_name_length) max_name_length = name_length; } // Allow at least two spaces between names. max_name_length += 2; // Calculate the maximum number of columns that will fit. octave_idx_type line_length = ((width <= 0 ? command_editor::terminal_cols () : width) - prefix.length ()); octave_idx_type nc = line_length / max_name_length; if (nc == 0) nc = 1; // Calculate the number of rows that will be in each column except // possibly for a short column on the right. octave_idx_type nr = total_names / nc + (total_names % nc != 0); octave_idx_type count; for (octave_idx_type row = 0; row < nr; row++) { count = row; octave_idx_type pos = 0; // Print the next row. os << prefix; while (1) { std::string nm = elem (count); os << nm; octave_idx_type name_length = nm.length (); count += nr; if (count >= total_names) break; octave_idx_type spaces_to_pad = max_name_length - name_length; for (octave_idx_type i = 0; i < spaces_to_pad; i++) os << " "; pos += max_name_length; } os << "\n"; } return os; }