Mercurial > octave-nkf
view libinterp/operators/op-m-s.cc @ 19632:76478d2da117
unconditionally disable the octave_allocator class
* configure.ac: Delete the --enable-octave-allocator option.
* oct-alloc.h: Delete octave_allocator class. Warn if file is
included. Unconditionally define macros to be empty.
* NEWS: Make note of these changes.
* oct-alloc.cc: Delete.
* liboctave/util/module.mk (UTIL_SRC): Remove it from the list.
* make_int.cc, Cell.h, oct-obj.cc, oct-obj.h, audiodevinfo.cc,
ov-base-int.h, ov-base-scalar.h, ov-bool-mat.cc, ov-bool-mat.h,
ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h,
ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.h,
ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc,
ov-complex.h, ov-cs-list.cc, ov-cs-list.h, ov-cx-diag.cc,
ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc,
ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc,
ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-fcn.cc,
ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc,
ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h,
ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc,
ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-java.cc,
ov-java.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-perm.cc, ov-perm.h,
ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc,
ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, ov.h, pt-const.cc, pt-const.h, idx-vector.cc,
idx-vector.h: Delete uses of oct-alloc.h and OCTAVE_ALLOCATOR macros.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 20 Jan 2015 13:43:29 -0500 |
parents | 175b392e91fe |
children | 4197fc428c7d |
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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "gripes.h" #include "oct-obj.h" #include "ov.h" #include "ov-re-mat.h" #include "ov-flt-re-mat.h" #include "ov-flt-cx-mat.h" #include "ov-scalar.h" #include "ov-typeinfo.h" #include "ops.h" #include "xdiv.h" #include "xpow.h" // matrix by scalar ops. DEFNDBINOP_OP (add, matrix, scalar, array, scalar, +) DEFNDBINOP_OP (sub, matrix, scalar, array, scalar, -) DEFNDBINOP_OP (mul, matrix, scalar, array, scalar, *) DEFBINOP (div, matrix, scalar) { CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); double d = v2.double_value (); if (d == 0.0) gripe_divide_by_zero (); return octave_value (v1.array_value () / d); } DEFBINOP_FN (pow, matrix, scalar, xpow) DEFBINOP (ldiv, matrix, scalar) { CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); Matrix m1 = v1.matrix_value (); Matrix m2 = v2.matrix_value (); MatrixType typ = v1.matrix_type (); Matrix ret = xleftdiv (m1, m2, typ); v1.matrix_type (typ); return ret; } DEFNDBINOP_FN (lt, matrix, scalar, array, scalar, mx_el_lt) DEFNDBINOP_FN (le, matrix, scalar, array, scalar, mx_el_le) DEFNDBINOP_FN (eq, matrix, scalar, array, scalar, mx_el_eq) DEFNDBINOP_FN (ge, matrix, scalar, array, scalar, mx_el_ge) DEFNDBINOP_FN (gt, matrix, scalar, array, scalar, mx_el_gt) DEFNDBINOP_FN (ne, matrix, scalar, array, scalar, mx_el_ne) DEFNDBINOP_OP (el_mul, matrix, scalar, array, scalar, *) DEFBINOP (el_div, matrix, scalar) { CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); double d = v2.double_value (); if (d == 0.0) gripe_divide_by_zero (); return octave_value (v1.array_value () / d); } DEFNDBINOP_FN (el_pow, matrix, scalar, array, scalar, elem_xpow) DEFBINOP (el_ldiv, matrix, scalar) { CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); return x_el_div (v2.double_value (), v1.array_value ()); } DEFNDBINOP_FN (el_and, matrix, scalar, array, scalar, mx_el_and) DEFNDBINOP_FN (el_or, matrix, scalar, array, scalar, mx_el_or) DEFNDCATOP_FN (m_s, matrix, scalar, array, array, concat) DEFNDASSIGNOP_FN (assign, matrix, scalar, scalar, assign) DEFNDASSIGNOP_FN (sgl_assign, float_matrix, scalar, float_scalar, assign) DEFNDASSIGNOP_FN (clx_sgl_assign, float_complex_matrix, scalar, float_complex, assign) DEFNDASSIGNOP_OP (assign_add, matrix, scalar, scalar, +=) DEFNDASSIGNOP_OP (assign_sub, matrix, scalar, scalar, -=) DEFNDASSIGNOP_OP (assign_mul, matrix, scalar, scalar, *=) DEFNDASSIGNOP_OP (assign_div, matrix, scalar, scalar, /=) void install_m_s_ops (void) { INSTALL_BINOP (op_add, octave_matrix, octave_scalar, add); INSTALL_BINOP (op_sub, octave_matrix, octave_scalar, sub); INSTALL_BINOP (op_mul, octave_matrix, octave_scalar, mul); INSTALL_BINOP (op_div, octave_matrix, octave_scalar, div); INSTALL_BINOP (op_pow, octave_matrix, octave_scalar, pow); INSTALL_BINOP (op_ldiv, octave_matrix, octave_scalar, ldiv); // INSTALL_BINOP (op_lt, octave_matrix, octave_scalar, lt); octave_value_typeinfo::register_binary_op (octave_value::op_lt, octave_matrix::static_type_id (), octave_scalar::static_type_id (), oct_binop_lt); INSTALL_BINOP (op_le, octave_matrix, octave_scalar, le); INSTALL_BINOP (op_eq, octave_matrix, octave_scalar, eq); INSTALL_BINOP (op_ge, octave_matrix, octave_scalar, ge); INSTALL_BINOP (op_gt, octave_matrix, octave_scalar, gt); INSTALL_BINOP (op_ne, octave_matrix, octave_scalar, ne); INSTALL_BINOP (op_el_mul, octave_matrix, octave_scalar, el_mul); INSTALL_BINOP (op_el_div, octave_matrix, octave_scalar, el_div); INSTALL_BINOP (op_el_pow, octave_matrix, octave_scalar, el_pow); INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_scalar, el_ldiv); INSTALL_BINOP (op_el_and, octave_matrix, octave_scalar, el_and); INSTALL_BINOP (op_el_or, octave_matrix, octave_scalar, el_or); INSTALL_CATOP (octave_matrix, octave_scalar, m_s); INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_scalar, assign); INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_scalar, sgl_assign); INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_scalar, clx_sgl_assign); INSTALL_ASSIGNOP (op_add_eq, octave_matrix, octave_scalar, assign_add); INSTALL_ASSIGNOP (op_sub_eq, octave_matrix, octave_scalar, assign_sub); INSTALL_ASSIGNOP (op_mul_eq, octave_matrix, octave_scalar, assign_mul); INSTALL_ASSIGNOP (op_div_eq, octave_matrix, octave_scalar, assign_div); }