octave-nkf: liboctave/chMatrix.cc annotate

annotate liboctave/chMatrix.cc @ 13741:b0e70a71647b stable release-3-4-3

Version 3.4.3 released. * configure.ac (AC_INIT): Version number is now 3.4.3. (OCTAVE_RELEASE_DATE): Update to 2011-10-10.

author	John W. Eaton <jwe@octave.org>
date	Mon, 10 Oct 2011 10:23:45 -0400
parents	12df7854fa7c
children	0c86ae6f7c34

rev	line source
1993 1b57120c997b [project @ 1996-03-03 01:16:15 by jwe] jwe parents: 1948 diff changeset	1 // Matrix manipulations.
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	2 /*
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	3
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11265 diff changeset	4 Copyright (C) 1995-2011 John W. Eaton
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	5 Copyright (C) 2010 VZLU Prague
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	6
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	8
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	9 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	10 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	11 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	12 option) any later version.
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	13
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	14 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	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	16 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	17 for more details.
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	18
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	19 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	20 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	21 <http://www.gnu.org/licenses/>.
1573 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 */
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	24
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	25 #ifdef HAVE_CONFIG_H
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	26 #include <config.h>
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	27 #endif
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	28
7048 845ca0affec0 [project @ 2007-10-22 16:55:41 by jwe] jwe parents: 7017 diff changeset	29 #include <cstring>
845ca0affec0 [project @ 2007-10-22 16:55:41 by jwe] jwe parents: 7017 diff changeset	30
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3225 diff changeset	31 #include <iostream>
1728 42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe] jwe parents: 1573 diff changeset	32 #include <string>
42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe] jwe parents: 1573 diff changeset	33
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	34 #include "lo-error.h"
2349 b369227ce3d2 [project @ 1996-07-27 07:59:20 by jwe] jwe parents: 2255 diff changeset	35 #include "str-vec.h"
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	36 #include "mx-base.h"
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	37 #include "mx-inlines.cc"
8774 b756ce0002db split implementation and interface in mx-op-defs and MArray-defs Jaroslav Hajek <highegg@gmail.com> parents: 8750 diff changeset	38 #include "mx-op-defs.h"
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	39
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	40 // charMatrix class.
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	41
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	42 charMatrix::charMatrix (char c)
10351 5150ceb4dbb4 base charMatrix and boolMatrix on Array<char> Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	43 : Array<char> ()
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	44 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	45 octave_idx_type nc = 1;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	46 octave_idx_type nr = 1;
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	47
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	48 resize (nr, nc);
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	49
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	50 elem (0, 0) = c;
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	51 }
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	52
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	53 charMatrix::charMatrix (const char *s)
10351 5150ceb4dbb4 base charMatrix and boolMatrix on Array<char> Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	54 : Array<char> ()
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	55 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	56 octave_idx_type nc = s ? strlen (s) : 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	57 octave_idx_type nr = s && nc > 0 ? 1 : 0;
2613 5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	58
5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	59 resize (nr, nc);
5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	60
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	61 for (octave_idx_type i = 0; i < nc; i++)
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	62 elem (0, i) = s[i];
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	63 }
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	64
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	65 charMatrix::charMatrix (const std::string& s)
10351 5150ceb4dbb4 base charMatrix and boolMatrix on Array<char> Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	66 : Array<char> ()
1733 f236cc1c8bee [project @ 1996-01-11 05:51:25 by jwe] jwe parents: 1728 diff changeset	67 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	68 octave_idx_type nc = s.length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	69 octave_idx_type nr = nc > 0 ? 1 : 0;
2613 5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	70
5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	71 resize (nr, nc);
5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	72
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	73 for (octave_idx_type i = 0; i < nc; i++)
1733 f236cc1c8bee [project @ 1996-01-11 05:51:25 by jwe] jwe parents: 1728 diff changeset	74 elem (0, i) = s[i];
f236cc1c8bee [project @ 1996-01-11 05:51:25 by jwe] jwe parents: 1728 diff changeset	75 }
f236cc1c8bee [project @ 1996-01-11 05:51:25 by jwe] jwe parents: 1728 diff changeset	76
2349 b369227ce3d2 [project @ 1996-07-27 07:59:20 by jwe] jwe parents: 2255 diff changeset	77 charMatrix::charMatrix (const string_vector& s)
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	78 : Array<char> (dim_vector (s.length (), s.max_length ()), 0)
2349 b369227ce3d2 [project @ 1996-07-27 07:59:20 by jwe] jwe parents: 2255 diff changeset	79 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	80 octave_idx_type nr = rows ();
2613 5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	81
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	82 for (octave_idx_type i = 0; i < nr; i++)
2349 b369227ce3d2 [project @ 1996-07-27 07:59:20 by jwe] jwe parents: 2255 diff changeset	83 {
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	84 const std::string si = s(i);
4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9227 diff changeset	85 octave_idx_type nc = si.length ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	86 for (octave_idx_type j = 0; j < nc; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10267 diff changeset	87 elem (i, j) = si[j];
2349 b369227ce3d2 [project @ 1996-07-27 07:59:20 by jwe] jwe parents: 2255 diff changeset	88 }
b369227ce3d2 [project @ 1996-07-27 07:59:20 by jwe] jwe parents: 2255 diff changeset	89 }
b369227ce3d2 [project @ 1996-07-27 07:59:20 by jwe] jwe parents: 2255 diff changeset	90
2384 d9147efd1a93 [project @ 1996-10-12 17:56:38 by jwe] jwe parents: 2350 diff changeset	91 bool
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	92 charMatrix::operator == (const charMatrix& a) const
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	93 {
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	94 if (rows () != a.rows () \|\| cols () != a.cols ())
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	95 return 0;
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	96
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9370 diff changeset	97 return mx_inline_equal (length (), data (), a.data ());
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	98 }
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	99
2384 d9147efd1a93 [project @ 1996-10-12 17:56:38 by jwe] jwe parents: 2350 diff changeset	100 bool
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	101 charMatrix::operator != (const charMatrix& a) const
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	102 {
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	103 return !(*this == a);
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	104 }
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	105
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	106 charMatrix&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	107 charMatrix::insert (const char *s, octave_idx_type r, octave_idx_type c)
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	108 {
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	109 if (s)
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	110 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	111 octave_idx_type s_len = strlen (s);
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	112
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	113 if (r < 0 \|\| r >= rows () \|\| c < 0 \|\| c + s_len - 1 > cols ())
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10267 diff changeset	114 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10267 diff changeset	115 (*current_liboctave_error_handler) ("range error for insert");
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10267 diff changeset	116 return *this;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10267 diff changeset	117 }
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	118
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	119 for (octave_idx_type i = 0; i < s_len; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10267 diff changeset	120 elem (r, c+i) = s[i];
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	121 }
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	122 return *this;
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	123 }
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	124
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	125 charMatrix&
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	126 charMatrix::insert (const charMatrix& a, octave_idx_type r, octave_idx_type c)
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	127 {
10351 5150ceb4dbb4 base charMatrix and boolMatrix on Array<char> Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	128 Array<char>::insert (a, r, c);
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	129 return *this;
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	130 }
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	131
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	132 std::string
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	133 charMatrix::row_as_string (octave_idx_type r, bool strip_ws) const
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	134 {
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	135 std::string retval;
2613 5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	136
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	137 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	138 octave_idx_type nc = cols ();
2613 5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	139
5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	140 if (r == 0 && nr == 0 && nc == 0)
5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	141 return retval;
5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	142
5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	143 if (r < 0 \|\| r >= nr)
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	144 {
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	145 (*current_liboctave_error_handler) ("range error for row_as_string");
2613 5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	146 return retval;
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	147 }
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	148
2613 5bcee07be597 [project @ 1997-01-21 03:52:08 by jwe] jwe parents: 2493 diff changeset	149 retval.resize (nc, '\0');
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	150
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	151 for (octave_idx_type i = 0; i < nc; i++)
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	152 retval[i] = elem (r, i);
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	153
11265 a117dc8ea1b9 charMatrix::row_as_string: never strip trailing nul characters John W. Eaton <jwe@octave.org> parents: 10521 diff changeset	154 if (strip_ws)
2493 8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2384 diff changeset	155 {
11265 a117dc8ea1b9 charMatrix::row_as_string: never strip trailing nul characters John W. Eaton <jwe@octave.org> parents: 10521 diff changeset	156 while (--nc >= 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10267 diff changeset	157 {
11265 a117dc8ea1b9 charMatrix::row_as_string: never strip trailing nul characters John W. Eaton <jwe@octave.org> parents: 10521 diff changeset	158 char c = retval[nc];
a117dc8ea1b9 charMatrix::row_as_string: never strip trailing nul characters John W. Eaton <jwe@octave.org> parents: 10521 diff changeset	159 if (c && c != ' ')
a117dc8ea1b9 charMatrix::row_as_string: never strip trailing nul characters John W. Eaton <jwe@octave.org> parents: 10521 diff changeset	160 break;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10267 diff changeset	161 }
3836 b8c1cb5b9fd9 [project @ 2001-05-31 19:30:49 by jwe] jwe parents: 3769 diff changeset	162
b8c1cb5b9fd9 [project @ 2001-05-31 19:30:49 by jwe] jwe parents: 3769 diff changeset	163 retval.resize (nc+1);
2493 8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2384 diff changeset	164 }
1780 6101360af703 [project @ 1996-01-24 07:55:06 by jwe] jwe parents: 1733 diff changeset	165
1573 403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	166 return retval;
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	167 }
403c60daa8c7 [project @ 1995-10-19 04:34:20 by jwe] jwe parents: diff changeset	168
2255 fb9611cfc9d2 [project @ 1996-05-22 19:31:32 by jwe] jwe parents: 1993 diff changeset	169 charMatrix
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	170 charMatrix::extract (octave_idx_type r1, octave_idx_type c1, 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	171 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	172 if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; }
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	173 if (c1 > c2) { octave_idx_type tmp = c1; c1 = c2; c2 = tmp; }
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	174
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	175 octave_idx_type new_r = r2 - r1 + 1;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	176 octave_idx_type new_c = c2 - c1 + 1;
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	177
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	178 charMatrix result (new_r, new_c);
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	179
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	180 for (octave_idx_type j = 0; j < new_c; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5105 diff changeset	181 for (octave_idx_type i = 0; i < new_r; i++)
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	182 result.elem (i, j) = elem (r1+i, c1+j);
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	183
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	184 return result;
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	185 }
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3136 diff changeset	186
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6456 diff changeset	187 charMatrix
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6456 diff changeset	188 charMatrix::diag (octave_idx_type k) const
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6456 diff changeset	189 {
10351 5150ceb4dbb4 base charMatrix and boolMatrix on Array<char> Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	190 return Array<char>::diag (k);
6979 2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6456 diff changeset	191 }
2883ea1c5c18 [project @ 2007-10-08 20:23:48 by dbateman] dbateman parents: 6456 diff changeset	192
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5307 diff changeset	193 // FIXME Do these really belong here? Maybe they should be
4015 6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe] jwe parents: 3836 diff changeset	194 // in a base class?
3136 af7ec9d3a5e6 [project @ 1998-02-01 20:11:06 by jwe] jwe parents: 2847 diff changeset	195
4015 6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe] jwe parents: 3836 diff changeset	196 boolMatrix
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe] jwe parents: 3836 diff changeset	197 charMatrix::all (int dim) const
3136 af7ec9d3a5e6 [project @ 1998-02-01 20:11:06 by jwe] jwe parents: 2847 diff changeset	198 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10351 diff changeset	199 return do_mx_red_op<bool, char> (*this, dim, mx_inline_all);
3136 af7ec9d3a5e6 [project @ 1998-02-01 20:11:06 by jwe] jwe parents: 2847 diff changeset	200 }
af7ec9d3a5e6 [project @ 1998-02-01 20:11:06 by jwe] jwe parents: 2847 diff changeset	201
4015 6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe] jwe parents: 3836 diff changeset	202 boolMatrix
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe] jwe parents: 3836 diff changeset	203 charMatrix::any (int dim) const
3136 af7ec9d3a5e6 [project @ 1998-02-01 20:11:06 by jwe] jwe parents: 2847 diff changeset	204 {
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10351 diff changeset	205 return do_mx_red_op<bool, char> (*this, dim, mx_inline_any);
3136 af7ec9d3a5e6 [project @ 1998-02-01 20:11:06 by jwe] jwe parents: 2847 diff changeset	206 }
af7ec9d3a5e6 [project @ 1998-02-01 20:11:06 by jwe] jwe parents: 2847 diff changeset	207
9578 7dafdb8b062f refactor comparison ops implementations Jaroslav Hajek <highegg@gmail.com> parents: 9550 diff changeset	208 MS_CMP_OPS (charMatrix, char)
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9370 diff changeset	209 MS_BOOL_OPS (charMatrix, char)
6456 7f5316cadaa2 [project @ 2007-03-26 16:18:26 by jwe] jwe parents: 5775 diff changeset	210
9578 7dafdb8b062f refactor comparison ops implementations Jaroslav Hajek <highegg@gmail.com> parents: 9550 diff changeset	211 SM_CMP_OPS (char, charMatrix)
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9370 diff changeset	212 SM_BOOL_OPS (char, charMatrix)
6456 7f5316cadaa2 [project @ 2007-03-26 16:18:26 by jwe] jwe parents: 5775 diff changeset	213
9578 7dafdb8b062f refactor comparison ops implementations Jaroslav Hajek <highegg@gmail.com> parents: 9550 diff changeset	214 MM_CMP_OPS (charMatrix, charMatrix)
9550 3d6a9aea2aea refactor binary & bool ops in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 9370 diff changeset	215 MM_BOOL_OPS (charMatrix, charMatrix)

Mercurial > octave-nkf

annotate liboctave/chMatrix.cc @ 13741:b0e70a71647b stable release-3-4-3