view libinterp/operators/op-fdm-fdm.cc @ 22296:8b18f46f6427

revamp double, single, int type conversions * ov-type-conv.h: Delete. * libinterp/octave-value/module.mk: Update. * op-double-conv.cc, op-float-conv.cc, op-int-conv.cc: Delete. * libinterp/operators/module.mk: Update. * ov.h, ov.cc, ov-base.h, ov-base.cc (octave_value::as_double, octave_value::as_single, octave_value:as_int8, octave_value:as_int16, octave_value:as_int32, octave_value:as_int64, octave_value:as_uint8, octave_value:as_uint16, octave_value:as_uint32, octave_value:as_uint64): New functions. * ov.cc (Fdouble, Fsingle, Fint8, Fint16, Fint32, Fint64, Fuint8, Fuint16, Fuint32, Fuint64): Move here. Simply call as_double, as_single, etc. member functions. * ov-base-int.cc, ov-base-int.h, ov-base-scalar.cc, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-ch-mat.cc, ov-ch-mat.h, ov-complex.cc, ov-complex.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-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-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-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc: Define as_double, as_single, etc. member functions as appropriate. * ov-typeinfo.h, ov-typeinfo.cc (octave_value_typeinfo::type_conv_ops): Delete data member. Remove all uses. (octave_value_typeinfo::register_type_conv_op): Delete. (octave_value_typeinfo::do_register_type_conv_op): Delete. (octave_value_typeinfo::do_lookup_type_conv_op): Delete. * ops.h (INSTALL_CONVOP, CONVDECLX, DEFCONVFNX, DEFCONVFNX2, DEFDBLCONVFN, DEFFLTCONVFN, DEFSTRINTCONVFN, DEFSTRDBLCONVFN, DEFSTRFLTCONVFN, DEFCONVFN, DEFCONVFN2): Delete obsolete macros. * op-bm-bm.cc, op-cdm-cdm.cc, op-cm-cm.cc, op-cs-cs.cc, op-dm-dm.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcs-fcs.cc, op-fdm-fdm.cc, op-fm-fm.cc, op-fs-fs.cc, op-m-m.cc, op-pm-pm.cc, op-s-s.cc, op-sbm-sbm.cc: Delete unused type conversion functions.
author John W. Eaton <jwe@octave.org>
date Mon, 15 Aug 2016 02:01:29 -0400
parents aba2e6293dd8
children bac0d6f07a3e
line wrap: on
line source

/*

Copyright (C) 2008-2015 Jaroslav Hajek

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 (HAVE_CONFIG_H)
#  include "config.h"
#endif

#include "errwarn.h"
#include "ovl.h"
#include "ov.h"
#include "ov-flt-re-mat.h"
#include "ov-flt-re-diag.h"
#include "ov-re-diag.h"
#include "ov-typeinfo.h"
#include "ops.h"
#include "xdiv.h"
#include "xpow.h"

// matrix unary ops.

DEFUNOP_OP (uplus, float_diag_matrix, /* no-op */)
DEFUNOP_OP (uminus, float_diag_matrix, -)

DEFUNOP (transpose, float_diag_matrix)
{
  const octave_float_diag_matrix& v = dynamic_cast<const octave_float_diag_matrix&> (a);
  return octave_value (v.float_diag_matrix_value ().transpose ());
}

// matrix by matrix ops.

DEFBINOP_OP (add, float_diag_matrix, float_diag_matrix, +)
DEFBINOP_OP (sub, float_diag_matrix, float_diag_matrix, -)
DEFBINOP_OP (mul, float_diag_matrix, float_diag_matrix, *)

DEFBINOP (div, float_diag_matrix, float_diag_matrix)
{
  const octave_float_diag_matrix& v1 = dynamic_cast<const octave_float_diag_matrix&> (a1);
  const octave_float_diag_matrix& v2 = dynamic_cast<const octave_float_diag_matrix&> (a2);

  return xdiv (v1.float_diag_matrix_value (),
               v2.float_diag_matrix_value ());
}

DEFBINOP (ldiv, float_diag_matrix, float_diag_matrix)
{
  const octave_float_diag_matrix& v1 = dynamic_cast<const octave_float_diag_matrix&> (a1);
  const octave_float_diag_matrix& v2 = dynamic_cast<const octave_float_diag_matrix&> (a2);

  return xleftdiv (v1.float_diag_matrix_value (),
                   v2.float_diag_matrix_value ());
}

CONVDECL (float_diag_matrix_to_float_matrix)
{
  const octave_float_diag_matrix& v = dynamic_cast<const octave_float_diag_matrix&> (a);

  return new octave_float_matrix (v.float_matrix_value ());
}

void
install_fdm_fdm_ops (void)
{
  INSTALL_UNOP (op_uplus, octave_float_diag_matrix, uplus);
  INSTALL_UNOP (op_uminus, octave_float_diag_matrix, uminus);
  INSTALL_UNOP (op_transpose, octave_float_diag_matrix, transpose);
  INSTALL_UNOP (op_hermitian, octave_float_diag_matrix, transpose);

  INSTALL_BINOP (op_add, octave_float_diag_matrix, octave_float_diag_matrix,
                 add);
  INSTALL_BINOP (op_sub, octave_float_diag_matrix, octave_float_diag_matrix,
                 sub);
  INSTALL_BINOP (op_mul, octave_float_diag_matrix, octave_float_diag_matrix,
                 mul);
  INSTALL_BINOP (op_div, octave_float_diag_matrix, octave_float_diag_matrix,
                 div);
  INSTALL_BINOP (op_ldiv, octave_float_diag_matrix, octave_float_diag_matrix,
                 ldiv);

  INSTALL_ASSIGNCONV (octave_float_diag_matrix, octave_float_matrix,
                      octave_float_matrix);
  INSTALL_WIDENOP (octave_float_diag_matrix, octave_float_matrix,
                   float_diag_matrix_to_float_matrix);
}