octave: libinterp/octave-value/ov-base-int.cc annotate

annotate libinterp/octave-value/ov-base-int.cc @ 31138:b3ca7f891750

maint: use "m_" prefix for member variables in class octave_base_matrix. * ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-cx-mat.cc, ov-cx-mat.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-re-mat.cc, ov-re-mat.h, ov-str-mat.cc, ov-str-mat.h: use "m_" prefix for member variables in class octave_base_matrix.

author	Rik <rik@octave.org>
date	Sun, 10 Jul 2022 18:26:24 -0700
parents	83f9f8bda883
children	aac27ad79be6

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 30390 diff changeset	3 // Copyright (C) 2004-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	25
21690 b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	26 // This file should not include config.h. It is only included in other
b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	27 // C++ source files that should have included config.h before including
b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	28 // this file.
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	29
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	30 #include <istream>
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	31 #include <limits>
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	32 #include <ostream>
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	33 #include <sstream>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	34 #include <vector>
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	35
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	36 #include "dNDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	37 #include "fNDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	38 #include "int8NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	39 #include "int16NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	40 #include "int32NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	41 #include "int64NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	42 #include "uint8NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	43 #include "uint16NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	44 #include "uint32NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	45 #include "uint64NDArray.h"
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	46
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	47 #include "lo-ieee.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	48 #include "lo-utils.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	49 #include "mx-base.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	50 #include "quit.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 7534 diff changeset	51 #include "oct-locbuf.h"
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	52
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	53 #include "defun.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21022 diff changeset	54 #include "errwarn.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20893 diff changeset	55 #include "ovl.h"
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	56 #include "oct-lvalue.h"
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	57 #include "oct-hdf5.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4932 diff changeset	58 #include "oct-stream.h"
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	59 #include "ops.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	60 #include "ov-base.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	61 #include "ov-base-mat.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	62 #include "ov-base-mat.cc"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	63 #include "ov-base-scalar.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	64 #include "ov-base-scalar.cc"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	65 #include "ov-base-int.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	66 #include "ov-int-traits.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	67 #include "pr-output.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	68 #include "variables.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	69
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	70 #include "byte-swap.h"
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20228 diff changeset	71 #include "ls-oct-text.h"
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	72 #include "ls-utils.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	73 #include "ls-hdf5.h"
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	74
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	75 // We have all the machinery below (octave_base_int_helper and
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	76 // octave_base_int_helper_traits) to avoid a few warnings from GCC
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	77 // about comparisons always false due to limited range of data types.
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	78 // Ugh. The cure may be worse than the disease.
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	79
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	80 template <typename T, bool is_signed = true, bool can_be_too_big = true>
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	81 struct octave_base_int_helper
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	82 {
30155 14b098a6ba46 maint: Use public: qualifier in structs that are really classes. Rik <rik@octave.org> parents: 29607 diff changeset	83 public:
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	84 static bool
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	85 char_value_out_of_range (T val)
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	86 {
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	87 return val < 0 \|\| val > std::numeric_limits<unsigned char>::max ();
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	88 }
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	89 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	90
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	91 template <typename T>
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	92 struct octave_base_int_helper<T, false, false>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	93 {
30155 14b098a6ba46 maint: Use public: qualifier in structs that are really classes. Rik <rik@octave.org> parents: 29607 diff changeset	94 public:
9149 7120fbbecf97 ov-base-int.cc: correct result for template specialization John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	95 static bool char_value_out_of_range (T) { return false; }
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	96 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	97
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	98 template <typename T>
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	99 struct octave_base_int_helper<T, false, true>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	100 {
30155 14b098a6ba46 maint: Use public: qualifier in structs that are really classes. Rik <rik@octave.org> parents: 29607 diff changeset	101 public:
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	102 static bool char_value_out_of_range (T val)
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	103 {
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	104 return val > std::numeric_limits<unsigned char>::max ();
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	105 }
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	106 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	107
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	108 template <typename T>
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	109 struct octave_base_int_helper<T, true, false>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	110 {
30155 14b098a6ba46 maint: Use public: qualifier in structs that are really classes. Rik <rik@octave.org> parents: 29607 diff changeset	111 public:
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	112 static bool char_value_out_of_range (T val) { return val < 0; }
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	113 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	114
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	115 // For all types other than char, signed char, and unsigned char, we
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	116 // assume that the upper limit for the range of allowable values is
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	117 // larger than the range for unsigned char. If that's not true, we
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	118 // are still OK, but will see the warnings again for any other types
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	119 // that do not meet this assumption.
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	120
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	121 template <typename T>
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	122 struct octave_base_int_helper_traits
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	123 {
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	124 static const bool can_be_larger_than_uchar_max = true;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	125 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	126
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	127 template <>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	128 struct octave_base_int_helper_traits<char>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	129 {
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	130 static const bool can_be_larger_than_uchar_max = false;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	131 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	132
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	133 template <>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	134 struct octave_base_int_helper_traits<signed char>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	135 {
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	136 static const bool can_be_larger_than_uchar_max = false;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	137 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	138
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	139 template <>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	140 struct octave_base_int_helper_traits<unsigned char>
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	141 {
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	142 static const bool can_be_larger_than_uchar_max = false;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	143 };
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	144
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	145 template <typename T>
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5307 diff changeset	146 octave_base_value *
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	147 octave_base_int_matrix<T>::try_narrowing_conversion (void)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	148 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23220 diff changeset	149 octave_base_value *retval = nullptr;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	150
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	151 if (this->m_matrix.numel () == 1)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	152 retval = new typename octave_value_int_traits<T>::scalar_type
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	153 (this->m_matrix (0));
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	154
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	155 return retval;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	156 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	157
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	158 template <typename T>
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	159 octave_value
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	160 octave_base_int_matrix<T>::convert_to_str_internal (bool, bool, char type) const
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	161 {
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	162 octave_value retval;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	163 dim_vector dv = this->dims ();
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	164 octave_idx_type nel = dv.numel ();
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	165
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	166 charNDArray chm (dv);
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	167
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	168 bool warned = false;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	169
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	170 for (octave_idx_type i = 0; i < nel; i++)
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	171 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	172 octave_quit ();
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	173
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	174 typename T::element_type tmp = this->m_matrix(i);
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	175
8918 f5408862892f Consistently use element_type in the array classes. Jason Riedy <jason@acm.org> parents: 8377 diff changeset	176 typedef typename T::element_type::val_type val_type;
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	177
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	178 val_type ival = tmp.value ();
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	179
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	180 static const bool is_signed = std::numeric_limits<val_type>::is_signed;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	181 static const bool can_be_larger_than_uchar_max
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	182 = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max;
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	183
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	184 if (octave_base_int_helper<val_type, is_signed,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	185 can_be_larger_than_uchar_max>::char_value_out_of_range (ival))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	186 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	187 // FIXME: is there something better we could do?
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	188
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	189 ival = 0;
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	190
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	191 if (! warned)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	192 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	193 ::warning ("range error for conversion to character value");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	194 warned = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	195 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	196 }
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	197 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	198 chm (i) = static_cast<char> (ival);
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	199 }
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	200
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9149 diff changeset	201 retval = octave_value (chm, type);
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	202
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	203 return retval;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	204 }
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	205
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	206 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	207 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	208 octave_base_int_matrix<MT>::as_double (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	209 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	210 return NDArray (this->m_matrix);
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	211 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	212
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	213 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	214 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	215 octave_base_int_matrix<MT>::as_single (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	216 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	217 return FloatNDArray (this->m_matrix);
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	218 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	219
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	220 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	221 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	222 octave_base_int_matrix<MT>::as_int8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	223 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	224 return int8NDArray (this->m_matrix);
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	225 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	226
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	227 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	228 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	229 octave_base_int_matrix<MT>::as_int16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	230 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	231 return int16NDArray (this->m_matrix);
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	232 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	233
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	234 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	235 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	236 octave_base_int_matrix<MT>::as_int32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	237 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	238 return int32NDArray (this->m_matrix);
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	239 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	240
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	241 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	242 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	243 octave_base_int_matrix<MT>::as_int64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	244 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	245 return int64NDArray (this->m_matrix);
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	246 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	247
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	248 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	249 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	250 octave_base_int_matrix<MT>::as_uint8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	251 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	252 return uint8NDArray (this->m_matrix);
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	253 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	254
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	255 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	256 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	257 octave_base_int_matrix<MT>::as_uint16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	258 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	259 return uint16NDArray (this->m_matrix);
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	260 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	261
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	262 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	263 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	264 octave_base_int_matrix<MT>::as_uint32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	265 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	266 return uint32NDArray (this->m_matrix);
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	267 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	268
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	269 template <typename MT>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	270 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	271 octave_base_int_matrix<MT>::as_uint64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	272 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	273 return uint64NDArray (this->m_matrix);
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	274 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	275
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	276 template <typename T>
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	277 std::string
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	278 octave_base_int_matrix<T>::edit_display (const float_display_format& fmt,
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	279 octave_idx_type i,
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	280 octave_idx_type j) const
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	281 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	282 std::ostringstream buf;
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	283 octave_print_internal (buf, fmt, this->m_matrix(i, j));
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	284 return buf.str ();
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	285 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	286
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	287 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	288 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6959 diff changeset	289 octave_base_int_matrix<T>::save_ascii (std::ostream& os)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	290 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	291 dim_vector dv = this->dims ();
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	292
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	293 os << "# ndims: " << dv.ndims () << "\n";
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	294
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	295 for (int i = 0; i < dv.ndims (); i++)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	296 os << ' ' << dv(i);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	297
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	298 os << "\n" << this->m_matrix;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	299
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	300 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	301 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	302
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	303 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	304 bool
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	305 octave_base_int_matrix<T>::load_ascii (std::istream& is)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	306 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	307 int mdims = 0;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	308
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	309 if (! extract_keyword (is, "ndims", mdims, true))
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	310 error ("load: failed to extract number of dimensions");
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	311
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	312 if (mdims < 0)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	313 error ("load: failed to extract number of rows and columns");
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	314
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	315 dim_vector dv;
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	316 dv.resize (mdims);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	317
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	318 for (int i = 0; i < mdims; i++)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	319 is >> dv(i);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	320
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	321 T tmp(dv);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	322
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	323 is >> tmp;
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	324
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	325 if (! is)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	326 error ("load: failed to load matrix constant");
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	327
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	328 this->m_matrix = tmp;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	329
21124 95f8c8cdbffe maint: Eliminate 'bool success' variable where possible. Rik <rik@octave.org> parents: 21102 diff changeset	330 return true;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	331 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	332
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	333 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	334 bool
26399 586413770c7f pass save_as_floats by value in octave_value save_binary functions John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	335 octave_base_int_matrix<T>::save_binary (std::ostream& os, bool)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	336 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	337 dim_vector dv = this->dims ();
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	338 if (dv.ndims () < 1)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	339 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	340
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	341 // Use negative value for ndims to differentiate with old format!!
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	342 int32_t tmp = - dv.ndims ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	343 os.write (reinterpret_cast<char *> (&tmp), 4);
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	344 for (int i=0; i < dv.ndims (); i++)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	345 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	346 tmp = dv(i);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	347 os.write (reinterpret_cast<char *> (&tmp), 4);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	348 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	349
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	350 os.write (reinterpret_cast<const char *> (this->m_matrix.data ()),
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	351 this->byte_size ());
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	352
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	353 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	354 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	355
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	356 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	357 bool
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	358 octave_base_int_matrix<T>::load_binary (std::istream& is, bool swap,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	359 octave::mach_info::float_format)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	360 {
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5760 diff changeset	361 int32_t mdims;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	362 if (! is.read (reinterpret_cast<char *> (&mdims), 4))
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	363 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	364 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4932 diff changeset	365 swap_bytes<4> (&mdims);
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	366 if (mdims >= 0)
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	367 return false;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	368
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	369 mdims = - mdims;
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5760 diff changeset	370 int32_t di;
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	371 dim_vector dv;
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	372 dv.resize (mdims);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	373
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	374 for (int i = 0; i < mdims; i++)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	375 {
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	376 if (! is.read (reinterpret_cast<char *> (&di), 4))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	377 return false;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	378 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	379 swap_bytes<4> (&di);
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	380 dv(i) = di;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	381 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	382
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	383 // 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	384 // Octave should never write files like this, other software
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	385 // might.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	386
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	387 if (mdims == 1)
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	388 {
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	389 mdims = 2;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	390 dv.resize (mdims);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	391 dv(1) = dv(0);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	392 dv(0) = 1;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	393 }
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	394
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	395 T m (dv);
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	396
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	397 if (! is.read (reinterpret_cast<char *> (m.fortran_vec ()), m.byte_size ()))
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	398 return false;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	399
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	400 if (swap)
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	401 {
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	402 int nel = dv.numel ();
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	403 int bytes = nel / m.byte_size ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	404 for (int i = 0; i < nel; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	405 switch (bytes)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	406 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	407 case 8:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	408 swap_bytes<8> (&m(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	409 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	410 case 4:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	411 swap_bytes<4> (&m(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	412 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	413 case 2:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	414 swap_bytes<2> (&m(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	415 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	416 case 1:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	417 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	418 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	419 }
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	420 }
f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	421
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	422 this->m_matrix = m;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	423 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	424 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	425
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	426 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	427 bool
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	428 octave_base_int_matrix<T>::save_hdf5_internal (octave_hdf5_id loc_id,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	429 octave_hdf5_id save_type,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	430 const char *name, bool)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	431 {
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	432 bool retval = false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	433
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	434 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	435
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	436 hid_t save_type_hid = save_type;
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	437 dim_vector dv = this->dims ();
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	438 int empty = save_hdf5_empty (loc_id, name, dv);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	439 if (empty)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	440 return (empty > 0);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	441
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	442 int rank = dv.ndims ();
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	443 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: 17787 diff changeset	444 space_hid = data_hid = -1;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	445 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	446
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	447 // Octave uses column-major, while HDF5 uses row-major ordering
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	448 for (int i = 0; i < rank; i++)
20218 b2100e1659ac maint: Use cuddled parentheses when indexing dimension_vectors. Rik <rik@octave.org> parents: 19875 diff changeset	449 hdims[i] = dv(rank-i-1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	450
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23457 diff changeset	451 space_hid = H5Screate_simple (rank, hdims, nullptr);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	452
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	453 if (space_hid < 0) return false;
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	454 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	455 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30155 diff changeset	456 octave_H5P_DEFAULT, octave_H5P_DEFAULT,
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30155 diff changeset	457 octave_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	458 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	459 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	460 octave_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	461 #endif
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	462 if (data_hid < 0)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	463 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	464 H5Sclose (space_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	465 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	466 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	467
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	468 retval = H5Dwrite (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL,
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	469 octave_H5P_DEFAULT, this->m_matrix.data ()) >= 0;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	470
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	471 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	472 H5Sclose (space_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	473
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	474 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	475 octave_unused_parameter (loc_id);
24580 a276f008ea74 avoid unused variable warnings if compiling without HDF5 (bug #52850) John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	476 octave_unused_parameter (save_type);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	477 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	478
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	479 this->warn_save ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	480 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	481
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	482 return retval;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	483 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	484
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	485 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	486 bool
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	487 octave_base_int_matrix<T>::load_hdf5_internal (octave_hdf5_id loc_id,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	488 octave_hdf5_id save_type,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	489 const char *name)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	490 {
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	491 bool retval = false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	492
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	493 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	494
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	495 hid_t save_type_hid = save_type;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	496 dim_vector dv;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	497 int empty = load_hdf5_empty (loc_id, name, dv);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	498 if (empty > 0)
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	499 this->m_matrix.resize (dv);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	500 if (empty)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	501 return (empty > 0);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	502
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	503 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	504 hid_t data_hid = H5Dopen (loc_id, name, octave_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	505 #else
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	506 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	507 #endif
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	508 hid_t space_id = H5Dget_space (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	509
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	510 hsize_t rank = H5Sget_simple_extent_ndims (space_id);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	511
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	512 if (rank < 1)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	513 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	514 H5Sclose (space_id);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	515 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	516 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	517 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	518
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	519 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	520 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	521
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	522 H5Sget_simple_extent_dims (space_id, hdims, maxdims);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	523
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	524 // Octave uses column-major, while HDF5 uses row-major ordering
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	525 if (rank == 1)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	526 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	527 dv.resize (2);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	528 dv(0) = 1;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	529 dv(1) = hdims[0];
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	530 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	531 else
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	532 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	533 dv.resize (rank);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	534 for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	535 dv(j) = hdims[i];
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	536 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	537
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	538 T m (dv);
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	539 if (H5Dread (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	540 octave_H5P_DEFAULT, m.fortran_vec ()) >= 0)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	541 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	542 retval = true;
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	543 this->m_matrix = m;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	544 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	545
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	546 H5Sclose (space_id);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	547 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	548
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	549 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	550 octave_unused_parameter (loc_id);
24580 a276f008ea74 avoid unused variable warnings if compiling without HDF5 (bug #52850) John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	551 octave_unused_parameter (save_type);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	552 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	553
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	554 this->warn_load ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	555 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	556
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	557 return retval;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	558 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	559
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	560 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	561 void
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	562 octave_base_int_matrix<T>::print_raw (std::ostream& os,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	563 bool pr_as_read_syntax) const
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	564 {
31138 b3ca7f891750 maint: use "m_" prefix for member variables in class octave_base_matrix. Rik <rik@octave.org> parents: 30565 diff changeset	565 octave_print_internal (os, this->m_matrix, pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	566 this->current_print_indent_level ());
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	567 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	568
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	569 template <typename T>
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	570 octave_value
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	571 octave_base_int_scalar<T>::convert_to_str_internal (bool, bool, char type) const
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	572 {
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	573 octave_value retval;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	574
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	575 T tmp = this->scalar;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	576
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	577 typedef typename T::val_type val_type;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	578
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	579 val_type ival = tmp.value ();
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	580
7534 ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	581 static const bool is_signed = std::numeric_limits<val_type>::is_signed;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	582 static const bool can_be_larger_than_uchar_max
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	583 = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max;
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	584
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	585 if (octave_base_int_helper<val_type, is_signed,
ef755c763b62 avoid more "comparison is always false due to limited range of data type" warnings from GCC John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	586 can_be_larger_than_uchar_max>::char_value_out_of_range (ival))
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	587 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	588 // FIXME: is there something better we could do?
5992 4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	589
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	590 ival = 0;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	591
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	592 ::warning ("range error for conversion to character value");
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	593 }
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	594 else
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	595 retval = octave_value (std::string (1, static_cast<char> (ival)), type);
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	596
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	597 return retval;
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	598 }
4289ed95dde8 [project @ 2006-09-15 20:29:18 by jwe] jwe parents: 5958 diff changeset	599
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	600 template <typename T>
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	601 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	602 octave_base_int_scalar<T>::as_double (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	603 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	604 return static_cast<double> (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	605 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	606
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	607 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	608 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	609 octave_base_int_scalar<T>::as_single (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	610 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	611 return static_cast<float> (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	612 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	613
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	614 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	615 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	616 octave_base_int_scalar<T>::as_int8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	617 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	618 return octave_int8 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	619 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	620
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	621 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	622 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	623 octave_base_int_scalar<T>::as_int16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	624 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	625 return octave_int16 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	626 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	627
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	628 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	629 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	630 octave_base_int_scalar<T>::as_int32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	631 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	632 return octave_int32 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	633 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	634
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	635 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	636 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	637 octave_base_int_scalar<T>::as_int64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	638 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	639 return octave_int64 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	640 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	641
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	642 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	643 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	644 octave_base_int_scalar<T>::as_uint8 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	645 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	646 return octave_uint8 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	647 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	648
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	649 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	650 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	651 octave_base_int_scalar<T>::as_uint16 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	652 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	653 return octave_uint16 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	654 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	655
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	656 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	657 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	658 octave_base_int_scalar<T>::as_uint32 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	659 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	660 return octave_uint32 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	661 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	662
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	663 template <typename T>
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	664 octave_value
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	665 octave_base_int_scalar<T>::as_uint64 (void) const
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	666 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	667 return octave_uint64 (this->scalar);
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	668 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	669
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	670 template <typename ST>
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	671 std::string
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	672 octave_base_int_scalar<ST>::edit_display (const float_display_format& fmt,
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	673 octave_idx_type,
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	674 octave_idx_type) const
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	675 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	676 std::ostringstream buf;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	677 octave_print_internal (buf, fmt, this->scalar);
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	678 return buf.str ();
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	679 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24580 diff changeset	680
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	681 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	682 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6959 diff changeset	683 octave_base_int_scalar<T>::save_ascii (std::ostream& os)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	684 {
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	685 os << this->scalar << "\n";
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	686 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	687 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	688
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	689 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	690 bool
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	691 octave_base_int_scalar<T>::load_ascii (std::istream& is)
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	692 {
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	693 is >> this->scalar;
20893 384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20447 diff changeset	694 if (! is)
384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20447 diff changeset	695 error ("load: failed to load scalar constant");
384ff5aa9437 2015 Code Sprint: Eliminate useless return statements after error (). Rik <rik@octave.org> parents: 20447 diff changeset	696
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	697 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	698 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	699
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	700 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	701 bool
26399 586413770c7f pass save_as_floats by value in octave_value save_binary functions John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	702 octave_base_int_scalar<T>::save_binary (std::ostream& os, bool)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	703 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	704 os.write (reinterpret_cast<char *> (&(this->scalar)), this->byte_size ());
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	705 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	706 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	707
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	708 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	709 bool
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	710 octave_base_int_scalar<T>::load_binary (std::istream& is, bool swap,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	711 octave::mach_info::float_format)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	712 {
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	713 T tmp;
28826 0b5b223f6d93 avoid warnings from template specializations that won't be used John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	714
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	715 if (! is.read (reinterpret_cast<char *> (&tmp), this->byte_size ()))
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	716 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	717
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	718 if (swap)
28826 0b5b223f6d93 avoid warnings from template specializations that won't be used John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	719 swap_bytes<sizeof (T)> (&tmp);
0b5b223f6d93 avoid warnings from template specializations that won't be used John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	720
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	721 this->scalar = tmp;
28826 0b5b223f6d93 avoid warnings from template specializations that won't be used John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	722
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	723 return true;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	724 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	725
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	726 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	727 bool
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	728 octave_base_int_scalar<T>::save_hdf5_internal (octave_hdf5_id loc_id,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	729 octave_hdf5_id save_type,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	730 const char *name, bool)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	731 {
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	732 bool retval = false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	733
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	734 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	735
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	736 hid_t save_type_hid = save_type;
29607 0169ffb3fe5d hdf5: Initialize array before use. Markus Mützel <markus.muetzel@gmx.de> parents: 29358 diff changeset	737 hsize_t dimens[3] = {0};
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	738 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: 17787 diff changeset	739 space_hid = data_hid = -1;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	740
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23457 diff changeset	741 space_hid = H5Screate_simple (0, dimens, nullptr);
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	742 if (space_hid < 0) return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	743
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	744 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	745 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30155 diff changeset	746 octave_H5P_DEFAULT, octave_H5P_DEFAULT,
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30155 diff changeset	747 octave_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	748 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	749 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	750 octave_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	751 #endif
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	752 if (data_hid < 0)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	753 {
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	754 H5Sclose (space_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	755 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	756 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	757
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	758 retval = H5Dwrite (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	759 octave_H5P_DEFAULT, &(this->scalar)) >= 0;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	760
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	761 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	762 H5Sclose (space_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	763
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	764 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	765 octave_unused_parameter (loc_id);
24580 a276f008ea74 avoid unused variable warnings if compiling without HDF5 (bug #52850) John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	766 octave_unused_parameter (save_type);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	767 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	768
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	769 this->warn_save ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	770 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	771
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	772 return retval;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	773 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	774
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21124 diff changeset	775 template <typename T>
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	776 bool
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	777 octave_base_int_scalar<T>::load_hdf5_internal (octave_hdf5_id loc_id,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	778 octave_hdf5_id save_type,
ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	779 const char *name)
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	780 {
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	781 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	782
24224 ff81c6772664 avoid issue with link-time optimization John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	783 hid_t save_type_hid = save_type;
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	784 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	785 hid_t data_hid = H5Dopen (loc_id, name, octave_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	786 #else
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	787 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	788 #endif
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	789 hid_t space_id = H5Dget_space (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	790
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	791 hsize_t rank = H5Sget_simple_extent_ndims (space_id);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	792
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	793 if (rank != 0)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	794 {
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	795 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	796 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	797 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	798
4917 f69e95587ba3 [project @ 2004-07-27 14:03:03 by jwe] jwe parents: 4903 diff changeset	799 T tmp;
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	800 if (H5Dread (data_hid, save_type_hid, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 20978 diff changeset	801 octave_H5P_DEFAULT, &tmp) < 0)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	802 {
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	803 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	804 return false;
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	805 }
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	806
4932 43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe] jwe parents: 4917 diff changeset	807 this->scalar = tmp;
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	808
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	809 H5Dclose (data_hid);
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	810
bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	811 return true;
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	812
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	813 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	814 octave_unused_parameter (loc_id);
24580 a276f008ea74 avoid unused variable warnings if compiling without HDF5 (bug #52850) John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	815 octave_unused_parameter (save_type);
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	816 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	817
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	818 this->warn_load ("hdf5");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	819
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	820 return false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	821 #endif
4903 bfe64e459ce3 [project @ 2004-06-14 19:20:26 by jwe] jwe parents: diff changeset	822 }

Mercurial > octave

annotate libinterp/octave-value/ov-base-int.cc @ 31138:b3ca7f891750