Mercurial > octave-nkf
diff src/OPERATORS/op-sm-cm.cc @ 9931:fb6b6fcafa62
untabify files in src/OPERATORS directory
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 07 Dec 2009 14:49:48 -0500 |
parents | a1dbe9d80eee |
children | ac4b97c6bf8b |
line wrap: on
line diff
--- a/src/OPERATORS/op-sm-cm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-sm-cm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -49,11 +49,11 @@ DEFBINOP (div, sparse_matrix, complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -74,7 +74,7 @@ double d = v1.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v2.complex_array_value () / d); } @@ -83,7 +83,7 @@ MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.sparse_matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -103,17 +103,17 @@ DEFBINOP (el_pow, sparse_matrix, complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); return octave_value (elem_xpow (v1.sparse_matrix_value (), SparseComplexMatrix - (v2.complex_matrix_value ()))); + (v2.complex_matrix_value ()))); } DEFBINOP (el_ldiv, sparse_matrix, complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); return octave_value (quotient (v2.complex_matrix_value (), v1.sparse_matrix_value ())); @@ -151,25 +151,25 @@ INSTALL_BINOP (op_gt, octave_sparse_matrix, octave_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_sparse_matrix, octave_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_sparse_matrix, octave_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_sparse_matrix, octave_complex_matrix, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_sparse_matrix, octave_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_matrix, octave_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_matrix, octave_complex_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_sparse_matrix, octave_complex_matrix, - el_or); + el_or); INSTALL_CATOP (octave_sparse_matrix, octave_complex_matrix, sm_cm); INSTALL_ASSIGNCONV (octave_sparse_matrix, octave_complex_matrix, - octave_sparse_complex_matrix); + octave_sparse_complex_matrix); INSTALL_WIDENOP (octave_sparse_matrix, octave_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); } /*