Mercurial > hg > octave-nkf
view src/OPERATORS/op-sm-m.cc @ 10884:cc2bc3f46cd4
fix assignment bug with lazy indices
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Wed, 11 Aug 2010 10:55:31 +0200 |
parents | ac4b97c6bf8b |
children | fd0a3ac60b0e |
line wrap: on
line source
/* Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler 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-typeinfo.h" #include "ov-re-mat.h" #include "ops.h" #include "xdiv.h" #include "sparse-xpow.h" #include "sparse-xdiv.h" #include "smx-sm-m.h" #include "smx-m-sm.h" #include "ov-re-sparse.h" // sparse matrix by matrix ops. DEFBINOP_OP (add, sparse_matrix, matrix, +) DEFBINOP_OP (sub, sparse_matrix, matrix, -) DEFBINOP_OP (mul, sparse_matrix, matrix, *) DEFBINOP (div, sparse_matrix, matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&); MatrixType typ = v2.matrix_type (); Matrix ret = xdiv (v1.matrix_value (), v2.matrix_value (), typ); v2.matrix_type (typ); return ret; } DEFBINOPX (pow, sparse_matrix, matrix) { error ("can't do A ^ B for A and B both matrices"); return octave_value (); } DEFBINOP (ldiv, sparse_matrix, matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&); if (v1.rows() == 1 && v1.columns() == 1) { double d = v1.scalar_value (); if (d == 0.0) gripe_divide_by_zero (); return octave_value (v2.array_value () / d); } else { MatrixType typ = v1.matrix_type (); Matrix ret = xleftdiv (v1.sparse_matrix_value (), v2.matrix_value (), typ); v1.matrix_type (typ); return ret; } } DEFBINOP_FN (trans_mul, sparse_matrix, matrix, trans_mul); DEFBINOP_FN (lt, sparse_matrix, matrix, mx_el_lt) DEFBINOP_FN (le, sparse_matrix, matrix, mx_el_le) DEFBINOP_FN (eq, sparse_matrix, matrix, mx_el_eq) DEFBINOP_FN (ge, sparse_matrix, matrix, mx_el_ge) DEFBINOP_FN (gt, sparse_matrix, matrix, mx_el_gt) DEFBINOP_FN (ne, sparse_matrix, matrix, mx_el_ne) DEFBINOP_FN (el_mul, sparse_matrix, matrix, product) DEFBINOP_FN (el_div, sparse_matrix, matrix, quotient) DEFBINOP (el_pow, sparse_matrix, matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&); return octave_value (elem_xpow (v1.sparse_matrix_value (), SparseMatrix (v2.matrix_value ()))); } DEFBINOP (el_ldiv, sparse_matrix, matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&); return octave_value (quotient (v2.matrix_value (), v1.sparse_matrix_value ())); } DEFBINOP_FN (el_and, sparse_matrix, matrix, mx_el_and) DEFBINOP_FN (el_or, sparse_matrix, matrix, mx_el_or) DEFCATOP (sm_m, sparse_matrix, matrix) { CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_matrix&); SparseMatrix tmp (v2.matrix_value ()); return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); } DEFASSIGNOP (assign, sparse_matrix, matrix) { CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_matrix&); SparseMatrix tmp (v2.matrix_value ()); v1.assign (idx, tmp); return octave_value (); } void install_sm_m_ops (void) { INSTALL_BINOP (op_add, octave_sparse_matrix, octave_matrix, add); INSTALL_BINOP (op_sub, octave_sparse_matrix, octave_matrix, sub); INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_matrix, mul); INSTALL_BINOP (op_div, octave_sparse_matrix, octave_matrix, div); INSTALL_BINOP (op_pow, octave_sparse_matrix, octave_matrix, pow); INSTALL_BINOP (op_ldiv, octave_sparse_matrix, octave_matrix, ldiv); INSTALL_BINOP (op_trans_mul, octave_sparse_matrix, octave_matrix, trans_mul); INSTALL_BINOP (op_herm_mul, octave_sparse_matrix, octave_matrix, trans_mul); INSTALL_BINOP (op_lt, octave_sparse_matrix, octave_matrix, lt); INSTALL_BINOP (op_le, octave_sparse_matrix, octave_matrix, le); INSTALL_BINOP (op_eq, octave_sparse_matrix, octave_matrix, eq); INSTALL_BINOP (op_ge, octave_sparse_matrix, octave_matrix, ge); INSTALL_BINOP (op_gt, octave_sparse_matrix, octave_matrix, gt); INSTALL_BINOP (op_ne, octave_sparse_matrix, octave_matrix, ne); INSTALL_BINOP (op_el_mul, octave_sparse_matrix, octave_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_sparse_matrix, octave_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_sparse_matrix, octave_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_matrix, octave_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_matrix, octave_matrix, el_and); INSTALL_BINOP (op_el_or, octave_sparse_matrix, octave_matrix, el_or); INSTALL_CATOP (octave_sparse_matrix, octave_matrix, sm_m); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_matrix, assign); }