Mercurial > octave
diff src/OPERATORS/op-m-scm.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 | e5055ed23f52 |
children | ac4b97c6bf8b |
line wrap: on
line diff
--- a/src/OPERATORS/op-m-scm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-m-scm.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. @@ -56,7 +56,7 @@ Complex d = v2.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.array_value () / d); } @@ -65,7 +65,7 @@ MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.matrix_value (), - v2.sparse_complex_matrix_value (), typ); + v2.sparse_complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -81,11 +81,11 @@ DEFBINOP (ldiv, matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -104,17 +104,17 @@ DEFBINOP (el_pow, matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); return octave_value (elem_xpow (SparseMatrix (v1.matrix_value ()), - v2.sparse_complex_matrix_value ())); + v2.sparse_complex_matrix_value ())); } DEFBINOP (el_ldiv, matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); return octave_value (quotient (v2.sparse_complex_matrix_value (), v1.matrix_value ())); } @@ -127,7 +127,7 @@ CAST_BINOP_ARGS (octave_matrix&, const octave_sparse_complex_matrix&); SparseMatrix tmp (v1.matrix_value ()); return octave_value (tmp. concat (v2.sparse_complex_matrix_value (), - ra_idx)); + ra_idx)); } DEFCONV (sparse_complex_matrix_conv, matrix, sparse_complex_matrix) @@ -153,25 +153,25 @@ INSTALL_BINOP (op_gt, octave_matrix, octave_sparse_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_matrix, octave_sparse_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_matrix, octave_sparse_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_matrix, octave_sparse_complex_matrix, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_matrix, octave_sparse_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_sparse_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_matrix, octave_sparse_complex_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_matrix, octave_sparse_complex_matrix, - el_or); + el_or); INSTALL_CATOP (octave_matrix, octave_sparse_complex_matrix, m_scm); INSTALL_ASSIGNCONV (octave_matrix, octave_sparse_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP (octave_matrix, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); } /*