Mercurial > hg > octave-lyh
annotate src/ov-bool.cc @ 14846:460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Example: func() => func ()
* dynamic.txi, func.txi, oop.txi, var.txi, embedded.cc, fortdemo.cc,
funcdemo.cc, paramdemo.cc, stringdemo.cc, unwinddemo.cc, Array.cc, Array.h,
CColVector.cc, CDiagMatrix.h, CMatrix.cc, CNDArray.cc, CRowVector.cc,
CSparse.cc, CmplxGEPBAL.cc, EIG.cc, MSparse.cc, MatrixType.cc,
Sparse-op-defs.h, Sparse-perm-op-defs.h, Sparse.cc, Sparse.h,
SparseCmplxCHOL.cc, SparseCmplxCHOL.h, SparseCmplxLU.cc, SparseCmplxQR.cc,
SparseCmplxQR.h, SparseQR.cc, SparseQR.h, SparsedbleCHOL.cc, SparsedbleCHOL.h,
SparsedbleLU.cc, SparsedbleLU.h, base-lu.cc, cmd-hist.cc, dColVector.cc,
dDiagMatrix.h, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, dbleCHOL.cc,
dbleGEPBAL.cc, dim-vector.cc, eigs-base.cc, f2c-main.c, fCColVector.cc,
fCDiagMatrix.h, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fCmplxGEPBAL.cc,
fColVector.cc, fDiagMatrix.h, fEIG.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc,
file-ops.cc, file-stat.cc, floatCHOL.cc, floatGEPBAL.cc, idx-vector.h,
lo-specfun.cc, lo-sysdep.cc, mx-inlines.cc, oct-binmap.h, oct-convn.cc,
oct-md5.cc, oct-mem.h, oct-rand.cc, oct-syscalls.cc, randgamma.c, randmtzig.c,
sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-dmsolve.cc,
tempname.c, curl.m, divergence.m, randi.m, dlmwrite.m, edit.m, getappdata.m,
what.m, getarchdir.m, install.m, installed_packages.m, repackage.m,
unload_packages.m, colorbar.m, figure.m, isosurface.m, legend.m, loglog.m,
plot.m, plot3.m, plotyy.m, polar.m, __errplot__.m, __ghostscript__.m,
__marching_cube__.m, __plt__.m, __scatter__.m, semilogx.m, semilogy.m,
trimesh.m, trisurf.m, demo.m, test.m, datetick.m, __delaunayn__.cc,
__dsearchn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc,
__lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, balance.cc,
bsxfun.cc, ccolamd.cc, cellfun.cc, chol.cc, daspk.cc, dasrt.cc, dassl.cc,
dmperm.cc, eig.cc, eigs.cc, fftw.cc, filter.cc, find.cc, kron.cc, lookup.cc,
lsode.cc, matrix_type.cc, md5sum.cc, mgorth.cc, qr.cc, quad.cc, rand.cc,
regexp.cc, symbfact.cc, tril.cc, urlwrite.cc, op-bm-bm.cc, op-cdm-cdm.cc,
op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-scm.cc,
op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-fcdm-fcdm.cc,
op-fcm-fcm.cc, op-fdm-fdm.cc, op-fm-fm.cc, op-int.h, op-m-m.cc, op-m-scm.cc,
op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-scm.cc,
op-s-sm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc,
op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc,
op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-str.cc, op-struct.cc, bitfcns.cc,
data.cc, debug.cc, dynamic-ld.cc, error.cc, gl-render.cc, graphics.cc,
graphics.in.h, load-path.cc, ls-hdf5.cc, ls-mat5.cc, ls-mat5.h,
ls-oct-ascii.cc, ls-oct-ascii.h, mex.cc, mk-errno-list, oct-map.cc, oct-obj.h,
oct-parse.yy, octave-config.in.cc, ov-base-int.cc, ov-base-mat.cc, ov-base.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc,
ov-class.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc,
ov-flt-re-mat.cc, ov-intx.h, ov-range.h, ov-re-mat.cc, ov-re-sparse.cc,
ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.h, ov.h, pr-output.cc, pt-id.cc,
pt-id.h, pt-mat.cc, pt-select.cc, sparse.cc, symtab.cc, symtab.h, syscalls.cc,
toplev.cc, txt-eng-ft.cc, variables.cc, zfstream.cc, zfstream.h, Dork.m,
getStash.m, myStash.m, Gork.m, Pork.m, myStash.m, getStash.m, myStash.m,
getStash.m, myStash.m, fntests.m: Use Octave coding convention for
cuddled parenthis in function calls with empty argument lists.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Sun, 08 Jul 2012 11:28:50 -0700 |
| parents | 72c96de7a403 |
| children |
| rev | line source |
|---|---|
| 2871 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
3 Copyright (C) 1996-2012 John W. Eaton |
| 2871 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 2871 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 2871 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 3503 | 27 #include <iostream> |
| 2901 | 28 |
| 2871 | 29 #include "mx-base.h" |
| 30 | |
| 31 #include "gripes.h" | |
| 32 #include "oct-obj.h" | |
| 33 #include "ops.h" | |
| 34 #include "ov-bool.h" | |
| 4964 | 35 #include "ov-bool-mat.h" |
| 3223 | 36 #include "ov-base.h" |
| 37 #include "ov-base-scalar.h" | |
| 38 #include "ov-base-scalar.cc" | |
| 2871 | 39 #include "ov-re-mat.h" |
| 40 #include "ov-scalar.h" | |
| 41 #include "pr-output.h" | |
| 42 | |
| 4687 | 43 #include "ls-oct-ascii.h" |
| 44 #include "ls-hdf5.h" | |
| 45 | |
| 3223 | 46 template class octave_base_scalar<bool>; |
| 47 | |
| 3219 | 48 DEFINE_OCTAVE_ALLOCATOR (octave_bool); |
| 2871 | 49 |
| 4612 | 50 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_bool, "bool", "logical"); |
| 2871 | 51 |
| 5759 | 52 static octave_base_value * |
| 53 default_numeric_conversion_function (const octave_base_value& a) | |
| 2871 | 54 { |
| 55 CAST_CONV_ARG (const octave_bool&); | |
| 56 | |
| 57 return new octave_scalar (v.bool_value ()); | |
| 58 } | |
| 59 | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
60 octave_base_value::type_conv_info |
| 2871 | 61 octave_bool::numeric_conversion_function (void) const |
| 62 { | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
63 return octave_base_value::type_conv_info (default_numeric_conversion_function, |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
64 octave_scalar::static_type_id ()); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
65 |
| 2871 | 66 } |
| 67 | |
| 68 octave_value | |
| 5885 | 69 octave_bool::do_index_op (const octave_value_list& idx, bool resize_ok) |
| 2871 | 70 { |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
71 // FIXME -- this doesn't solve the problem of |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
72 // |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
73 // a = 1; a([1,1], [1,1], [1,1]) |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
74 // |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
75 // and similar constructions. Hmm... |
| 2871 | 76 |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
77 // FIXME -- using this constructor avoids narrowing the |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
78 // 1x1 matrix back to a scalar value. Need a better solution |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
79 // to this problem. |
| 2871 | 80 |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
81 octave_value tmp (new octave_bool_matrix (bool_matrix_value ())); |
| 2871 | 82 |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
83 return tmp.do_index_op (idx, resize_ok); |
| 2871 | 84 } |
| 85 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
86 octave_value |
| 5731 | 87 octave_bool::resize (const dim_vector& dv, bool fill) const |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
88 { |
| 5731 | 89 if (fill) |
| 90 { | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
91 boolNDArray retval (dv, false); |
|
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
|
92 if (dv.numel ()) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
93 retval(0) = scalar; |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
94 return retval; |
| 5731 | 95 } |
| 96 else | |
| 97 { | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
98 boolNDArray retval (dv); |
|
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
|
99 if (dv.numel ()) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
100 retval(0) = scalar; |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
101 return retval; |
| 5731 | 102 } |
| 103 } | |
| 104 | |
| 2871 | 105 octave_value |
| 5279 | 106 octave_bool::convert_to_str_internal (bool, bool, char type) const |
| 2871 | 107 { |
| 108 char s[2]; | |
| 4358 | 109 s[0] = static_cast<char> (scalar); |
| 2871 | 110 s[1] = '\0'; |
| 111 | |
| 5279 | 112 return octave_value (s, type); |
| 2871 | 113 } |
| 114 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
115 bool |
| 6974 | 116 octave_bool::save_ascii (std::ostream& os) |
| 4687 | 117 { |
| 118 double d = double_value (); | |
| 119 | |
| 120 octave_write_double (os, d); | |
| 121 os << "\n"; | |
| 122 | |
| 123 return true; | |
| 124 } | |
| 125 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
126 bool |
| 4687 | 127 octave_bool::load_ascii (std::istream& is) |
| 128 { | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
129 scalar = (octave_read_value<double> (is) != 0.); |
| 4687 | 130 |
| 131 if (!is) | |
| 132 { | |
| 133 error ("load: failed to load scalar constant"); | |
| 134 return false; | |
| 135 } | |
| 136 | |
| 137 return true; | |
| 138 } | |
| 139 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
140 bool |
| 4687 | 141 octave_bool::save_binary (std::ostream& os, bool& /* save_as_floats */) |
| 142 { | |
| 143 char tmp = (scalar ? 1 : 0); | |
| 5760 | 144 os.write (reinterpret_cast<char *> (&tmp), 1); |
| 4687 | 145 |
| 146 return true; | |
| 147 } | |
| 148 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
149 bool |
| 4687 | 150 octave_bool::load_binary (std::istream& is, bool /* swap */, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
151 oct_mach_info::float_format /* fmt */) |
| 4687 | 152 { |
| 153 char tmp; | |
| 5760 | 154 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) |
| 4687 | 155 return false; |
| 156 scalar = (tmp ? 1 : 0); | |
| 157 return true; | |
| 158 } | |
| 159 | |
| 160 #if defined (HAVE_HDF5) | |
| 4944 | 161 |
| 4687 | 162 bool |
| 163 octave_bool::save_hdf5 (hid_t loc_id, const char *name, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
164 bool /* save_as_floats */) |
| 4687 | 165 { |
| 166 hsize_t dimens[3]; | |
| 167 hid_t space_hid = -1, data_hid = -1; | |
| 168 bool retval = true; | |
| 169 | |
| 4815 | 170 space_hid = H5Screate_simple (0, dimens, 0); |
| 4687 | 171 if (space_hid < 0) return false; |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
172 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
173 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
174 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
175 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
176 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
177 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
|
178 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
179 if (data_hid < 0) |
| 4687 | 180 { |
| 181 H5Sclose (space_hid); | |
| 182 return false; | |
| 183 } | |
| 184 | |
| 185 double tmp = double_value (); | |
| 186 retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
187 H5P_DEFAULT, &tmp) >= 0; |
| 4687 | 188 |
| 189 H5Dclose (data_hid); | |
| 190 H5Sclose (space_hid); | |
| 4837 | 191 |
| 4687 | 192 return retval; |
| 193 } | |
| 194 | |
| 195 bool | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9469
diff
changeset
|
196 octave_bool::load_hdf5 (hid_t loc_id, const char *name) |
| 4687 | 197 { |
|
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
|
198 #if HAVE_HDF5_18 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
199 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
200 #else |
| 4687 | 201 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
|
202 #endif |
| 4687 | 203 hid_t space_id = H5Dget_space (data_hid); |
| 204 | |
| 205 hsize_t rank = H5Sget_simple_extent_ndims (space_id); | |
| 206 | |
| 207 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
208 { |
| 4687 | 209 H5Dclose (data_hid); |
| 210 return false; | |
| 211 } | |
| 212 | |
| 213 double dtmp; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
214 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
215 H5P_DEFAULT, &dtmp) < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
216 { |
| 4687 | 217 H5Dclose (data_hid); |
| 218 return false; | |
| 219 } | |
| 220 | |
| 221 scalar = (dtmp != 0.); | |
| 4837 | 222 |
| 4687 | 223 H5Dclose (data_hid); |
| 4837 | 224 |
| 4687 | 225 return true; |
| 226 } | |
| 4944 | 227 |
| 4687 | 228 #endif |
| 229 | |
| 5900 | 230 mxArray * |
| 231 octave_bool::as_mxArray (void) const | |
| 232 { | |
| 233 mxArray *retval = new mxArray (mxLOGICAL_CLASS, 1, 1, mxREAL); | |
| 234 | |
| 235 bool *pr = static_cast<bool *> (retval->get_data ()); | |
| 236 | |
| 237 pr[0] = scalar; | |
| 238 | |
| 239 return retval; | |
| 240 } |