octave-nkf: libinterp/octave-value/ov-str-mat.cc annotate

annotate libinterp/octave-value/ov-str-mat.cc @ 18099:6a71e5030df5

Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. * libinterp/corefcn/balance.cc, libinterp/corefcn/bsxfun.cc, libinterp/corefcn/cellfun.cc, libinterp/corefcn/data.cc, libinterp/corefcn/dlmread.cc, libinterp/corefcn/dot.cc, libinterp/corefcn/eig.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gcd.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/graphics.cc, libinterp/corefcn/kron.cc, libinterp/corefcn/load-save.cc, libinterp/corefcn/lookup.cc, libinterp/corefcn/ls-hdf5.cc, libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/max.cc, libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-obj.cc, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/sparse.cc, libinterp/corefcn/sqrtm.cc, libinterp/corefcn/str2double.cc, libinterp/corefcn/strfind.cc, libinterp/corefcn/strfns.cc, libinterp/corefcn/tril.cc, libinterp/corefcn/txt-eng-ft.cc, libinterp/corefcn/variables.cc, libinterp/corefcn/xdiv.cc, libinterp/dldfcn/__delaunayn__.cc, libinterp/dldfcn/qr.cc, libinterp/dldfcn/symrcm.cc, libinterp/dldfcn/tsearch.cc, libinterp/octave-value/ov-base-diag.cc, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-base-mat.cc, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-bool-sparse.cc, libinterp/octave-value/ov-bool.cc, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-complex.cc, libinterp/octave-value/ov-cx-diag.cc, libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-cx-sparse.cc, libinterp/octave-value/ov-fcn-handle.cc, libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-float.cc, libinterp/octave-value/ov-flt-complex.cc, libinterp/octave-value/ov-flt-cx-diag.cc, libinterp/octave-value/ov-flt-cx-mat.cc, libinterp/octave-value/ov-flt-re-diag.cc, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-re-diag.cc, libinterp/octave-value/ov-re-mat.cc, libinterp/octave-value/ov-re-sparse.cc, libinterp/octave-value/ov-scalar.cc, libinterp/octave-value/ov-str-mat.cc, libinterp/octave-value/ov-usr-fcn.cc, libinterp/parse-tree/pt-cbinop.cc, libinterp/parse-tree/pt-eval.cc, libinterp/parse-tree/pt-mat.cc: Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.

author	Rik <rik@octave.org>
date	Thu, 05 Dec 2013 10:50:17 -0800
parents	b951a8351fd7
children	6c9ea5be96bf

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
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17643 diff changeset	3 Copyright (C) 1996-2013 John W. Eaton
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11265 diff changeset	4 Copyright (C) 2009-2010 VZLU Prague
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	5
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	7
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	8 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	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	11 option) any later version.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	12
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	13 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	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	15 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	16 for more details.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	17
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	20 <http://www.gnu.org/licenses/>.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	21
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 #ifdef HAVE_CONFIG_H
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	25 #include <config.h>
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	26 #endif
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	27
7528 26d8a92644de try to avoid ctype macro problems John W. Eaton <jwe@octave.org> parents: 7503 diff changeset	28 #include <cctype>
26d8a92644de try to avoid ctype macro problems John W. Eaton <jwe@octave.org> parents: 7503 diff changeset	29
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3221 diff changeset	30 #include <iostream>
4726 14dc2267c343 [project @ 2004-01-23 20:04:35 by jwe] jwe parents: 4687 diff changeset	31 #include <vector>
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	32
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	33 #include "data-conv.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	34 #include "lo-ieee.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	35 #include "mach-info.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	36 #include "mx-base.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	37 #include "oct-locbuf.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	38
8946 e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	39 #include "byte-swap.h"
5758 65208d959bf1 [project @ 2006-04-12 19:23:26 by jwe] jwe parents: 5731 diff changeset	40 #include "defun.h"
65208d959bf1 [project @ 2006-04-12 19:23:26 by jwe] jwe parents: 5731 diff changeset	41 #include "gripes.h"
8946 e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	42 #include "ls-ascii-helper.h"
e7e928088e90 fix CRLF issues with text-mode reading in windows when loading ascii data Benjamin Lindner <lindnerb@users.sourceforge.net> parents: 8920 diff changeset	43 #include "ls-hdf5.h"
5758 65208d959bf1 [project @ 2006-04-12 19:23:26 by jwe] jwe parents: 5731 diff changeset	44 #include "ls-oct-ascii.h"
65208d959bf1 [project @ 2006-04-12 19:23:26 by jwe] jwe parents: 5731 diff changeset	45 #include "ls-utils.h"
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	46 #include "oct-obj.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	47 #include "oct-stream.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	48 #include "ops.h"
5033 3dcc3824b732 [project @ 2004-09-24 04:26:07 by jwe] jwe parents: 4944 diff changeset	49 #include "ov-scalar.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	50 #include "ov-re-mat.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	51 #include "ov-str-mat.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	52 #include "pr-output.h"
3836 b8c1cb5b9fd9 [project @ 2001-05-31 19:30:49 by jwe] jwe parents: 3536 diff changeset	53 #include "pt-mat.h"
5758 65208d959bf1 [project @ 2006-04-12 19:23:26 by jwe] jwe parents: 5731 diff changeset	54 #include "utils.h"
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	55
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3203 diff changeset	56 DEFINE_OCTAVE_ALLOCATOR (octave_char_matrix_str);
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	57 DEFINE_OCTAVE_ALLOCATOR (octave_char_matrix_sq_str);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	58
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4513 diff changeset	59 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_char_matrix_str, "string", "char");
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	60 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_char_matrix_sq_str, "sq_string",
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	61 "char");
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	62
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	63 static octave_base_value *
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	64 default_numeric_conversion_function (const octave_base_value& a)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	65 {
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	66 octave_base_value *retval = 0;
5033 3dcc3824b732 [project @ 2004-09-24 04:26:07 by jwe] jwe parents: 4944 diff changeset	67
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	68 CAST_CONV_ARG (const octave_char_matrix_str&);
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	69
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	70 NDArray nda = v.array_value (true);
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3136 diff changeset	71
9071 034800482c79 fix default string->real array conversion Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	72 if (! error_state)
034800482c79 fix default string->real array conversion Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	73 {
034800482c79 fix default string->real array conversion Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	74 if (nda.numel () == 1)
034800482c79 fix default string->real array conversion Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	75 retval = new octave_scalar (nda(0));
034800482c79 fix default string->real array conversion Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	76 else
034800482c79 fix default string->real array conversion Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	77 retval = new octave_matrix (nda);
034800482c79 fix default string->real array conversion Jaroslav Hajek <highegg@gmail.com> parents: 8946 diff changeset	78 }
5033 3dcc3824b732 [project @ 2004-09-24 04:26:07 by jwe] jwe parents: 4944 diff changeset	79
3dcc3824b732 [project @ 2004-09-24 04:26:07 by jwe] jwe parents: 4944 diff changeset	80 return retval;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	81 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	82
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8168 diff changeset	83 octave_base_value::type_conv_info
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	84 octave_char_matrix_str::numeric_conversion_function (void) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	85 {
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8168 diff changeset	86 return octave_base_value::type_conv_info (default_numeric_conversion_function,
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8168 diff changeset	87 octave_matrix::static_type_id ());
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	88 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	89
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	90 octave_value
5400 c7e3cf2fce3e [project @ 2005-07-05 15:01:32 by jwe] jwe parents: 5307 diff changeset	91 octave_char_matrix_str::do_index_op_internal (const octave_value_list& idx,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	92 bool resize_ok, char type)
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	93 {
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	94 octave_value retval;
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	95
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	96 octave_idx_type len = idx.length ();
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	97
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	98 switch (len)
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	99 {
5539 b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5435 diff changeset	100 case 0:
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9071 diff changeset	101 retval = octave_value (matrix, type);
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	102 break;
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	103
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	104 case 1:
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	105 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	106 idx_vector i = idx (0).index_vector ();
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	107
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	108 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	109 retval = octave_value (charNDArray (matrix.index (i, resize_ok)),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	110 type);
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	111 }
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	112 break;
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	113
5539 b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5435 diff changeset	114 case 2:
b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5435 diff changeset	115 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	116 idx_vector i = idx (0).index_vector ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	117 idx_vector j = idx (1).index_vector ();
5539 b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5435 diff changeset	118
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	119 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	120 retval = octave_value (charNDArray (matrix.index (i, j, resize_ok)),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	121 type);
5539 b800ae36fc6a [project @ 2005-11-16 18:45:32 by jwe] jwe parents: 5435 diff changeset	122 }
5435 66ad03c58880 [project @ 2005-08-31 20:41:47 by jwe] jwe parents: 5400 diff changeset	123 break;
66ad03c58880 [project @ 2005-08-31 20:41:47 by jwe] jwe parents: 5400 diff changeset	124
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	125 default:
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	126 {
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	127 Array<idx_vector> idx_vec (dim_vector (len, 1));
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	128
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	129 for (octave_idx_type i = 0; i < len; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	130 idx_vec(i) = idx(i).index_vector ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	131
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	132 if (! error_state)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	133 retval =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	134 octave_value (charNDArray (matrix.index (idx_vec, resize_ok)),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	135 type);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	136 }
2407 4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	137 break;
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	138 }
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	139
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	140 return retval;
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	141 }
4f55dc039a7e [project @ 1996-10-14 19:48:50 by jwe] jwe parents: 2376 diff changeset	142
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	143 octave_value
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	144 octave_char_matrix_str::resize (const dim_vector& dv, bool fill) const
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	145 {
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	146 charNDArray retval (matrix);
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	147 if (fill)
14616 13cc11418393 improve handling of default resize fill value for arrays John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	148 retval.resize (dv, 0);
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	149 else
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	150 retval.resize (dv);
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9071 diff changeset	151 return octave_value (retval, is_sq_string () ? '\'' : '"');
5731 c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	152 }
c7d5a534afa5 [project @ 2006-04-03 19:33:26 by jwe] jwe parents: 5715 diff changeset	153
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	154 #define CHAR_MATRIX_CONV(T, INIT, TNAME, FCN) \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	155 T retval INIT; \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	156 \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	157 if (! force_string_conv) \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	158 gripe_invalid_conversion ("string", TNAME); \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	159 else \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	160 { \
5878 27771d9cd4f4 [project @ 2006-07-02 18:45:11 by jwe] jwe parents: 5828 diff changeset	161 warning_with_id ("Octave:str-to-num", \
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	162 "implicit conversion from %s to %s", \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	163 "string", TNAME); \
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	164 \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	165 retval = octave_char_matrix::FCN (); \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	166 } \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	167 \
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	168 return retval
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	169
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	170 double
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	171 octave_char_matrix_str::double_value (bool force_string_conv) const
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	172 {
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	173 CHAR_MATRIX_CONV (double, = 0, "real scalar", double_value);
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	174 }
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	175
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	176 Complex
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	177 octave_char_matrix_str::complex_value (bool force_string_conv) const
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	178 {
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	179 CHAR_MATRIX_CONV (Complex, = 0, "complex scalar", complex_value);
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	180 }
ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4612 diff changeset	181
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	182 Matrix
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	183 octave_char_matrix_str::matrix_value (bool force_string_conv) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	184 {
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	185 CHAR_MATRIX_CONV (Matrix, , "real matrix", matrix_value);
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	186 }
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	187
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	188 ComplexMatrix
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	189 octave_char_matrix_str::complex_matrix_value (bool force_string_conv) const
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	190 {
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	191 CHAR_MATRIX_CONV (ComplexMatrix, , "complex matrix", complex_matrix_value);
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	192 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	193
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	194 NDArray
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	195 octave_char_matrix_str::array_value (bool force_string_conv) const
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	196 {
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	197 CHAR_MATRIX_CONV (NDArray, , "real N-d array", array_value);
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	198 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	199
4668 7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	200 ComplexNDArray
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	201 octave_char_matrix_str::complex_array_value (bool force_string_conv) const
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	202 {
7849788ca4bd [project @ 2003-11-26 04:28:39 by jwe] jwe parents: 4643 diff changeset	203 CHAR_MATRIX_CONV (ComplexNDArray, , "complex N-d array",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	204 complex_array_value);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	205 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	206
2493 8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2466 diff changeset	207 string_vector
5715 edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe] jwe parents: 5707 diff changeset	208 octave_char_matrix_str::all_strings (bool) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	209 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	210 string_vector retval;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	211
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	212 if (matrix.ndims () == 2)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	213 {
6816 ec4c1dfb985a [project @ 2007-08-15 04:45:39 by jwe] jwe parents: 6815 diff changeset	214 charMatrix chm = matrix.matrix_value ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	215
6816 ec4c1dfb985a [project @ 2007-08-15 04:45:39 by jwe] jwe parents: 6815 diff changeset	216 octave_idx_type n = chm.rows ();
2493 8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2466 diff changeset	217
6816 ec4c1dfb985a [project @ 2007-08-15 04:45:39 by jwe] jwe parents: 6815 diff changeset	218 retval.resize (n);
2493 8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2466 diff changeset	219
6816 ec4c1dfb985a [project @ 2007-08-15 04:45:39 by jwe] jwe parents: 6815 diff changeset	220 for (octave_idx_type i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	221 retval[i] = chm.row_as_string (i);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	222 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	223 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	224 error ("invalid conversion of charNDArray to string_vector");
2493 8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2466 diff changeset	225
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe] jwe parents: 2466 diff changeset	226 return retval;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	227 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	228
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	229 std::string
4457 d7d9ca19960a [project @ 2003-07-11 03:05:38 by jwe] jwe parents: 4452 diff changeset	230 octave_char_matrix_str::string_value (bool) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	231 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	232 std::string retval;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	233
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	234 if (matrix.ndims () == 2)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	235 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	236 charMatrix chm = matrix.matrix_value ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	237
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17825 diff changeset	238 retval = chm.row_as_string (0); // FIXME?
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	239 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	240 else
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	241 error ("invalid conversion of charNDArray to string");
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	242
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	243 return retval;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	244 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	245
10729 172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	246 Array<std::string>
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	247 octave_char_matrix_str::cellstr_value (void) const
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	248 {
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	249 Array<std::string> retval;
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	250
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	251 if (matrix.ndims () == 2)
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	252 {
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	253 const charMatrix chm = matrix.matrix_value ();
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	254 octave_idx_type nr = chm.rows ();
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	255 retval.clear (nr, 1);
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	256 for (octave_idx_type i = 0; i < nr; i++)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	257 retval.xelem (i) = chm.row_as_string (i);
10729 172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	258 }
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	259 else
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	260 error ("cellstr: cannot convert multidimensional arrays");
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	261
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	262 return retval;
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	263 }
172253d75d94 implement cellstr extractors for char matrices Jaroslav Hajek <highegg@gmail.com> parents: 10552 diff changeset	264
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	265 void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	266 octave_char_matrix_str::print_raw (std::ostream& os,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	267 bool pr_as_read_syntax) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	268 {
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 3203 diff changeset	269 octave_print_internal (os, matrix, pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	270 current_print_indent_level (), true);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	271 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	272
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	273 void
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	274 octave_char_matrix_str::short_disp (std::ostream& os) const
17825 53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	275 {
53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	276 if (matrix.ndims () == 2 && numel () > 0)
53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	277 {
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	278 std::string tmp = string_value ();
17825 53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	279
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17825 diff changeset	280 // FIXME: should this be configurable?
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	281 size_t max_len = 100;
17825 53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	282
17876 b951a8351fd7 Fix display of char arrays in GUI Variable window. Rik <rik@octave.org> parents: 17870 diff changeset	283 os << (tmp.length () > max_len ? tmp.substr (0, 100) : tmp);
17825 53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	284 }
53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	285 }
53f433bae63b display (possibly truncated) values of strings in workspace view John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	286
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	287 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6816 diff changeset	288 octave_char_matrix_str::save_ascii (std::ostream& os)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	289 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	290 dim_vector d = dims ();
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	291 if (d.length () > 2)
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	292 {
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	293 charNDArray tmp = char_array_value ();
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	294 os << "# ndims: " << d.length () << "\n";
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	295 for (int i=0; i < d.length (); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	296 os << " " << d (i);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	297 os << "\n";
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	298 os.write (tmp.fortran_vec (), d.numel ());
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	299 os << "\n";
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	300 }
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	301 else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	302 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	303 // Keep this case, rather than use generic code above for
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	304 // backward compatiability. Makes load_ascii much more complex!!
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	305 charMatrix chm = char_matrix_value ();
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	306 octave_idx_type elements = chm.rows ();
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	307 os << "# elements: " << elements << "\n";
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5157 diff changeset	308 for (octave_idx_type i = 0; i < elements; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	309 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	310 unsigned len = chm.cols ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	311 os << "# length: " << len << "\n";
11265 a117dc8ea1b9 charMatrix::row_as_string: never strip trailing nul characters John W. Eaton <jwe@octave.org> parents: 10729 diff changeset	312 std::string tstr = chm.row_as_string (i);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	313 const char *tmp = tstr.data ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	314 if (tstr.length () > len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	315 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	316 os.write (tmp, len);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	317 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	318 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	319 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	320
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	321 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	322 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	323
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	324 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	325 octave_char_matrix_str::load_ascii (std::istream& is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	326 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	327 bool success = true;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	328
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	329 string_vector keywords(3);
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	330
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	331 keywords[0] = "ndims";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	332 keywords[1] = "elements";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	333 keywords[2] = "length";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	334
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	335 std::string kw;
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	336 int val = 0;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	337
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	338 if (extract_keyword (is, keywords, kw, val, true))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	339 {
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	340 if (kw == "ndims")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	341 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	342 int mdims = val;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	343
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	344 if (mdims >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	345 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	346 dim_vector dv;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	347 dv.resize (mdims);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	348
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	349 for (int i = 0; i < mdims; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	350 is >> dv(i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	351
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	352 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	353 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	354 charNDArray tmp(dv);
6717 b319df52ba87 [project @ 2007-06-13 20:25:53 by jwe] jwe parents: 6151 diff changeset	355
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	356 if (tmp.is_empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	357 matrix = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	358 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	359 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	360 char *ftmp = tmp.fortran_vec ();
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	361
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	362 skip_preceeding_newline (is);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	363
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	364 if (! is.read (ftmp, dv.numel ()) \|\| !is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	365 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	366 error ("load: failed to load string constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	367 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	368 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	369 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	370 matrix = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	371 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	372 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	373 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	374 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	375 error ("load: failed to read dimensions");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	376 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	377 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	378 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	379 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	380 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	381 error ("load: failed to extract matrix size");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	382 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	383 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	384 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	385 else if (kw == "elements")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	386 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	387 int elements = val;
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	388
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	389 if (elements >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	390 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	391 // FIXME: need to be able to get max length before doing anything.
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	392
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	393 charMatrix chm (elements, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	394 int max_len = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	395 for (int i = 0; i < elements; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	396 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	397 int len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	398 if (extract_keyword (is, "length", len) && len >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	399 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	400 // Use this instead of a C-style character
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	401 // buffer so that we can properly handle
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	402 // embedded NUL characters.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	403 charMatrix tmp (1, len);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	404 char *ptmp = tmp.fortran_vec ();
6151 12c50a17f20f [project @ 2006-11-10 17:34:45 by jwe] jwe parents: 5958 diff changeset	405
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	406 if (len > 0 && ! is.read (ptmp, len))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	407 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	408 error ("load: failed to load string constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	409 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	410 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	411 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	412 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	413 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	414 if (len > max_len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	415 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	416 max_len = len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	417 chm.resize (elements, max_len, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	418 }
6151 12c50a17f20f [project @ 2006-11-10 17:34:45 by jwe] jwe parents: 5958 diff changeset	419
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	420 chm.insert (tmp, i, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	421 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	422 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	423 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	424 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	425 error ("load: failed to extract string length for element %d",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	426 i+1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	427 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	428 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	429 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	430
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	431 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	432 matrix = chm;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	433 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	434 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	435 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	436 error ("load: failed to extract number of string elements");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	437 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	438 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	439 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	440 else if (kw == "length")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	441 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	442 int len = val;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	443
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	444 if (len >= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	445 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	446 // This is cruft for backward compatiability,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	447 // but relatively harmless.
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	448
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	449 // Use this instead of a C-style character buffer so
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	450 // that we can properly handle embedded NUL characters.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	451 charMatrix tmp (1, len);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	452 char *ptmp = tmp.fortran_vec ();
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	453
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	454 if (len > 0 && ! is.read (ptmp, len))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	455 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	456 error ("load: failed to load string constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	457 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	458 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	459 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	460 if (is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	461 matrix = tmp;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	462 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	463 error ("load: failed to load string constant");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	464 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	465 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	466 }
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	467 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	468 panic_impossible ();
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	469 }
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	470 else
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	471 {
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	472 error ("load: failed to extract number of rows and columns");
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5086 diff changeset	473 success = false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	474 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	475
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	476 return success;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	477 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	478
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	479 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	480 octave_char_matrix_str::save_binary (std::ostream& os,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	481 bool& /* save_as_floats */)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	482 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	483 dim_vector d = dims ();
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14616 diff changeset	484 if (d.length () < 1)
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	485 return false;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	486
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	487 // Use negative value for ndims to differentiate with old format!!
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14616 diff changeset	488 int32_t tmp = - d.length ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	489 os.write (reinterpret_cast<char *> (&tmp), 4);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	490 for (int i=0; i < d.length (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	491 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	492 tmp = d(i);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	493 os.write (reinterpret_cast<char *> (&tmp), 4);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	494 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	495
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	496 charNDArray m = char_array_value ();
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	497 os.write (m.fortran_vec (), d.numel ());
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	498 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	499 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	500
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	501 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	502 octave_char_matrix_str::load_binary (std::istream& is, bool swap,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	503 oct_mach_info::float_format /* fmt */)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	504 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	505 int32_t elements;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	506 if (! is.read (reinterpret_cast<char *> (&elements), 4))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	507 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	508 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	509 swap_bytes<4> (&elements);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	510
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	511 if (elements < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	512 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	513 int32_t mdims = - elements;
22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5781 diff changeset	514 int32_t di;
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	515 dim_vector dv;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	516 dv.resize (mdims);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	517
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	518 for (int i = 0; i < mdims; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	519 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	520 if (! is.read (reinterpret_cast<char *> (&di), 4))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	521 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	522 if (swap)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	523 swap_bytes<4> (&di);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	524 dv(i) = di;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	525 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	526
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	527 // 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	528 // Octave should never write files like this, other software
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	529 // might.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	530
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	531 if (mdims == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	532 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	533 mdims = 2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	534 dv.resize (mdims);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	535 dv(1) = dv(0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	536 dv(0) = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	537 }
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	538
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	539 charNDArray m(dv);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	540 char *tmp = m.fortran_vec ();
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	541 is.read (tmp, dv.numel ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	542
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	543 if (error_state \|\| ! is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	544 return false;
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	545 matrix = m;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	546 }
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	547 else
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	548 {
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	549 charMatrix chm (elements, 0);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	550 int max_len = 0;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	551 for (int i = 0; i < elements; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	552 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	553 int32_t len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	554 if (! is.read (reinterpret_cast<char *> (&len), 4))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	555 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	556 if (swap)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	557 swap_bytes<4> (&len);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	558 charMatrix btmp (1, len);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	559 char *pbtmp = btmp.fortran_vec ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	560 if (! is.read (pbtmp, len))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	561 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	562 if (len > max_len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	563 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	564 max_len = len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	565 chm.resize (elements, max_len, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	566 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	567 chm.insert (btmp, i, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	568 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	569 matrix = chm;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	570 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	571 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	572 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	573
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	574 #if defined (HAVE_HDF5)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	575
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	576 bool
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	577 octave_char_matrix_str::save_hdf5 (hid_t loc_id, const char *name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	578 bool /* save_as_floats */)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	579 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	580 dim_vector dv = dims ();
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	581 int empty = save_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	582 if (empty)
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	583 return (empty > 0);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	584
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	585 int rank = dv.length ();
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17876 diff changeset	586 hid_t space_hid, data_hid;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17876 diff changeset	587 space_hid = data_hid = -1;
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	588 bool retval = true;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	589 charNDArray m = char_array_value ();
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	590
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	591 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	592
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	593 // Octave uses column-major, while HDF5 uses row-major ordering
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	594 for (int i = 0; i < rank; i++)
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	595 hdims[i] = dv (rank-i-1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	596
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4805 diff changeset	597 space_hid = H5Screate_simple (rank, hdims, 0);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	598 if (space_hid < 0)
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	599 return false;
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	600 #if HAVE_HDF5_18
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	601 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_CHAR, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	602 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	603 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	604 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_CHAR, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	605 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	606 #endif
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	607 if (data_hid < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	608 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	609 H5Sclose (space_hid);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	610 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	611 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	612
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	613 OCTAVE_LOCAL_BUFFER (char, s, dv.numel ());
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	614
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	615 for (int i = 0; i < dv.numel (); ++i)
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	616 s[i] = m(i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	617
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	618 retval = H5Dwrite (data_hid, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	619 H5P_DEFAULT, s) >= 0;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	620
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	621 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	622 H5Sclose (space_hid);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	623
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	624 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	625 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	626
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	627 bool
9881 b3089dba88bf Remove HDF5 cruft for older versions of HDF5 Kacper Kowalik parents: 9689 diff changeset	628 octave_char_matrix_str::load_hdf5 (hid_t loc_id, const char *name)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	629 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	630 bool retval = false;
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	631
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	632 dim_vector dv;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	633 int empty = load_hdf5_empty (loc_id, name, dv);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	634 if (empty > 0)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	635 matrix.resize (dv);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	636 if (empty)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	637 return (empty > 0);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	638
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	639 #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	640 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	641 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	642 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	643 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	644 hid_t space_hid = H5Dget_space (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	645 hsize_t rank = H5Sget_simple_extent_ndims (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	646 hid_t type_hid = H5Dget_type (data_hid);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	647 hid_t type_class_hid = H5Tget_class (type_hid);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	648
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	649 if (type_class_hid == H5T_INTEGER)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	650 {
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	651 if (rank < 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	652 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	653 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	654 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	655 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	656 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	657 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	658
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	659 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	660 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	661
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	662 H5Sget_simple_extent_dims (space_hid, hdims, maxdims);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	663
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	664 // Octave uses column-major, while HDF5 uses row-major ordering
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	665 if (rank == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	666 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	667 dv.resize (2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	668 dv(0) = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	669 dv(1) = hdims[0];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	670 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	671 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	672 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	673 dv.resize (rank);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	674 for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	675 dv(j) = hdims[i];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	676 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	677
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	678 charNDArray m (dv);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	679 char *str = m.fortran_vec ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	680 if (H5Dread (data_hid, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	681 H5P_DEFAULT, str) >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	682 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	683 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	684 matrix = m;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	685 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	686
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	687 H5Tclose (type_hid);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	688 H5Sclose (space_hid);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	689 H5Dclose (data_hid);
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	690 return true;
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	691 }
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	692 else
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	693 {
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	694 // This is cruft for backward compatiability and easy data
b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	695 // importation
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	696 if (rank == 0) //FIXME: Does rank==0 even exist for strings in HDF5?
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	697 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	698 // a single string:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	699 int slen = H5Tget_size (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	700 if (slen < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	701 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	702 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	703 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	704 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	705 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	706 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	707 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	708 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	709 OCTAVE_LOCAL_BUFFER (char, s, slen);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	710 // create datatype for (null-terminated) string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	711 // to read into:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	712 hid_t st_id = H5Tcopy (H5T_C_S1);
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	713 H5Tset_size (st_id, slen+1);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	714 if (H5Dread (data_hid, st_id, H5S_ALL,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	715 H5S_ALL, H5P_DEFAULT, s) < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	716 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	717 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	718 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	719 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	720 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	721 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	722 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	723
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	724 matrix = charMatrix (s);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	725
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	726 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	727 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	728 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	729 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	730 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	731 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	732 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	733 else if (rank == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	734 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	735 // string vector
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	736 hsize_t elements, maxdim;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	737 H5Sget_simple_extent_dims (space_hid, &elements, &maxdim);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	738 int slen = H5Tget_size (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	739 if (slen < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	740 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	741 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	742 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	743 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	744 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	745 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	746 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	747 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	748 // hdf5 string arrays store strings of all the
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	749 // same physical length (I think), which is
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	750 // slightly wasteful, but oh well.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	751
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	752 OCTAVE_LOCAL_BUFFER (char, s, elements * (slen+1));
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	753
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	754 // create datatype for (null-terminated) string
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	755 // to read into:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	756 hid_t st_id = H5Tcopy (H5T_C_S1);
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	757 H5Tset_size (st_id, slen+1);
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	758
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	759 if (H5Dread (data_hid, st_id, H5S_ALL,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	760 H5S_ALL, H5P_DEFAULT, s) < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	761 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	762 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	763 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	764 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	765 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	766 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	767 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	768
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	769 charMatrix chm (elements, slen, ' ');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	770 for (hsize_t i = 0; i < elements; ++i)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	771 {
17643 d0a197b9962a Fix loading of string arrays from 3rd party hdf5 files (bug #38789) Markus Appel <masolomaster3000@gmail.com> parents: 15195 diff changeset	772 chm.insert (s + i*(slen+1), i, 0);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	773 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	774
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	775 matrix = chm;
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	776
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	777 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	778 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	779 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	780 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	781 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	782 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	783 }
4805 b0d6da24caeb [project @ 2004-03-02 03:43:15 by jwe] jwe parents: 4726 diff changeset	784 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	785 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	786 H5Tclose (type_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	787 H5Sclose (space_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	788 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	789 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	790 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	791 }
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	792
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4815 diff changeset	793 return retval;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	794 }
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4837 diff changeset	795
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4668 diff changeset	796 #endif

Mercurial > octave-nkf

annotate libinterp/octave-value/ov-str-mat.cc @ 18099:6a71e5030df5