From 10c0143fc4e21369c31b970da395fa3e01332ed4 Mon Sep 17 00:00:00 2001
From: jiri <jiri>
Date: Wed, 2 Feb 2005 14:49:33 +0000
Subject: [PATCH] *** empty log message ***

---
 mat.cc       | 50 ++++++++++++++++++++++++++++++++------------------
 sparsemat.cc | 19 +++++++++++++------
 2 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/mat.cc b/mat.cc
index 895a04d..1007f0d 100644
--- a/mat.cc
+++ b/mat.cc
@@ -34,24 +34,6 @@ NRMat<T> & NRMat<T>::operator=(const T &a)
 
 
 
-//get diagonal; for compatibility with large matrices do not return newly created object
-template <typename T>
-void NRMat<T>::diagonalof(NRVec<T> &r) const
-{
-#ifdef DEBUG
-        if (nn != mm) laerror("diagonalof() non-square matrix");
-	if (r.size() != nn) laerror("diagonalof() incompatible vector");
-#endif
-
-#ifdef MATPTR
-         for (int i=0; i< nn; i++) r[i] = v[i][i];
-#else
-         {int i,j; for (i=j=0; j< nn; ++j, i+=nn+1) r[j] = v[i];}
-#endif
-
-}
-
-
 
 // M += a
 template <typename T>
@@ -757,6 +739,38 @@ const complex<double> NRMat< complex<double> >::trace() const
 	return sum;
 }
 
+
+
+//get diagonal; for compatibility with large matrices do not return newly created object
+//for non-square get diagonal of A^TA, will be used as preconditioner 
+void NRMat<double>::diagonalof(NRVec<double> &r) const
+{
+#ifdef DEBUG
+	if (r.size() != nn) laerror("diagonalof() incompatible vector");
+#endif
+
+if(nn==mm)
+{
+#ifdef MATPTR
+         for (int i=0; i< nn; i++) r[i] = v[i][i];
+#else
+         {int i,j; for (i=j=0; j< nn; ++j, i+=nn+1) r[j] = v[i];}
+#endif
+}
+else //non-square
+{
+for (int i=0; i< mm; i++)
+#ifdef MATPTR
+	r[i] = cblas_ddot(nn,v[0]+i,mm,v[0]+i,mm);
+#else
+	r[i] = cblas_ddot(nn,v+i,mm,v+i,mm);
+#endif
+}
+
+}
+
+
+
 //////////////////////////////////////////////////////////////////////////////
 //// forced instantization in the corespoding object file
 #define INSTANTIZE(T) \
diff --git a/sparsemat.cc b/sparsemat.cc
index 80dd2f7..5c2c789 100644
--- a/sparsemat.cc
+++ b/sparsemat.cc
@@ -490,15 +490,22 @@ template <class T>
 void SparseMat<T>::diagonalof(NRVec<T> &r) const
 {
 #ifdef DEBUG
-if(nn!=mm) laerror("diagonalof() non-square sparse matrix");
+if((int)mm!=r.size()) laerror("incompatible vector size in diagonalof()");
 #endif
 matel<T> *l=list;
 r=(T)0;
-while(l)
-	{
-	if(l->row == l->col) r[l->row]+= l->elem;
-	l= l->next;
-	}
+if(nn==mm) //square
+	while(l)
+		{
+		if(l->row == l->col) r[l->row]+= l->elem;
+		l= l->next;
+		}
+else //diagonal of A^TA, assuming it has been simplified (only one entry per position), will be used as preconditioner only anyway
+	while(l)
+		{
+		r[l->col] += l->elem*l->elem *(l->col!=l->row && symmetric?2.:1.);
+		l= l->next;
+		}
 }