octave-nkf: liboctave/array/chMatrix.h annotate

annotate liboctave/array/chMatrix.h @ 19508:6c9ea5be96bf

Change charMatrix to subclass charNDArray rather than be another Array<char>. * chMatrix.h: both charMatrix and charNDArray are Array<char>, the first being simply 2 dimensional. We change this so that charMatrix inherits from charNDArray instead. * chMatrix.cc: remove all constructors which are now inherited from charNDArray. * chNDArray.h, chNDArray.cc: implement all constructors here rather than calling charMatrix. Remove matrix_value() since a charMatrix constructor is now enough. * pr-output.cc, octave-value/ov-ch-mat.h, octave-value/ov-str-mat.cc: replace calls to charNDArray::matrix_value () with the charMatrix constructor.

author	Carnë Draug <carandraug@octave.org>
date	Fri, 24 Oct 2014 01:31:53 +0100
parents	ebb3ef964372
children	8b4a24081e47

rev	line source
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	1 /*
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	2
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	3 Copyright (C) 1995-2013 John W. Eaton
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10364 diff changeset	4 Copyright (C) 2010 VZLU Prague
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	5
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	7
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6979 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6979 diff changeset	11 option) any later version.
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	12
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	16 for more details.
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	17
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6979 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6979 diff changeset	20 <http://www.gnu.org/licenses/>.
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	21
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	22 */
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	23
17822 ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files. Rik <rik@octave.org> parents: 17769 diff changeset	24 #if !defined (octave_chMatrix_h)
ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files. Rik <rik@octave.org> parents: 17769 diff changeset	25 #define octave_chMatrix_h 1
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	26
1728 42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe] jwe parents: 1687 diff changeset	27 #include <string>
42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe] jwe parents: 1687 diff changeset	28
10351 5150ceb4dbb4 base charMatrix and boolMatrix on Array<char> Jaroslav Hajek <highegg@gmail.com> parents: 10267 diff changeset	29 #include "Array.h"
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	30 #include "chNDArray.h"
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	31
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	32 #include "mx-defs.h"
8774 b756ce0002db split implementation and interface in mx-op-defs and MArray-defs Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	33 #include "mx-op-decl.h"
2349 b369227ce3d2 [project @ 1996-07-27 07:59:20 by jwe] jwe parents: 2255 diff changeset	34 #include "str-vec.h"
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	35
1728 42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe] jwe parents: 1687 diff changeset	36 class
6108 143b556ce725 [project @ 2006-10-27 01:45:54 by jwe] jwe parents: 5307 diff changeset	37 OCTAVE_API
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	38 charMatrix : public charNDArray
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	39 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	40 friend class ComplexMatrix;
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	41
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	42 public:
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	43
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	44 charMatrix (void) : charNDArray () { }
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	45
57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	46 charMatrix (octave_idx_type r, octave_idx_type c)
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	47 : charNDArray (dim_vector (r, c)) { }
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	48
57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	49 charMatrix (octave_idx_type r, octave_idx_type c, char val)
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	50 : charNDArray (dim_vector (r, c), val) { }
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	51
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	52 charMatrix (const dim_vector& dv) : charNDArray (dv) { }
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	53
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	54 charMatrix (const dim_vector& dv, char val) : charNDArray (dv, val) { }
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	55
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	56 charMatrix (const Array<char>& a) : charNDArray (a.as_matrix ()) { }
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	57
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	58 charMatrix (const charMatrix& a) : charNDArray (a) { }
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	59
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	60 charMatrix (char c) : charNDArray (c) {}
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	61
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	62 charMatrix (const char *s) : charNDArray (s) {}
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	63
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	64 charMatrix (const std::string& s) : charNDArray (s) {}
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	65
19508 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	66 charMatrix (const string_vector& s, char fill_value = '\0')
6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 17822 diff changeset	67 : charNDArray (s, fill_value) {}
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	68
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	69 charMatrix& operator = (const charMatrix& a)
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	70 {
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	71 Array<char>::operator = (a);
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	72 return *this;
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	73 }
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	74
2384 d9147efd1a93 [project @ 1996-10-12 17:56:38 by jwe] jwe parents: 2349 diff changeset	75 bool operator == (const charMatrix& a) const;
d9147efd1a93 [project @ 1996-10-12 17:56:38 by jwe] jwe parents: 2349 diff changeset	76 bool operator != (const charMatrix& a) const;
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	77
10351 5150ceb4dbb4 base charMatrix and boolMatrix on Array<char> Jaroslav Hajek <highegg@gmail.com> parents: 10267 diff changeset	78 charMatrix transpose (void) const { return Array<char>::transpose (); }
4902 bd043a433918 [project @ 2004-06-14 18:46:20 by jwe] jwe parents: 4192 diff changeset	79
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	80 // destructive insert/delete/reorder operations
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	81
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	82 charMatrix& insert (const char *s, octave_idx_type r, octave_idx_type c);
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	83 charMatrix& insert (const charMatrix& a,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	84 octave_idx_type r, octave_idx_type c);
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	85
11265 a117dc8ea1b9 charMatrix::row_as_string: never strip trailing nul characters John W. Eaton <jwe@octave.org> parents: 10521 diff changeset	86 std::string row_as_string (octave_idx_type, bool strip_ws = false) const;
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	87
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	88 // resize is the destructive equivalent for this one
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	89
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	90 charMatrix extract (octave_idx_type r1, octave_idx_type c1,
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	91 octave_idx_type r2, octave_idx_type c2) const;
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	92
14616 13cc11418393 improve handling of default resize fill value for arrays John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	93 void resize (octave_idx_type nr, octave_idx_type nc, char rfv = 0)
11574 a83bad07f7e3 attempt better backward compatibility for Array resize functions John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	94 {
a83bad07f7e3 attempt better backward compatibility for Array resize functions John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	95 Array<char>::resize (dim_vector (nr, nc), rfv);
a83bad07f7e3 attempt better backward compatibility for Array resize functions John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	96 }
a83bad07f7e3 attempt better backward compatibility for Array resize functions John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	97
7620 36594d5bbe13 Move diag function into the octave_value class David Bateman <dbateman@free.fr> parents: 7017 diff changeset	98 charMatrix diag (octave_idx_type k = 0) const;
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6708 diff changeset	99
4017 0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 4015 diff changeset	100 boolMatrix all (int dim = -1) const;
0eb247b9cc9b [project @ 2002-08-03 04:07:14 by jwe] jwe parents: 4015 diff changeset	101 boolMatrix any (int dim = -1) const;
3136 af7ec9d3a5e6 [project @ 1998-02-01 20:11:06 by jwe] jwe parents: 2847 diff changeset	102
2255 fb9611cfc9d2 [project @ 1996-05-22 19:31:32 by jwe] jwe parents: 1993 diff changeset	103 #if 0
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	104 // i/o
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	105
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3225 diff changeset	106 friend std::ostream& operator << (std::ostream& os, const Matrix& a);
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3225 diff changeset	107 friend std::istream& operator >> (std::istream& is, Matrix& a);
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	108 #endif
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	109 };
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	110
6708 0ce71beb1cf3 [project @ 2007-06-13 06:40:48 by jwe] jwe parents: 6456 diff changeset	111 MS_CMP_OP_DECLS (charMatrix, char, OCTAVE_API)
0ce71beb1cf3 [project @ 2007-06-13 06:40:48 by jwe] jwe parents: 6456 diff changeset	112 MS_BOOL_OP_DECLS (charMatrix, char, OCTAVE_API)
6456 7f5316cadaa2 [project @ 2007-03-26 16:18:26 by jwe] jwe parents: 6108 diff changeset	113
6708 0ce71beb1cf3 [project @ 2007-06-13 06:40:48 by jwe] jwe parents: 6456 diff changeset	114 SM_CMP_OP_DECLS (char, charMatrix, OCTAVE_API)
0ce71beb1cf3 [project @ 2007-06-13 06:40:48 by jwe] jwe parents: 6456 diff changeset	115 SM_BOOL_OP_DECLS (char, charMatrix, OCTAVE_API)
6456 7f5316cadaa2 [project @ 2007-03-26 16:18:26 by jwe] jwe parents: 6108 diff changeset	116
6708 0ce71beb1cf3 [project @ 2007-06-13 06:40:48 by jwe] jwe parents: 6456 diff changeset	117 MM_CMP_OP_DECLS (charMatrix, charMatrix, OCTAVE_API)
0ce71beb1cf3 [project @ 2007-06-13 06:40:48 by jwe] jwe parents: 6456 diff changeset	118 MM_BOOL_OP_DECLS (charMatrix, charMatrix, OCTAVE_API)
6456 7f5316cadaa2 [project @ 2007-03-26 16:18:26 by jwe] jwe parents: 6108 diff changeset	119
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	120 #endif

Mercurial > hg > octave-nkf

annotate liboctave/array/chMatrix.h @ 19508:6c9ea5be96bf