Mercurial > hg > octave-nkf
view libinterp/octave-value/ov-flt-complex.h @ 18129:e473c4853afc gui-release
enable non-integer ranges as indices by default and deprecate preference
* octave.cc (maximum_braindamage): Don't call
Fdo_brainded_shortcircuit_evaluation.
* error.cc (initialize_default_warning_state): Don't set
Octave:noninteger-range-as-index to "error".
* octave.cc (maximum_braindamage): Don't call
Fallow_noninteger_range_as_index. Don't set
Octave:noninteger-range-as-index to "on".
* ov-range.h, ov-range.cc (Vallow_noninteger_range_as_index):
Now static. Set default value to true.
* ov.h (octave_value::index_vector): New arg, require_integers.
* ov-base.cc, ov-base.h (octave_value::index_vector): Likewise.
* ov-base-diag.cc, ov-base-diag.h, ov-bool-mat.h, ov-bool-sparse.h,
ov-bool.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h,
ov-colon.h, ov-complex.h, ov-float.h, ov-flt-re-mat.h, ov-intx.h,
ov-lazy-idx.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h,
ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.h:
Make corresponding changes in all derived methods.
* ov-range.cc (octave_range::index_vector): If new require_integers
argument is true, also require integer arguments regardless of the
setting of Vallow_noninteger_range_as_index.
* utils.cc (Fisindex): Don't temporarily set
Vallow_noninteger_range_as_index. Call index_vector with argument of
true.
* NEWS: Mention change in default value, warning state and deprecated
function.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 11 Dec 2013 23:35:34 -0500 |
parents | ebb3ef964372 |
children | 76478d2da117 |
line wrap: on
line source
/* Copyright (C) 1996-2013 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_ov_flt_complex_h) #define octave_ov_flt_complex_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "lo-ieee.h" #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h" #include "gripes.h" #include "error.h" #include "ov-base.h" #include "ov-flt-cx-mat.h" #include "ov-base-scalar.h" #include "ov-typeinfo.h" class octave_value_list; class tree_walker; // Complex scalar values. class OCTINTERP_API octave_float_complex : public octave_base_scalar<FloatComplex> { public: octave_float_complex (void) : octave_base_scalar<FloatComplex> () { } octave_float_complex (const FloatComplex& c) : octave_base_scalar<FloatComplex> (c) { } octave_float_complex (const octave_float_complex& c) : octave_base_scalar<FloatComplex> (c) { } ~octave_float_complex (void) { } octave_base_value *clone (void) const { return new octave_float_complex (*this); } // We return an octave_float_complex_matrix object here instead of an // octave_float_complex object so that in expressions like A(2,2,2) = 2 // (for A previously undefined), A will be empty instead of a 1x1 // object. octave_base_value *empty_clone (void) const { return new octave_float_complex_matrix (); } octave_base_value *try_narrowing_conversion (void); octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); octave_value any (int = 0) const { return (scalar != FloatComplex (0, 0) && ! (lo_ieee_isnan (std::real (scalar)) || lo_ieee_isnan (std::imag (scalar)))); } builtin_type_t builtin_type (void) const { return btyp_float_complex; } bool is_complex_scalar (void) const { return true; } bool is_complex_type (void) const { return true; } bool is_single_type (void) const { return true; } bool is_float_type (void) const { return true; } double double_value (bool = false) const; float float_value (bool = false) const; double scalar_value (bool frc_str_conv = false) const { return double_value (frc_str_conv); } float float_scalar_value (bool frc_str_conv = false) const { return float_value (frc_str_conv); } Matrix matrix_value (bool = false) const; FloatMatrix float_matrix_value (bool = false) const; NDArray array_value (bool = false) const; FloatNDArray float_array_value (bool = false) const; SparseMatrix sparse_matrix_value (bool = false) const { return SparseMatrix (matrix_value ()); } SparseComplexMatrix sparse_complex_matrix_value (bool = false) const { return SparseComplexMatrix (complex_matrix_value ()); } octave_value resize (const dim_vector& dv, bool fill = false) const; Complex complex_value (bool = false) const; FloatComplex float_complex_value (bool = false) const; ComplexMatrix complex_matrix_value (bool = false) const; FloatComplexMatrix float_complex_matrix_value (bool = false) const; ComplexNDArray complex_array_value (bool = false) const; FloatComplexNDArray float_complex_array_value (bool = false) const; bool bool_value (bool warn = false) const { if (xisnan (scalar)) gripe_nan_to_logical_conversion (); else if (warn && scalar != 0.0f && scalar != 1.0f) gripe_logical_conversion (); return scalar != 0.0f; } boolNDArray bool_array_value (bool warn = false) const { if (xisnan (scalar)) gripe_nan_to_logical_conversion (); else if (warn && scalar != 0.0f && scalar != 1.0f) gripe_logical_conversion (); return boolNDArray (dim_vector (1, 1), scalar != 1.0f); } octave_value diag (octave_idx_type m, octave_idx_type n) const; void increment (void) { scalar += 1.0; } void decrement (void) { scalar -= 1.0; } bool save_ascii (std::ostream& os); bool load_ascii (std::istream& is); bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); #if defined (HAVE_HDF5) bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); bool load_hdf5 (hid_t loc_id, const char *name); #endif int write (octave_stream& os, int block_size, oct_data_conv::data_type output_type, int skip, oct_mach_info::float_format flt_fmt) const { // Yes, for compatibility, we drop the imaginary part here. return os.write (array_value (true), block_size, output_type, skip, flt_fmt); } mxArray *as_mxArray (void) const; octave_value map (unary_mapper_t umap) const; private: DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; typedef octave_float_complex octave_float_complex_scalar; #endif