From 30b5975c152950971367af3516488f14455d8a44 Mon Sep 17 00:00:00 2001
From: jiri <jiri>
Date: Wed, 13 Sep 2006 21:29:28 +0000
Subject: [PATCH] *** empty log message ***

---
 mat.cc   | 9 +++++----
 mat.h    | 4 ++--
 matexp.h | 1 -
 vec.cc   | 3 +++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mat.cc b/mat.cc
index eacf3dc..1624eba 100644
--- a/mat.cc
+++ b/mat.cc
@@ -18,19 +18,20 @@ extern ssize_t write(int, const void *, size_t);
 
 //row of
 template <typename T>
-const NRVec<T> NRMat<T>::row(const int i) const
+const NRVec<T> NRMat<T>::row(const int i, int l) const
 {
 #ifdef DEBUG
 if(i<0||i>=nn) laerror("illegal index in row()");
 #endif
-NRVec<T> r(mm);
+if(l < 0) l=mm;
+NRVec<T> r(l);
 LA_traits<T>::copy(&r[0],
 #ifdef MATPTR
         v[i]
 #else
-        v+i*mm
+        v+i*l
 #endif
-,mm);
+,l);
 return r;
 }
 
diff --git a/mat.h b/mat.h
index 897e2a2..93209c0 100644
--- a/mat.h
+++ b/mat.h
@@ -70,8 +70,8 @@ public:
 	const NRVec<T> operator*(const NRVec<T> &rhs) const {NRVec<T> result(nn); result.gemv((T)0,*this,'n',(T)1,rhs); return result;}; // Mat * Vec
 	const NRVec<T> rsum() const; //sum of rows
 	const NRVec<T> csum() const; //sum of columns
-	const NRVec<T> row(const int i) const; //row of, efficient
-	const NRVec<T> column(const int j) const {NRVec<T> r(nn); for(int i=0; i<nn; ++i) r[i]= (*this)(i,j); return r;}; //column of, general but not very efficient
+	const NRVec<T> row(const int i, int l= -1) const; //row of, efficient
+	const NRVec<T> column(const int j, int l= -1) const {if(l<0) l=nn; NRVec<T> r(l); for(int i=0; i<l; ++i) r[i]= (*this)(i,j); return r;}; //column of, general but not very efficient
 	const T* diagonalof(NRVec<T> &, const bool divide=0, bool cache=false) const; //get diagonal 
 	void gemv(const T beta, NRVec<T> &r, const char trans, const T alpha, const NRVec<T> &x) const {r.gemv(beta,*this,trans,alpha,x);};
 	inline T* operator[](const int i);  //subscripting: pointer to row i
diff --git a/matexp.h b/matexp.h
index f5f28ad..e42d50d 100644
--- a/matexp.h
+++ b/matexp.h
@@ -258,7 +258,6 @@ if(mat.nrows()!=mat.ncols()||(unsigned int) mat.nrows() != (unsigned int)rhs.siz
 int power;
 //prepare the polynom of and effectively scale the matrix
 NRVec<typename LA_traits<V>::elementtype> taylor2=exp_aux<M,typename LA_traits<V>::elementtype>(mat,power,maxpower,maxtaylor);
-cerr <<"test power "<<power<<endl;
 
 V tmp;
 
diff --git a/vec.cc b/vec.cc
index 39441a6..9891398 100644
--- a/vec.cc
+++ b/vec.cc
@@ -274,6 +274,8 @@ NRVec< complex<double> > & NRVec< complex<double> >::normalize()
 
 //stubs for linkage
 template<>
+NRVec<unsigned char> &  NRVec<unsigned char>::normalize() {laerror("normalize() impossible for integer types"); return *this;}
+template<>
 NRVec<int> &  NRVec<int>::normalize() {laerror("normalize() impossible for integer types"); return *this;}
 template<>
 NRVec<short> &  NRVec<short>::normalize() {laerror("normalize() impossible for integer types"); return *this;}
@@ -535,6 +537,7 @@ else return memqsort<0,NRVec<T>,int,int>(*this,perm,from,to);
 template class NRVec<double>;
 template class NRVec<complex<double> >;
 template class NRVec<char>;
+template class NRVec<unsigned char>;
 template class NRVec<short>;
 template class NRVec<int>;
 template class NRVec<unsigned int>;