# HG changeset patch # User Jaroslav Hajek # Date 1236854816 -3600 # Node ID 5bbbf482909ad802dfd67b335bba8f5739d9330b # Parent 1bba53c0a38dce5200737372289fd10ee9116fff fix omissions adjusting JR's patches diff -r 1bba53c0a38d -r 5bbbf482909a liboctave/CSparse.cc --- a/liboctave/CSparse.cc Mon Mar 09 17:49:14 2009 -0400 +++ b/liboctave/CSparse.cc Thu Mar 12 11:46:56 2009 +0100 @@ -7592,96 +7592,96 @@ SparseComplexMatrix operator * (const DiagMatrix& d, const SparseComplexMatrix& a) { - return octave_impl::do_mul_dm_sm (d, a); + return do_mul_dm_sm (d, a); } SparseComplexMatrix operator * (const SparseComplexMatrix& a, const DiagMatrix& d) { - return octave_impl::do_mul_sm_dm (a, d); + return do_mul_sm_dm (a, d); } SparseComplexMatrix operator * (const ComplexDiagMatrix& d, const SparseMatrix& a) { - return octave_impl::do_mul_dm_sm (d, a); + return do_mul_dm_sm (d, a); } SparseComplexMatrix operator * (const SparseMatrix& a, const ComplexDiagMatrix& d) { - return octave_impl::do_mul_sm_dm (a, d); + return do_mul_sm_dm (a, d); } SparseComplexMatrix operator * (const ComplexDiagMatrix& d, const SparseComplexMatrix& a) { - return octave_impl::do_mul_dm_sm (d, a); + return do_mul_dm_sm (d, a); } SparseComplexMatrix operator * (const SparseComplexMatrix& a, const ComplexDiagMatrix& d) { - return octave_impl::do_mul_sm_dm (a, d); + return do_mul_sm_dm (a, d); } SparseComplexMatrix operator + (const ComplexDiagMatrix& d, const SparseMatrix& a) { - return octave_impl::do_add_dm_sm (d, a); + return do_add_dm_sm (d, a); } SparseComplexMatrix operator + (const DiagMatrix& d, const SparseComplexMatrix& a) { - return octave_impl::do_add_dm_sm (d, a); + return do_add_dm_sm (d, a); } SparseComplexMatrix operator + (const ComplexDiagMatrix& d, const SparseComplexMatrix& a) { - return octave_impl::do_add_dm_sm (d, a); + return do_add_dm_sm (d, a); } SparseComplexMatrix operator + (const SparseMatrix& a, const ComplexDiagMatrix& d) { - return octave_impl::do_add_sm_dm (a, d); + return do_add_sm_dm (a, d); } SparseComplexMatrix operator + (const SparseComplexMatrix& a, const DiagMatrix& d) { - return octave_impl::do_add_sm_dm (a, d); + return do_add_sm_dm (a, d); } SparseComplexMatrix operator + (const SparseComplexMatrix&a, const ComplexDiagMatrix& d) { - return octave_impl::do_add_sm_dm (a, d); + return do_add_sm_dm (a, d); } SparseComplexMatrix operator - (const ComplexDiagMatrix& d, const SparseMatrix& a) { - return octave_impl::do_sub_dm_sm (d, a); + return do_sub_dm_sm (d, a); } SparseComplexMatrix operator - (const DiagMatrix& d, const SparseComplexMatrix& a) { - return octave_impl::do_sub_dm_sm (d, a); + return do_sub_dm_sm (d, a); } SparseComplexMatrix operator - (const ComplexDiagMatrix& d, const SparseComplexMatrix& a) { - return octave_impl::do_sub_dm_sm (d, a); + return do_sub_dm_sm (d, a); } SparseComplexMatrix operator - (const SparseMatrix& a, const ComplexDiagMatrix& d) { - return octave_impl::do_sub_sm_dm (a, d); + return do_sub_sm_dm (a, d); } SparseComplexMatrix operator - (const SparseComplexMatrix& a, const DiagMatrix& d) { - return octave_impl::do_sub_sm_dm (a, d); + return do_sub_sm_dm (a, d); } SparseComplexMatrix operator - (const SparseComplexMatrix&a, const ComplexDiagMatrix& d) { - return octave_impl::do_sub_sm_dm (a, d); + return do_sub_sm_dm (a, d); } // FIXME -- it would be nice to share code among the min/max diff -r 1bba53c0a38d -r 5bbbf482909a liboctave/Sparse-diag-op-defs.h --- a/liboctave/Sparse-diag-op-defs.h Mon Mar 09 17:49:14 2009 -0400 +++ b/liboctave/Sparse-diag-op-defs.h Thu Mar 12 11:46:56 2009 +0100 @@ -127,8 +127,6 @@ const octave_idx_type a_nc = a.cols (); const octave_idx_type nz = a.nnz (); - const typename SM::element_type zero = typename SM::element_type (); - const typename DM::element_type dzero = typename DM::element_type (); RT r (a_nr, a_nc, nz + n); octave_idx_type k = 0; diff -r 1bba53c0a38d -r 5bbbf482909a liboctave/dSparse.cc --- a/liboctave/dSparse.cc Mon Mar 09 17:49:14 2009 -0400 +++ b/liboctave/dSparse.cc Thu Mar 12 11:46:56 2009 +0100 @@ -7707,37 +7707,37 @@ SparseMatrix operator * (const DiagMatrix& d, const SparseMatrix& a) { - return octave_impl::do_mul_dm_sm (d, a); + return do_mul_dm_sm (d, a); } SparseMatrix operator * (const SparseMatrix& a, const DiagMatrix& d) { - return octave_impl::do_mul_sm_dm (a, d); + return do_mul_sm_dm (a, d); } SparseMatrix operator + (const DiagMatrix& d, const SparseMatrix& a) { - return octave_impl::do_add_dm_sm (d, a); + return do_add_dm_sm (d, a); } SparseMatrix operator - (const DiagMatrix& d, const SparseMatrix& a) { - return octave_impl::do_sub_dm_sm (d, a); + return do_sub_dm_sm (d, a); } SparseMatrix operator + (const SparseMatrix& a, const DiagMatrix& d) { - return octave_impl::do_add_sm_dm (a, d); + return do_add_sm_dm (a, d); } SparseMatrix operator - (const SparseMatrix& a, const DiagMatrix& d) { - return octave_impl::do_sub_sm_dm (a, d); + return do_sub_sm_dm (a, d); } // FIXME -- it would be nice to share code among the min/max diff -r 1bba53c0a38d -r 5bbbf482909a src/OPERATORS/op-dm-sm.cc --- a/src/OPERATORS/op-dm-sm.cc Mon Mar 09 17:49:14 2009 -0400 +++ b/src/OPERATORS/op-dm-sm.cc Thu Mar 12 11:46:56 2009 +0100 @@ -68,7 +68,7 @@ return xleftdiv (v1.diag_matrix_value (), v2.sparse_matrix_value (), typ); } -DEFBINOP_OP (add_dm_sm, diag_matrix, sparse_matrix) +DEFBINOP (add_dm_sm, diag_matrix, sparse_matrix) { CAST_BINOP_ARGS (const octave_diag_matrix&, const octave_sparse_matrix&);