Mercurial > hg > octave-nkf
view liboctave/regexp.h @ 14557:e8e86ae3abbc
make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
* Array.h, Array.cc (Array<T>::diag (octave_idx_type, octave_idx_type)
const): New function.
* CMatrix.h, CMatrix.cc (ComplexMatrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* dMatrix.h, dMatrix.cc (Matrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* fCMatrix.h, fCMatrix.cc (FloatComplexMatrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* fMatrix.h, fMatrix.cc (FloatMatrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* CNDArray.cc, CNDArray.h (ComplexNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* boolNDArray.cc, boolNDArray.h (boolNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* chNDArray.cc, chNDArray.h (charNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* dNDArray.cc, dNDArray.h (NDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* fCNDArray.cc, fCNDArray.h (FloatComplexNDArray::diag
(octave_idx_type, octave_idx_type) const): New forwarding function.
* fNDArray.cc, fNDArray.h (FloatNDArray::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* intNDArray.cc, intNDArray.h (intNDArray<T>::diag (octave_idx_type,
octave_idx_type) const): New forwarding function.
* Cell.cc, Cell.h (Cell::diag (octave_idx_type, octave_idx_type)
const): New function.
* ov.h (octave_value::diag (octave_idx_type, octave_idx_type)):
New function.
* ov-base.h, ov-base.cc (octave_base_value::diag (octave_idx_type,
octave_idx_type) const): New virtual function and default implementation.
* ov-base-mat.h (octave_base_matrix<T>::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-base-scalar.cc, ov-base-scalar.h (octave_base_scalar<T>::diag
(octave_idx_type, octave_idx_type)): New function.
* ov-complex.cc, ov-complex.h (octave_complex::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-cx-mat.cc, ov-complex.h (octave_complex_matrix::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-float.cc, ov-float.h (octave_float_scalar::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-flt-complex.cc, ov-flt-complex.h (octave_float_complex::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-flt-cx-mat.cc, ov-flt-cx-mat.h (octave_float_complex_matrix::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-flt-re-mat.cc, ov-flt-re-mat.h (octave_float_matrix::diag
(octave_idx_type, octave_idx_type) const): New function.
* ov-range.cc, ov-range.h (octave_range::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-re-mat.cc, ov-re-mat.h (octave_matrix::diag (octave_idx_type,
octave_idx_type) const): New function.
* ov-scalar.cc, ov-scalar.h (octave_scalar::diag (octave_idx_type,
octave_idx_type) const): New function.
* data.cc (Fdiag): Use two-arg octave_value::diag method for
dispatching. New tests.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 12 Apr 2012 16:27:39 -0400 |
parents | 6d5c951ec520 |
children |
line wrap: on
line source
/* Copyright (C) 2012 John W. Eaton Copyright (C) 2005-2012 David Bateman 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/>. */ #if !defined (octave_regexp_match_h) #define octave_regexp_match_h 1 #include <list> #include <sstream> #include <string> #include "Array.h" #include "Matrix.h" #include "base-list.h" #include "str-vec.h" class OCTAVE_API regexp { public: class opts; class match_data; regexp (const std::string& pat = "", const regexp::opts& opt = regexp::opts (), const std::string& w = "regexp") : pattern (pat), options (opt), data (0), named_pats (), nnames (0), named_idx (), who (w) { compile_internal (); } regexp (const regexp& rx) : pattern (rx.pattern), data (rx.data), named_pats (rx.named_pats), nnames (rx.nnames), named_idx (rx.named_idx) { } regexp& operator = (const regexp& rx) { if (this != &rx) { pattern = rx.pattern; data = rx.data; named_pats = rx.named_pats; nnames = rx.nnames; named_idx = rx.named_idx; } return *this; } ~regexp (void) { free (); } void compile (const std::string& pat, const regexp::opts& opt = regexp::opts ()) { pattern = pat; options = opt; compile_internal (); } match_data match (const std::string& buffer); bool is_match (const std::string& buffer); Array<bool> is_match (const string_vector& buffer); std::string replace (const std::string& buffer, const std::string& replacement); class opts { public: opts (void) : x_case_insensitive (false), x_dotexceptnewline (false), x_emptymatch (false), x_freespacing (false), x_lineanchors (false), x_once (false) { } opts (const opts& o) : x_case_insensitive (o.x_case_insensitive), x_dotexceptnewline (o.x_dotexceptnewline), x_emptymatch (o.x_emptymatch), x_freespacing (o.x_freespacing), x_lineanchors (o.x_lineanchors), x_once (o.x_once) { } opts& operator = (const opts& o) { if (this != &o) { x_case_insensitive = o.x_case_insensitive; x_dotexceptnewline = o.x_dotexceptnewline; x_emptymatch = o.x_emptymatch; x_freespacing = o.x_freespacing; x_lineanchors = o.x_lineanchors; x_once = o.x_once; } return *this; } ~opts (void) { } void case_insensitive (bool val) { x_case_insensitive = val; } void dotexceptnewline (bool val) { x_dotexceptnewline = val; } void emptymatch (bool val) { x_emptymatch = val; } void freespacing (bool val) { x_freespacing = val; } void lineanchors (bool val) { x_lineanchors = val; } void once (bool val) { x_once = val; } bool case_insensitive (void) const { return x_case_insensitive; } bool dotexceptnewline (void) const { return x_dotexceptnewline; } bool emptymatch (void) const { return x_emptymatch; } bool freespacing (void) const { return x_freespacing; } bool lineanchors (void) const { return x_lineanchors; } bool once (void) const { return x_once; } private: bool x_case_insensitive; bool x_dotexceptnewline; bool x_emptymatch; bool x_freespacing; bool x_lineanchors; bool x_once; }; class match_element { public: match_element (const string_vector& nt, const string_vector& t, const std::string& ms, const Matrix& te, double s, double e) : x_match_string (ms), x_named_tokens (nt), x_tokens (t), x_token_extents (te), x_start (s), x_end (e) { } match_element (const match_element &a) : x_match_string (a.x_match_string), x_named_tokens (a.x_named_tokens), x_tokens (a.x_tokens), x_token_extents (a.x_token_extents), x_start (a.x_start), x_end (a.x_end) { } std::string match_string (void) const { return x_match_string; } string_vector named_tokens (void) const { return x_named_tokens; } string_vector tokens (void) const { return x_tokens; } Matrix token_extents (void) const { return x_token_extents; } double start (void) const { return x_start; } double end (void) const { return x_end; } private: std::string x_match_string; string_vector x_named_tokens; string_vector x_tokens; Matrix x_token_extents; double x_start; double x_end; }; class match_data : public octave_base_list<match_element> { public: match_data (void) : octave_base_list<match_element> (), named_pats () { } match_data (const std::list<match_element>& l, const string_vector& np) : octave_base_list<match_element> (l), named_pats (np) { } match_data (const match_data& rx_lst) : octave_base_list<match_element> (rx_lst), named_pats (rx_lst.named_pats) { } match_data& operator = (const match_data& rx_lst) { if (this != &rx_lst) { octave_base_list<match_element>::operator = (rx_lst); named_pats = rx_lst.named_pats; } return *this; } ~match_data (void) { } string_vector named_patterns (void) { return named_pats; } private: string_vector named_pats; }; private: // The pattern we've been asked to match. std::string pattern; opts options; // Internal data describing the regular expression. void *data; std::string m; string_vector named_pats; int nnames; Array<int> named_idx; std::string who; void free (void); void compile_internal (void); }; inline regexp::match_data regexp_match (const std::string& pat, const std::string& buffer, const regexp::opts& opt = regexp::opts (), const std::string& who = "regexp") { regexp rx (pat, opt, who); return rx.match (buffer); } inline bool is_regexp_match (const std::string& pat, const std::string& buffer, const regexp::opts& opt = regexp::opts (), const std::string& who = "regexp") { regexp rx (pat, opt, who); return rx.is_match (buffer); } inline Array<bool> is_regexp_match (const std::string& pat, const string_vector& buffer, const regexp::opts& opt = regexp::opts (), const std::string& who = "regexp") { regexp rx (pat, opt, who); return rx.is_match (buffer); } inline std::string regexp_replace (const std::string& pat, const std::string& buffer, const std::string& replacement, const regexp::opts& opt = regexp::opts (), const std::string& who = "regexp") { regexp rx (pat, opt, who); return rx.replace (buffer, replacement); } #endif