octave-nkf: src/ov-re-mat.cc annotate

annotate src/ov-re-mat.cc @ 10828:322f43e0e170

Grammarcheck .txi documentation files.

author	Rik <octave@nomad.inbox5.com>
date	Wed, 28 Jul 2010 12:45:04 -0700
parents	4d1fc073fbb7
children	0de5cc44e690

rev	line source
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1 /*
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	3 Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8754 diff changeset	4 2006, 2007, 2008, 2009 John W. Eaton
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10414 diff changeset	5 Copyright (C) 2009, 2010 VZLU Prague
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	6
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	8
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
2142216bf85a [project @ 1996-10-12 01:39:07 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: 7004 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: 7004 diff changeset	12 option) any later version.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	13
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	17 for more details.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	18
2142216bf85a [project @ 1996-10-12 01:39:07 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: 7004 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: 7004 diff changeset	21 <http://www.gnu.org/licenses/>.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	22
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	23 */
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	24
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	25 #ifdef HAVE_CONFIG_H
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	26 #include <config.h>
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	27 #endif
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	28
4100 ed0090ecf80f [project @ 2002-10-11 16:37:45 by jwe] jwe parents: 4066 diff changeset	29 #include <climits>
ed0090ecf80f [project @ 2002-10-11 16:37:45 by jwe] jwe parents: 4066 diff changeset	30
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3418 diff changeset	31 #include <iostream>
4726 14dc2267c343 [project @ 2004-01-23 20:04:35 by jwe] jwe parents: 4699 diff changeset	32 #include <vector>
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	33
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	34 #include "data-conv.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	35 #include "lo-ieee.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	36 #include "lo-utils.h"
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7017 diff changeset	37 #include "lo-specfun.h"
8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7017 diff changeset	38 #include "lo-mappers.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	39 #include "mach-info.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	40 #include "mx-base.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4102 diff changeset	41 #include "quit.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	42 #include "oct-locbuf.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	43
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4844 diff changeset	44 #include "defun.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	45 #include "gripes.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	46 #include "oct-obj.h"
2979 a3556d2adec9 [project @ 1997-05-15 22:35:37 by jwe] jwe parents: 2974 diff changeset	47 #include "oct-lvalue.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	48 #include "oct-stream.h"
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	49 #include "ops.h"
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3109 diff changeset	50 #include "ov-base.h"
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3109 diff changeset	51 #include "ov-base-mat.h"
30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3109 diff changeset	52 #include "ov-base-mat.cc"
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	53 #include "ov-scalar.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	54 #include "ov-re-mat.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	55 #include "ov-flt-re-mat.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	56 #include "ov-complex.h"
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	57 #include "ov-cx-mat.h"
7004 45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	58 #include "ov-re-sparse.h"
8399 c1bada868690 alow single/double conversion of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	59 #include "ov-re-diag.h"
c1bada868690 alow single/double conversion of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	60 #include "ov-cx-diag.h"
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	61 #include "ov-lazy-idx.h"
8399 c1bada868690 alow single/double conversion of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	62 #include "ov-perm.h"
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4844 diff changeset	63 #include "ov-type-conv.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	64 #include "pr-output.h"
2948 56be458e237f [project @ 1997-05-09 13:37:35 by jwe] jwe parents: 2916 diff changeset	65 #include "variables.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	66
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	67 #include "byte-swap.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	68 #include "ls-oct-ascii.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	69 #include "ls-utils.h"
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	70 #include "ls-hdf5.h"
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	71
4100 ed0090ecf80f [project @ 2002-10-11 16:37:45 by jwe] jwe parents: 4066 diff changeset	72 #if ! defined (UCHAR_MAX)
ed0090ecf80f [project @ 2002-10-11 16:37:45 by jwe] jwe parents: 4066 diff changeset	73 #define UCHAR_MAX 255
ed0090ecf80f [project @ 2002-10-11 16:37:45 by jwe] jwe parents: 4066 diff changeset	74 #endif
ed0090ecf80f [project @ 2002-10-11 16:37:45 by jwe] jwe parents: 4066 diff changeset	75
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	76 template class octave_base_matrix<NDArray>;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	77
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3109 diff changeset	78 DEFINE_OCTAVE_ALLOCATOR (octave_matrix);
2477 3d905d3820a4 [project @ 1996-11-07 16:46:11 by jwe] jwe parents: 2466 diff changeset	79
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4513 diff changeset	80 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_matrix, "matrix", "double");
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	81
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	82 static octave_base_value *
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	83 default_numeric_demotion_function (const octave_base_value& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	84 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	85 CAST_CONV_ARG (const octave_matrix&);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	86
8754 900a5bf52309 Fix invalid conversion error on implicit demotion of n-d arrays Jaroslav Hajek <highegg@gmail.com> parents: 8650 diff changeset	87 return new octave_float_matrix (v.float_array_value ());
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	88 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	89
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 7922 diff changeset	90 octave_base_value::type_conv_info
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	91 octave_matrix::numeric_demotion_function (void) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	92 {
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 7922 diff changeset	93 return octave_base_value::type_conv_info(default_numeric_demotion_function,
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 7922 diff changeset	94 octave_float_matrix::static_type_id ());
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	95 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	96
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5307 diff changeset	97 octave_base_value *
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	98 octave_matrix::try_narrowing_conversion (void)
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	99 {
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5307 diff changeset	100 octave_base_value *retval = 0;
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	101
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	102 if (matrix.nelem () == 1)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	103 retval = new octave_scalar (matrix (0));
2410 367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	104
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	105 return retval;
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	106 }
367485171742 [project @ 1996-10-15 16:50:27 by jwe] jwe parents: 2407 diff changeset	107
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	108 double
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	109 octave_matrix::double_value (bool) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	110 {
4102 cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4100 diff changeset	111 double retval = lo_ieee_nan_value ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	112
4645 bd2067547b40 [project @ 2003-11-23 08:07:52 by jwe] jwe parents: 4643 diff changeset	113 if (numel () > 0)
4455 abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	114 {
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	115 gripe_implicit_conversion ("Octave:array-as-scalar",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	116 "real matrix", "real scalar");
4455 abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	117
abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	118 retval = matrix (0, 0);
abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	119 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	120 else
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	121 gripe_invalid_conversion ("real matrix", "real scalar");
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	122
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	123 return retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	124 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	125
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	126 float
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	127 octave_matrix::float_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	128 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	129 float retval = lo_ieee_float_nan_value ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	130
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	131 if (numel () > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	132 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	133 gripe_implicit_conversion ("Octave:array-as-scalar",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	134 "real matrix", "real scalar");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	135
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	136 retval = matrix (0, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	137 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	138 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	139 gripe_invalid_conversion ("real matrix", "real scalar");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	140
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	141 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	142 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	143
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5760 diff changeset	144 // FIXME
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	145
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	146 Matrix
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	147 octave_matrix::matrix_value (bool) const
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	148 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	149 return matrix.matrix_value ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	150 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	151
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	152 FloatMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	153 octave_matrix::float_matrix_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	154 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	155 return FloatMatrix (matrix.matrix_value ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	156 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	157
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	158 Complex
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	159 octave_matrix::complex_value (bool) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	160 {
4102 cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4100 diff changeset	161 double tmp = lo_ieee_nan_value ();
cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4100 diff changeset	162
cbac6756967e [project @ 2002-10-14 20:16:44 by jwe] jwe parents: 4100 diff changeset	163 Complex retval (tmp, tmp);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	164
4455 abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	165 if (rows () > 0 && columns () > 0)
abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	166 {
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5775 diff changeset	167 gripe_implicit_conversion ("Octave:array-as-scalar",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	168 "real matrix", "complex scalar");
4455 abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	169
abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	170 retval = matrix (0, 0);
abbf63293766 [project @ 2003-07-11 01:01:16 by jwe] jwe parents: 4452 diff changeset	171 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	172 else
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	173 gripe_invalid_conversion ("real matrix", "complex scalar");
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	174
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	175 return retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	176 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	177
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	178 FloatComplex
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	179 octave_matrix::float_complex_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	180 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	181 float tmp = lo_ieee_float_nan_value ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	182
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	183 FloatComplex retval (tmp, tmp);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	184
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	185 if (rows () > 0 && columns () > 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	186 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	187 gripe_implicit_conversion ("Octave:array-as-scalar",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	188 "real matrix", "complex scalar");
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	189
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	190 retval = matrix (0, 0);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	191 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	192 else
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	193 gripe_invalid_conversion ("real matrix", "complex scalar");
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	194
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	195 return retval;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	196 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	197
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5760 diff changeset	198 // FIXME
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	199
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	200 ComplexMatrix
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	201 octave_matrix::complex_matrix_value (bool) const
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	202 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	203 return ComplexMatrix (matrix.matrix_value ());
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	204 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	205
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	206 FloatComplexMatrix
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	207 octave_matrix::float_complex_matrix_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	208 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	209 return FloatComplexMatrix (matrix.matrix_value ());
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	210 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	211
4699 5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	212 ComplexNDArray
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	213 octave_matrix::complex_array_value (bool) const
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	214 {
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	215 return ComplexNDArray (matrix);
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	216 }
5e2c68946f30 [project @ 2004-01-20 23:04:46 by jwe] jwe parents: 4687 diff changeset	217
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	218 FloatComplexNDArray
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	219 octave_matrix::float_complex_array_value (bool) const
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	220 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	221 return FloatComplexNDArray (matrix);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	222 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	223
5898 da843f35775c [project @ 2006-07-19 18:18:08 by jwe] jwe parents: 5862 diff changeset	224 boolNDArray
5943 c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5900 diff changeset	225 octave_matrix::bool_array_value (bool warn) const
5898 da843f35775c [project @ 2006-07-19 18:18:08 by jwe] jwe parents: 5862 diff changeset	226 {
7922 935be827eaf8 error for NaN values in & and \| expressions John W. Eaton <jwe@octave.org> parents: 7885 diff changeset	227 if (matrix.any_element_is_nan ())
935be827eaf8 error for NaN values in & and \| expressions John W. Eaton <jwe@octave.org> parents: 7885 diff changeset	228 error ("invalid conversion from NaN to logical");
935be827eaf8 error for NaN values in & and \| expressions John W. Eaton <jwe@octave.org> parents: 7885 diff changeset	229 else if (warn && matrix.any_element_not_one_or_zero ())
5943 c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5900 diff changeset	230 gripe_logical_conversion ();
c038c2947ee1 [project @ 2006-08-18 21:27:03 by jwe] jwe parents: 5900 diff changeset	231
5898 da843f35775c [project @ 2006-07-19 18:18:08 by jwe] jwe parents: 5862 diff changeset	232 return boolNDArray (matrix);
da843f35775c [project @ 2006-07-19 18:18:08 by jwe] jwe parents: 5862 diff changeset	233 }
da843f35775c [project @ 2006-07-19 18:18:08 by jwe] jwe parents: 5862 diff changeset	234
4758 a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	235 charNDArray
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	236 octave_matrix::char_array_value (bool) const
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	237 {
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	238 charNDArray retval (dims ());
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	239
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	240 octave_idx_type nel = numel ();
4758 a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	241
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	242 for (octave_idx_type i = 0; i < nel; i++)
4758 a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	243 retval.elem (i) = static_cast<char>(matrix.elem (i));
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	244
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	245 return retval;
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	246 }
a308566c8b42 [project @ 2004-02-13 23:01:34 by jwe] jwe parents: 4726 diff changeset	247
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	248 SparseMatrix
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	249 octave_matrix::sparse_matrix_value (bool) const
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	250 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	251 return SparseMatrix (matrix.matrix_value ());
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	252 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	253
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	254 SparseComplexMatrix
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	255 octave_matrix::sparse_complex_matrix_value (bool) const
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	256 {
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5760 diff changeset	257 // FIXME Need a SparseComplexMatrix (Matrix) constructor to make
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	258 // this function more efficient. Then this should become
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	259 // return SparseComplexMatrix (matrix.matrix_value ());
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	260 return SparseComplexMatrix (sparse_matrix_value ());
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	261 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	262
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	263 octave_value
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	264 octave_matrix::diag (octave_idx_type k) const
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	265 {
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	266 octave_value retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	267 if (k == 0 && matrix.ndims () == 2
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	268 && (matrix.rows () == 1 \|\| matrix.columns () == 1))
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	269 retval = DiagMatrix (DiagArray2<double> (matrix));
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	270 else
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	271 retval = octave_base_matrix<NDArray>::diag (k);
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	272
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	273 return retval;
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	274 }
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	275
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	276 // We override these two functions to allow reshaping both
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	277 // the matrix and the index cache.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	278 octave_value
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	279 octave_matrix::reshape (const dim_vector& new_dims) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	280 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	281 if (idx_cache)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	282 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	283 return new octave_matrix (matrix.reshape (new_dims),
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	284 idx_vector (idx_cache->as_array ().reshape (new_dims),
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	285 idx_cache->extent (0)));
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	286 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	287 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	288 return octave_base_matrix<NDArray>::reshape (new_dims);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	289 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	290
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	291 octave_value
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	292 octave_matrix::squeeze (void) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	293 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	294 if (idx_cache)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	295 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	296 return new octave_matrix (matrix.squeeze (),
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	297 idx_vector (idx_cache->as_array ().squeeze (),
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	298 idx_cache->extent (0)));
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	299 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	300 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	301 return octave_base_matrix<NDArray>::squeeze ();
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	302 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	303
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	304 octave_value
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	305 octave_matrix::sort (octave_idx_type dim, sortmode mode) const
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	306 {
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	307 if (idx_cache)
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	308 {
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	309 // This is a valid index matrix, so sort via integers because it's
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	310 // generally more efficient.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	311 return octave_lazy_index (*idx_cache).sort (dim, mode);
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	312 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	313 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	314 return octave_base_matrix<NDArray>::sort (dim, mode);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	315 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	316
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	317 octave_value
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	318 octave_matrix::sort (Array<octave_idx_type> &sidx, octave_idx_type dim,
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	319 sortmode mode) const
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	320 {
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	321 if (idx_cache)
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	322 {
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	323 // This is a valid index matrix, so sort via integers because it's
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	324 // generally more efficient.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	325 return octave_lazy_index (*idx_cache).sort (sidx, dim, mode);
10273 3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	326 }
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	327 else
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	328 return octave_base_matrix<NDArray>::sort (sidx, dim, mode);
3a8c13b71612 implement special-case optimization for sort of index vectors Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	329 }
10339 de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	330
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	331 sortmode
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	332 octave_matrix::is_sorted (sortmode mode) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	333 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	334 if (idx_cache)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	335 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	336 // This is a valid index matrix, so check via integers because it's
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	337 // generally more efficient.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	338 return idx_cache->as_array ().is_sorted (mode);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	339 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	340 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	341 return octave_base_matrix<NDArray>::is_sorted (mode);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	342 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	343 Array<octave_idx_type>
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	344 octave_matrix::sort_rows_idx (sortmode mode) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	345 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	346 if (idx_cache)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	347 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	348 // This is a valid index matrix, so sort via integers because it's
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	349 // generally more efficient.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	350 return octave_lazy_index (*idx_cache).sort_rows_idx (mode);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	351 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	352 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	353 return octave_base_matrix<NDArray>::sort_rows_idx (mode);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	354 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	355
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	356 sortmode
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	357 octave_matrix::is_sorted_rows (sortmode mode) const
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	358 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	359 if (idx_cache)
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	360 {
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	361 // This is a valid index matrix, so check via integers because it's
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	362 // generally more efficient.
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	363 return idx_cache->as_array ().is_sorted_rows (mode);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	364 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	365 else
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	366 return octave_base_matrix<NDArray>::is_sorted_rows (mode);
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	367 }
de2d43bcb083 optimize some lazy index operations Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	368
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	369 octave_value
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	370 octave_matrix::convert_to_str_internal (bool, bool, char type) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	371 {
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	372 octave_value retval;
4844 9f7ef92b50b0 [project @ 2004-04-02 17:26:53 by jwe] jwe parents: 4837 diff changeset	373 dim_vector dv = dims ();
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	374 octave_idx_type nel = dv.numel ();
2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	375
2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	376 charNDArray chm (dv);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	377
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	378 bool warned = false;
2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	379
2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	380 for (octave_idx_type i = 0; i < nel; i++)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	381 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	382 octave_quit ();
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	383
2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	384 double d = matrix (i);
4844 9f7ef92b50b0 [project @ 2004-04-02 17:26:53 by jwe] jwe parents: 4837 diff changeset	385
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	386 if (xisnan (d))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	387 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	388 ::error ("invalid conversion from NaN to character");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	389 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	390 }
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	391 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	392 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	393 int ival = NINT (d);
4844 9f7ef92b50b0 [project @ 2004-04-02 17:26:53 by jwe] jwe parents: 4837 diff changeset	394
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	395 if (ival < 0 \|\| ival > UCHAR_MAX)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	396 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	397 // FIXME -- is there something
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	398 // better we could do?
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	399
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	400 ival = 0;
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	401
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	402 if (! warned)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	403 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	404 ::warning ("range error for conversion to character value");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	405 warned = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	406 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	407 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	408
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	409 chm (i) = static_cast<char> (ival);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	410 }
5862 2b35a7fe9302 [project @ 2006-06-20 04:31:56 by jwe] jwe parents: 5828 diff changeset	411 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	412
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9470 diff changeset	413 retval = octave_value (chm, type);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	414
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	415 return retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	416 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	417
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	418 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6717 diff changeset	419 octave_matrix::save_ascii (std::ostream& os)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	420 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	421 dim_vector d = dims ();
5958 85c7dc4afe6b [project @ 2006-08-23 18:35:38 by jwe] jwe parents: 5956 diff changeset	422
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	423 if (d.length () > 2)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	424 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	425 NDArray tmp = array_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	426
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	427 os << "# ndims: " << d.length () << "\n";
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	428
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	429 for (int i=0; i < d.length (); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	430 os << " " << d (i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	431
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	432 os << "\n" << tmp;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	433 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	434 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	435 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	436 // Keep this case, rather than use generic code above for backward
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	437 // compatiability. Makes load_ascii much more complex!!
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	438 os << "# rows: " << rows () << "\n"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	439 << "# columns: " << columns () << "\n";
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	440
5958 85c7dc4afe6b [project @ 2006-08-23 18:35:38 by jwe] jwe parents: 5956 diff changeset	441 os << matrix_value ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	442 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	443
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	444 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	445 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	446
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	447 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	448 octave_matrix::load_ascii (std::istream& is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	449 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	450 bool success = true;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	451
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	452 string_vector keywords(2);
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	453
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	454 keywords[0] = "ndims";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	455 keywords[1] = "rows";
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	456
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	457 std::string kw;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	458 octave_idx_type val = 0;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	459
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	460 if (extract_keyword (is, keywords, kw, val, true))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	461 {
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	462 if (kw == "ndims")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	463 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	464 int mdims = static_cast<int> (val);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	465
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	466 if (mdims >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	467 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	468 dim_vector dv;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	469 dv.resize (mdims);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	470
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	471 for (int i = 0; i < mdims; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	472 is >> dv(i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	473
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	474 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	475 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	476 NDArray tmp(dv);
6717 b319df52ba87 [project @ 2007-06-13 20:25:53 by jwe] jwe parents: 6686 diff changeset	477
8999 dc07bc4157b8 allow empty matrices in stream input operators Jaroslav Hajek <highegg@gmail.com> parents: 8998 diff changeset	478 is >> tmp;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	479
8999 dc07bc4157b8 allow empty matrices in stream input operators Jaroslav Hajek <highegg@gmail.com> parents: 8998 diff changeset	480 if (is)
dc07bc4157b8 allow empty matrices in stream input operators Jaroslav Hajek <highegg@gmail.com> parents: 8998 diff changeset	481 matrix = tmp;
dc07bc4157b8 allow empty matrices in stream input operators Jaroslav Hajek <highegg@gmail.com> parents: 8998 diff changeset	482 else
dc07bc4157b8 allow empty matrices in stream input operators Jaroslav Hajek <highegg@gmail.com> parents: 8998 diff changeset	483 {
dc07bc4157b8 allow empty matrices in stream input operators Jaroslav Hajek <highegg@gmail.com> parents: 8998 diff changeset	484 error ("load: failed to load matrix constant");
dc07bc4157b8 allow empty matrices in stream input operators Jaroslav Hajek <highegg@gmail.com> parents: 8998 diff changeset	485 success = false;
dc07bc4157b8 allow empty matrices in stream input operators Jaroslav Hajek <highegg@gmail.com> parents: 8998 diff changeset	486 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	487 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	488 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	489 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	490 error ("load: failed to read dimensions");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	491 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	492 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	493 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	494 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	495 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	496 error ("load: failed to extract number of dimensions");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	497 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	498 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	499 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	500 else if (kw == "rows")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	501 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	502 octave_idx_type nr = val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	503 octave_idx_type nc = 0;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	504
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	505 if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	506 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	507 if (nr > 0 && nc > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	508 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	509 Matrix tmp (nr, nc);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	510 is >> tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	511 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	512 matrix = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	513 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	514 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	515 error ("load: failed to load matrix constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	516 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	517 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	518 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	519 else if (nr == 0 \|\| nc == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	520 matrix = Matrix (nr, nc);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	521 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	522 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	523 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	524 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	525 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	526 error ("load: failed to extract number of rows and columns");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	527 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	528 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	529 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	530 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	531 panic_impossible ();
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	532 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	533 else
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	534 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	535 error ("load: failed to extract number of rows and columns");
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 4944 diff changeset	536 success = false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	537 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	538
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	539 return success;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	540 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	541
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	542 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	543 octave_matrix::save_binary (std::ostream& os, bool& save_as_floats)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	544 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	545
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	546 dim_vector d = dims ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	547 if (d.length() < 1)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	548 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	549
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	550 // Use negative value for ndims to differentiate with old format!!
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	551 int32_t tmp = - d.length();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	552 os.write (reinterpret_cast<char *> (&tmp), 4);
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	553 for (int i = 0; i < d.length (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	554 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	555 tmp = d(i);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	556 os.write (reinterpret_cast<char *> (&tmp), 4);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	557 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	558
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	559 NDArray m = array_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	560 save_type st = LS_DOUBLE;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	561 if (save_as_floats)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	562 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	563 if (m.too_large_for_float ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	564 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	565 warning ("save: some values too large to save as floats --");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	566 warning ("save: saving as doubles instead");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	567 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	568 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	569 st = LS_FLOAT;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	570 }
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5760 diff changeset	571 else if (d.numel () > 8192) // FIXME -- make this configurable.
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	572 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	573 double max_val, min_val;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	574 if (m.all_integers (max_val, min_val))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	575 st = get_save_type (max_val, min_val);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	576 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	577
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	578 const double *mtmp = m.data ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	579 write_doubles (os, mtmp, st, d.numel ());
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	580
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	581 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	582 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	583
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	584 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	585 octave_matrix::load_binary (std::istream& is, bool swap,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	586 oct_mach_info::float_format fmt)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	587 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	588 char tmp;
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	589 int32_t mdims;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	590 if (! is.read (reinterpret_cast<char *> (&mdims), 4))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	591 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	592 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	593 swap_bytes<4> (&mdims);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	594 if (mdims < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	595 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	596 mdims = - mdims;
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	597 int32_t di;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	598 dim_vector dv;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	599 dv.resize (mdims);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	600
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	601 for (int i = 0; i < mdims; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	602 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	603 if (! is.read (reinterpret_cast<char *> (&di), 4))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	604 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	605 if (swap)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	606 swap_bytes<4> (&di);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	607 dv(i) = di;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	608 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	609
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	610 // Convert an array with a single dimension to be a row vector.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	611 // Octave should never write files like this, other software
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	612 // might.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	613
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	614 if (mdims == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	615 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	616 mdims = 2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	617 dv.resize (mdims);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	618 dv(1) = dv(0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	619 dv(0) = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	620 }
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	621
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	622 if (! is.read (reinterpret_cast<char *> (&tmp), 1))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	623 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	624
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	625 NDArray m(dv);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	626 double *re = m.fortran_vec ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	627 read_doubles (is, re, static_cast<save_type> (tmp), dv.numel (), swap, fmt);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	628 if (error_state \|\| ! is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	629 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	630 matrix = m;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	631 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	632 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	633 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	634 int32_t nr, nc;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	635 nr = mdims;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	636 if (! is.read (reinterpret_cast<char *> (&nc), 4))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	637 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	638 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	639 swap_bytes<4> (&nc);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	640 if (! is.read (reinterpret_cast<char *> (&tmp), 1))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	641 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	642 Matrix m (nr, nc);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	643 double *re = m.fortran_vec ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	644 octave_idx_type len = nr * nc;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	645 read_doubles (is, re, static_cast<save_type> (tmp), len, swap, fmt);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	646 if (error_state \|\| ! is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	647 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	648 matrix = m;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	649 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	650 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	651 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	652
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	653 #if defined (HAVE_HDF5)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	654
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	655 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	656 octave_matrix::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	657 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	658 dim_vector dv = dims ();
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	659 int empty = save_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	660 if (empty)
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	661 return (empty > 0);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	662
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	663 int rank = dv.length ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	664 hid_t space_hid = -1, data_hid = -1;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	665 bool retval = true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	666 NDArray m = array_value ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	667
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	668 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	669
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	670 // Octave uses column-major, while HDF5 uses row-major ordering
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	671 for (int i = 0; i < rank; i++)
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	672 hdims[i] = dv (rank-i-1);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	673
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4805 diff changeset	674 space_hid = H5Screate_simple (rank, hdims, 0);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	675
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	676 if (space_hid < 0) return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	677
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	678 hid_t save_type_hid = H5T_NATIVE_DOUBLE;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	679
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	680 if (save_as_floats)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	681 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	682 if (m.too_large_for_float ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	683 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	684 warning ("save: some values too large to save as floats --");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	685 warning ("save: saving as doubles instead");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	686 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	687 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	688 save_type_hid = H5T_NATIVE_FLOAT;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	689 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	690 #if HAVE_HDF5_INT2FLOAT_CONVERSIONS
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	691 // hdf5 currently doesn't support float/integer conversions
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	692 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	693 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	694 double max_val, min_val;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	695
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	696 if (m.all_integers (max_val, min_val))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	697 save_type_hid
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	698 = save_type_to_hdf5 (get_save_type (max_val, min_val));
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	699 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	700 #endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	701
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	702 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	703 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	704 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	705 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	706 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	707 H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	708 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	709 if (data_hid < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	710 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	711 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	712 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	713 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	714
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	715 double *mtmp = m.fortran_vec ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	716 retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	717 H5P_DEFAULT, mtmp) >= 0;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	718
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	719 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	720 H5Sclose (space_hid);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	721
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	722 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	723 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	724
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	725 bool
9881 b3089dba88bf Remove HDF5 cruft for older versions of HDF5 Kacper Kowalik parents: 9835 diff changeset	726 octave_matrix::load_hdf5 (hid_t loc_id, const char *name)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	727 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	728 bool retval = false;
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	729
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	730 dim_vector dv;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	731 int empty = load_hdf5_empty (loc_id, name, dv);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	732 if (empty > 0)
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	733 matrix.resize(dv);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	734 if (empty)
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	735 return (empty > 0);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4758 diff changeset	736
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	737 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	738 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	739 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	740 hid_t data_hid = H5Dopen (loc_id, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	741 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	742 hid_t space_id = H5Dget_space (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	743
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	744 hsize_t rank = H5Sget_simple_extent_ndims (space_id);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	745
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	746 if (rank < 1)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	747 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	748 H5Sclose (space_id);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	749 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	750 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	751 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	752
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	753 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	754 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	755
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	756 H5Sget_simple_extent_dims (space_id, hdims, maxdims);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	757
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	758 // Octave uses column-major, while HDF5 uses row-major ordering
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	759 if (rank == 1)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	760 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	761 dv.resize (2);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	762 dv(0) = 1;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	763 dv(1) = hdims[0];
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	764 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	765 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	766 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	767 dv.resize (rank);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4805 diff changeset	768 for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	769 dv(j) = hdims[i];
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	770 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	771
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	772 NDArray m (dv);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	773 double *re = m.fortran_vec ();
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	774 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	775 H5P_DEFAULT, re) >= 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	776 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	777 retval = true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	778 matrix = m;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	779 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	780
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	781 H5Sclose (space_id);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	782 H5Dclose (data_hid);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	783
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	784 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	785 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4901 diff changeset	786
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	787 #endif
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4645 diff changeset	788
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	789 void
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	790 octave_matrix::print_raw (std::ostream& os,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	791 bool pr_as_read_syntax) const
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	792 {
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	793 octave_print_internal (os, matrix, pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	794 current_print_indent_level ());
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	795 }
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	796
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	797 mxArray *
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	798 octave_matrix::as_mxArray (void) const
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	799 {
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	800 mxArray *retval = new mxArray (mxDOUBLE_CLASS, dims (), mxREAL);
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	801
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	802 double pr = static_cast<double > (retval->get_data ());
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	803
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 5958 diff changeset	804 mwSize nel = numel ();
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	805
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	806 const double *p = matrix.data ();
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	807
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 5958 diff changeset	808 for (mwIndex i = 0; i < nel; i++)
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	809 pr[i] = p[i];
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	810
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	811 return retval;
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	812 }
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5898 diff changeset	813
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	814 // This uses a smarter strategy for doing the complex->real mappers. We
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	815 // allocate an array for a real result and keep filling it until a complex
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	816 // result is produced.
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	817 static octave_value
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	818 do_rc_map (const NDArray& a, Complex (&fcn) (double))
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	819 {
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	820 octave_idx_type n = a.numel ();
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	821 NoAlias<NDArray> rr (a.dims ());
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	822
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	823 for (octave_idx_type i = 0; i < n; i++)
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	824 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	825 octave_quit ();
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	826
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	827 Complex tmp = fcn (a(i));
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	828 if (tmp.imag () == 0.0)
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	829 rr(i) = tmp.real ();
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	830 else
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	831 {
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	832 NoAlias<ComplexNDArray> rc (a.dims ());
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	833
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	834 for (octave_idx_type j = 0; j < i; j++)
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	835 rc(j) = rr(j);
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	836
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	837 rc(i) = tmp;
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	838
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	839 for (octave_idx_type j = i+1; j < n; j++)
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	840 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	841 octave_quit ();
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	842
9824 6631c61a4a4e fix typos in previous change Jaroslav Hajek <highegg@gmail.com> parents: 9823 diff changeset	843 rc(j) = fcn (a(j));
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	844 }
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	845
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	846 return new octave_complex_matrix (rc);
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	847 }
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	848 }
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	849
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	850 return rr;
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	851 }
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	852
8650 a1ae2aae903e abs,real,imag,conj: use code from mx-inlines rather than the generic map Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	853 octave_value
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	854 octave_matrix::map (unary_mapper_t umap) const
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7017 diff changeset	855 {
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	856 switch (umap)
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	857 {
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	858 case umap_imag:
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	859 return NDArray (matrix.dims (), 0.0);
8650 a1ae2aae903e abs,real,imag,conj: use code from mx-inlines rather than the generic map Jaroslav Hajek <highegg@gmail.com> parents: 8437 diff changeset	860
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	861 case umap_real:
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	862 case umap_conj:
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	863 return matrix;
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7017 diff changeset	864
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	865 // Mappers handled specially.
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	866 #define ARRAY_METHOD_MAPPER(UMAP, FCN) \
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	867 case umap_ ## UMAP: \
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	868 return octave_value (matrix.FCN ())
8998 a48fba01e4ac optimize isnan/isinf/isfinite mappers Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	869
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	870 ARRAY_METHOD_MAPPER (abs, abs);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	871 ARRAY_METHOD_MAPPER (isnan, isnan);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	872 ARRAY_METHOD_MAPPER (isinf, isinf);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	873 ARRAY_METHOD_MAPPER (finite, isfinite);
8998 a48fba01e4ac optimize isnan/isinf/isfinite mappers Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	874
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	875 #define ARRAY_MAPPER(UMAP, TYPE, FCN) \
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	876 case umap_ ## UMAP: \
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	877 return octave_value (matrix.map<TYPE> (FCN))
8998 a48fba01e4ac optimize isnan/isinf/isfinite mappers Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	878
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	879 #define RC_ARRAY_MAPPER(UMAP, TYPE, FCN) \
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	880 case umap_ ## UMAP: \
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	881 return do_rc_map (matrix, FCN)
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	882
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	883 RC_ARRAY_MAPPER (acos, Complex, rc_acos);
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	884 RC_ARRAY_MAPPER (acosh, Complex, rc_acosh);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	885 ARRAY_MAPPER (angle, double, ::arg);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	886 ARRAY_MAPPER (arg, double, ::arg);
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	887 RC_ARRAY_MAPPER (asin, Complex, rc_asin);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	888 ARRAY_MAPPER (asinh, double, ::asinh);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	889 ARRAY_MAPPER (atan, double, ::atan);
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	890 RC_ARRAY_MAPPER (atanh, Complex, rc_atanh);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	891 ARRAY_MAPPER (erf, double, ::erf);
9835 1bb1ed717d2f implement built-in erfinv Jaroslav Hajek <highegg@gmail.com> parents: 9824 diff changeset	892 ARRAY_MAPPER (erfinv, double, ::erfinv);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	893 ARRAY_MAPPER (erfc, double, ::erfc);
10391 59e34bcdff13 implement built-in erfcx Jaroslav Hajek <highegg@gmail.com> parents: 10339 diff changeset	894 ARRAY_MAPPER (erfcx, double, ::erfcx);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	895 ARRAY_MAPPER (gamma, double, xgamma);
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	896 RC_ARRAY_MAPPER (lgamma, Complex, rc_lgamma);
10414 2a8b1db1e2ca implement built-in cbrt Jaroslav Hajek <highegg@gmail.com> parents: 10391 diff changeset	897 ARRAY_MAPPER (cbrt, double, ::cbrt);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	898 ARRAY_MAPPER (ceil, double, ::ceil);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	899 ARRAY_MAPPER (cos, double, ::cos);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	900 ARRAY_MAPPER (cosh, double, ::cosh);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	901 ARRAY_MAPPER (exp, double, ::exp);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	902 ARRAY_MAPPER (expm1, double, ::expm1);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	903 ARRAY_MAPPER (fix, double, ::fix);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	904 ARRAY_MAPPER (floor, double, ::floor);
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	905 RC_ARRAY_MAPPER (log, Complex, rc_log);
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	906 RC_ARRAY_MAPPER (log2, Complex, rc_log2);
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	907 RC_ARRAY_MAPPER (log10, Complex, rc_log10);
9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	908 RC_ARRAY_MAPPER (log1p, Complex, rc_log1p);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	909 ARRAY_MAPPER (round, double, xround);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	910 ARRAY_MAPPER (roundb, double, xroundb);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	911 ARRAY_MAPPER (signum, double, ::signum);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	912 ARRAY_MAPPER (sin, double, ::sin);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	913 ARRAY_MAPPER (sinh, double, ::sinh);
9823 9b62f2d8de6d improve r->c mapper strategy Jaroslav Hajek <highegg@gmail.com> parents: 9813 diff changeset	914 RC_ARRAY_MAPPER (sqrt, Complex, rc_sqrt);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	915 ARRAY_MAPPER (tan, double, ::tan);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	916 ARRAY_MAPPER (tanh, double, ::tanh);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	917 ARRAY_MAPPER (isna, bool, octave_is_NA);
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	918
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	919 default:
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	920 if (umap >= umap_xisalnum && umap <= umap_xtoupper)
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	921 {
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	922 octave_value str_conv = convert_to_str (true, true);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	923 return error_state ? octave_value () : str_conv.map (umap);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	924 }
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	925 else
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9812 diff changeset	926 return octave_base_value::map (umap);
9812 f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	927 }
f80c566bc751 improve unary mapper system Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	928 }
7503 8c32f95c2639 convert mapper functions to new format David Bateman <dbateman@free.fr> parents: 7017 diff changeset	929
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4844 diff changeset	930 DEFUN (double, args, ,
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4844 diff changeset	931 "-- texinfo --\n\
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4844 diff changeset	932 @deftypefn {Built-in Function} {} double (@var{x})\n\
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4844 diff changeset	933 Convert @var{x} to double precision type.\n\
9309 fb8b8589dd46 Expand documentation for 'complex' function Rik <rdrider0-list@yahoo.com> parents: 9184 diff changeset	934 @seealso{single}\n\
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4844 diff changeset	935 @end deftypefn")
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4844 diff changeset	936 {
7004 45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	937 // The OCTAVE_TYPE_CONV_BODY3 macro declares retval, so they go
45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	938 // inside their own scopes, and we don't declare retval here to
45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	939 // avoid a shadowed declaration warning.
45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	940
9184 9861b3ec72a6 fix bug in double Jaroslav Hajek <highegg@gmail.com> parents: 8999 diff changeset	941 if (args.length () == 1)
8399 c1bada868690 alow single/double conversion of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	942 {
9184 9861b3ec72a6 fix bug in double Jaroslav Hajek <highegg@gmail.com> parents: 8999 diff changeset	943 if (args(0).is_perm_matrix ())
9861b3ec72a6 fix bug in double Jaroslav Hajek <highegg@gmail.com> parents: 8999 diff changeset	944 {
9861b3ec72a6 fix bug in double Jaroslav Hajek <highegg@gmail.com> parents: 8999 diff changeset	945 OCTAVE_TYPE_CONV_BODY3 (double, octave_perm_matrix, octave_scalar);
9861b3ec72a6 fix bug in double Jaroslav Hajek <highegg@gmail.com> parents: 8999 diff changeset	946 }
9861b3ec72a6 fix bug in double Jaroslav Hajek <highegg@gmail.com> parents: 8999 diff changeset	947 else if (args(0).is_diag_matrix ())
8399 c1bada868690 alow single/double conversion of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	948 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	949 if (args(0).is_complex_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	950 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	951 OCTAVE_TYPE_CONV_BODY3 (double, octave_complex_diag_matrix, octave_complex);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	952 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	953 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	954 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	955 OCTAVE_TYPE_CONV_BODY3 (double, octave_diag_matrix, octave_scalar);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	956 }
8399 c1bada868690 alow single/double conversion of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	957 }
c1bada868690 alow single/double conversion of diag & perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	958 else if (args(0).is_sparse_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	959 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	960 if (args(0).is_complex_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	961 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	962 OCTAVE_TYPE_CONV_BODY3 (double, octave_sparse_complex_matrix, octave_complex);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	963 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	964 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	965 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	966 OCTAVE_TYPE_CONV_BODY3 (double, octave_sparse_matrix, octave_scalar);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	967 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	968 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7740 diff changeset	969 else if (args(0).is_complex_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	970 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	971 OCTAVE_TYPE_CONV_BODY3 (double, octave_complex_matrix, octave_complex);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	972 }
7004 45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	973 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	974 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	975 OCTAVE_TYPE_CONV_BODY3 (double, octave_matrix, octave_scalar);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10273 diff changeset	976 }
7004 45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	977 }
45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	978 else
45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	979 print_usage ();
45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	980
45d6cc5a0359 [project @ 2007-10-10 18:51:45 by jwe] jwe parents: 6974 diff changeset	981 return octave_value ();
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4844 diff changeset	982 }

Mercurial > hg > octave-nkf

annotate src/ov-re-mat.cc @ 10828:322f43e0e170