Mercurial > hg > octave-nkf

annotate liboctave/caseless-str.h @ 14557:e8e86ae3abbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fd8b8f0f68b9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11075
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 /*
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 12669
diff changeset
3 Copyright (C) 2007-2012 Shai Ayal
11075
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 This file is part of Octave.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 option) any later version.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 for more details.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 along with Octave; see the file COPYING. If not, see
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 <http://www.gnu.org/licenses/>.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 */
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 #if !defined (octave_caseless_str_h)
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 #define octave_caseless_str_h 1
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
14280
fd8b8f0f68b9 Include <cctype> in caseless-str.h
Michael Goffioul <michael.goffioul@gmail.com>
parents: 14138
diff changeset
26 #include <cctype>
11075
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 #include <string>
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 class caseless_str : public std::string
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 {
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 public:
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 typedef std::string::iterator iterator;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 typedef std::string::const_iterator const_iterator;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 caseless_str (void) : std::string () { }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 caseless_str (const std::string& s) : std::string (s) { }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 caseless_str (const char *s) : std::string (s) { }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 caseless_str (const caseless_str& name) : std::string (name) { }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 caseless_str& operator = (const caseless_str& pname)
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 {
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 std::string::operator = (pname);
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 return *this;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 operator std::string (void) const { return *this; }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49
12666
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
50 bool operator < (const std::string& s) const
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
51 {
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
52 const_iterator p1 = begin ();
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
53 const_iterator p2 = s.begin ();
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
54
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
55 while (p1 != end () && p2 != s.end ())
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
56 {
12669
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
57 char lp1 = std::tolower (*p1), lp2 = std::tolower (*p2);
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
58
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
59 if ( lp1 > lp2 )
12666
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
60 return false;
12669
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
61 if ( lp1 < lp2)
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
62 return true;
12666
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
63
12669
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
64 p1++;
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
65 p2++;
12666
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
66 }
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
67
12669
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
68 if ( length () >= s.length ())
12666
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
69 return false;
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
70 else
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
71 return true;
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
72 }
68a59630798d Fix case insenstive use of radio values in graphics objects (bug #33068)
David Bateman <dbateman@free.fr>
parents: 11523
diff changeset
73
11075
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
74 // Case-insensitive comparison.
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 bool compare (const std::string& s, size_t limit = std::string::npos) const
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 {
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77 const_iterator p1 = begin ();
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 const_iterator p2 = s.begin ();
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
80 size_t k = 0;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
81
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82 while (p1 != end () && p2 != s.end () && k++ < limit)
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 {
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84 if (std::tolower (*p1) != std::tolower (*p2))
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85 return false;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86
12669
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
87 p1++;
2c96207d0e06 caseless-str.h: Fix implementation of op<
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 12666
diff changeset
88 p2++;
11075
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
89 }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
90
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
91 return (limit == std::string::npos) ? size () == s.size () : k == limit;
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
92 }
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
93 };
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
94
4e31d44a9763 extract caseless_str class to separate header file
John W. Eaton <jwe@octave.org>
parents:
diff changeset
95 #endif