Mercurial > octave-nkf

changeset 8967:5bbbf482909a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix omissions adjusting JR's patches
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 12 Mar 2009 11:46:56 +0100
parents 1bba53c0a38d
children 91d53dc37f79
files liboctave/CSparse.cc liboctave/Sparse-diag-op-defs.h liboctave/dSparse.cc src/OPERATORS/op-dm-sm.cc
diffstat 4 files changed, 25 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- 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<SparseComplexMatrix> (d, a);
+  return do_mul_dm_sm<SparseComplexMatrix> (d, a);
 }
 SparseComplexMatrix
 operator * (const SparseComplexMatrix& a, const DiagMatrix& d)
 {
-  return octave_impl::do_mul_sm_dm<SparseComplexMatrix> (a, d);
+  return do_mul_sm_dm<SparseComplexMatrix> (a, d);
 }
 
 SparseComplexMatrix
 operator * (const ComplexDiagMatrix& d, const SparseMatrix& a)
 {
-  return octave_impl::do_mul_dm_sm<SparseComplexMatrix> (d, a);
+  return do_mul_dm_sm<SparseComplexMatrix> (d, a);
 }
 SparseComplexMatrix
 operator * (const SparseMatrix& a, const ComplexDiagMatrix& d)
 {
-  return octave_impl::do_mul_sm_dm<SparseComplexMatrix> (a, d);
+  return do_mul_sm_dm<SparseComplexMatrix> (a, d);
 }
 
 SparseComplexMatrix
 operator * (const ComplexDiagMatrix& d, const SparseComplexMatrix& a)
 {
-  return octave_impl::do_mul_dm_sm<SparseComplexMatrix> (d, a);
+  return do_mul_dm_sm<SparseComplexMatrix> (d, a);
 }
 SparseComplexMatrix
 operator * (const SparseComplexMatrix& a, const ComplexDiagMatrix& d)
 {
-  return octave_impl::do_mul_sm_dm<SparseComplexMatrix> (a, d);
+  return do_mul_sm_dm<SparseComplexMatrix> (a, d);
 }
 
 SparseComplexMatrix
 operator + (const ComplexDiagMatrix& d, const SparseMatrix& a)
 {
-  return octave_impl::do_add_dm_sm<SparseComplexMatrix> (d, a);
+  return do_add_dm_sm<SparseComplexMatrix> (d, a);
 }
 SparseComplexMatrix
 operator + (const DiagMatrix& d, const SparseComplexMatrix& a)
 {
-  return octave_impl::do_add_dm_sm<SparseComplexMatrix> (d, a);
+  return do_add_dm_sm<SparseComplexMatrix> (d, a);
 }
 SparseComplexMatrix
 operator + (const ComplexDiagMatrix& d, const SparseComplexMatrix& a)
 {
-  return octave_impl::do_add_dm_sm<SparseComplexMatrix> (d, a);
+  return do_add_dm_sm<SparseComplexMatrix> (d, a);
 }
 SparseComplexMatrix
 operator + (const SparseMatrix& a, const ComplexDiagMatrix& d)
 {
-  return octave_impl::do_add_sm_dm<SparseComplexMatrix> (a, d);
+  return do_add_sm_dm<SparseComplexMatrix> (a, d);
 }
 SparseComplexMatrix
 operator + (const SparseComplexMatrix& a, const DiagMatrix& d)
 {
-  return octave_impl::do_add_sm_dm<SparseComplexMatrix> (a, d);
+  return do_add_sm_dm<SparseComplexMatrix> (a, d);
 }
 SparseComplexMatrix
 operator + (const SparseComplexMatrix&a, const ComplexDiagMatrix& d)
 {
-  return octave_impl::do_add_sm_dm<SparseComplexMatrix> (a, d);
+  return do_add_sm_dm<SparseComplexMatrix> (a, d);
 }
 
 SparseComplexMatrix
 operator - (const ComplexDiagMatrix& d, const SparseMatrix& a)
 {
-  return octave_impl::do_sub_dm_sm<SparseComplexMatrix> (d, a);
+  return do_sub_dm_sm<SparseComplexMatrix> (d, a);
 }
 SparseComplexMatrix
 operator - (const DiagMatrix& d, const SparseComplexMatrix& a)
 {
-  return octave_impl::do_sub_dm_sm<SparseComplexMatrix> (d, a);
+  return do_sub_dm_sm<SparseComplexMatrix> (d, a);
 }
 SparseComplexMatrix
 operator - (const ComplexDiagMatrix& d, const SparseComplexMatrix& a)
 {
-  return octave_impl::do_sub_dm_sm<SparseComplexMatrix> (d, a);
+  return do_sub_dm_sm<SparseComplexMatrix> (d, a);
 }
 SparseComplexMatrix
 operator - (const SparseMatrix& a, const ComplexDiagMatrix& d)
 {
-  return octave_impl::do_sub_sm_dm<SparseComplexMatrix> (a, d);
+  return do_sub_sm_dm<SparseComplexMatrix> (a, d);
 }
 SparseComplexMatrix
 operator - (const SparseComplexMatrix& a, const DiagMatrix& d)
 {
-  return octave_impl::do_sub_sm_dm<SparseComplexMatrix> (a, d);
+  return do_sub_sm_dm<SparseComplexMatrix> (a, d);
 }
 SparseComplexMatrix
 operator - (const SparseComplexMatrix&a, const ComplexDiagMatrix& d)
 {
-  return octave_impl::do_sub_sm_dm<SparseComplexMatrix> (a, d);
+  return do_sub_sm_dm<SparseComplexMatrix> (a, d);
 }
 
 // FIXME -- it would be nice to share code among the min/max
--- 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;
 
--- 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<SparseMatrix> (d, a);
+  return do_mul_dm_sm<SparseMatrix> (d, a);
 }
 
 SparseMatrix
 operator * (const SparseMatrix& a, const DiagMatrix& d)
 {
-  return octave_impl::do_mul_sm_dm<SparseMatrix> (a, d);
+  return do_mul_sm_dm<SparseMatrix> (a, d);
 }
 
 SparseMatrix
 operator + (const DiagMatrix& d, const SparseMatrix& a)
 {
-  return octave_impl::do_add_dm_sm<SparseMatrix> (d, a);
+  return do_add_dm_sm<SparseMatrix> (d, a);
 }
 
 SparseMatrix
 operator - (const DiagMatrix& d, const SparseMatrix& a)
 {
-  return octave_impl::do_sub_dm_sm<SparseMatrix> (d, a);
+  return do_sub_dm_sm<SparseMatrix> (d, a);
 }
 
 SparseMatrix
 operator + (const SparseMatrix& a, const DiagMatrix& d)
 {
-  return octave_impl::do_add_sm_dm<SparseMatrix> (a, d);
+  return do_add_sm_dm<SparseMatrix> (a, d);
 }
 
 SparseMatrix
 operator - (const SparseMatrix& a, const DiagMatrix& d)
 {
-  return octave_impl::do_sub_sm_dm<SparseMatrix> (a, d);
+  return do_sub_sm_dm<SparseMatrix> (a, d);
 }
 
 // FIXME -- it would be nice to share code among the min/max
--- 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&);