From f6b5250c264ce0c1a66c41ba7cd2474d032d97cb Mon Sep 17 00:00:00 2001
From: Mark Woolrich <woolrich@fmrib.ox.ac.uk>
Date: Wed, 30 Mar 2005 10:33:12 +0000
Subject: [PATCH] *** empty log message ***
---
sparse_matrix.cc | 25 ++++++++++++++++++++++++-
sparse_matrix.h | 1 +
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/sparse_matrix.cc b/sparse_matrix.cc
index 5972be6..4e6ca0d 100644
--- a/sparse_matrix.cc
+++ b/sparse_matrix.cc
@@ -6,7 +6,6 @@
/* CCOPYRIGHT */
-
#include <iostream>
#include <iomanip>
#include <strstream>
@@ -222,6 +221,30 @@ namespace MISCMATHS {
}
}
+ void multiply(const DiagonalMatrix& lm, const SparseMatrix& rm, SparseMatrix& ret)
+ {
+ Tracer_Plus tr("SparseMatrix::multiply");
+
+ int nrows = lm.Nrows();
+ int ncols = rm.Ncols();
+
+ if(lm.Ncols() != rm.Nrows()) throw Exception("Rows and cols don't match in SparseMatrix::multiply");
+
+ ret.ReSize(nrows,ncols);
+
+ for(int j = 1; j<=nrows; j++)
+ {
+ const SparseMatrix::Row& row = rm.row(j);
+ for(SparseMatrix::Row::const_iterator it=row.begin();it!=row.end();it++)
+ {
+ int c = (*it).first+1;
+ double val = (*it).second;
+ ret.insert(j,c,val*lm(j,j));
+ }
+ }
+
+ }
+
void multiply(const SparseMatrix& lm, const SparseMatrix::Row& rm, ColumnVector& ret)
{
Tracer_Plus tr("SparseMatrix::multiply3");
diff --git a/sparse_matrix.h b/sparse_matrix.h
index c793bbe..491ef3f 100644
--- a/sparse_matrix.h
+++ b/sparse_matrix.h
@@ -128,6 +128,7 @@ namespace MISCMATHS {
};
void multiply(const SparseMatrix& lm, const SparseMatrix& rm, SparseMatrix& ret);
+ void multiply(const DiagonalMatrix& lm, const SparseMatrix& rm, SparseMatrix& ret);
void multiply(const SparseMatrix& lm, const ColumnVector& rm, ColumnVector& ret);
--
GitLab