[Toon-members] TooN internal/mbase.hh test/mat_test.cc

[Edward Rosten]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Edward Rosten <edrosten>        09/02/24 18:16:12

Modified files:
        internal       : mbase.hh 
        test           : mat_test.cc 

Log message:
        Improvement to matrix base: .T() on a normal matrix does not need to 
        introduce an extra member to hold the stride.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/mbase.hh?cvsroot=toon&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/TooN/test/mat_test.cc?cvsroot=toon&r1=1.4&r2=1.5

Patches:
Index: internal/mbase.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/mbase.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- internal/mbase.hh   11 Feb 2009 18:04:25 -0000      1.12
+++ internal/mbase.hh   24 Feb 2009 18:16:11 -0000      1.13
@@ -219,12 +219,12 @@
        }
 
 
-       Matrix<Cols, Rows, Precision, typename Slice<SliceStride>::ColMajor> 
T(){
-               return Matrix<Cols, Rows, Precision, typename 
Slice<SliceStride>::ColMajor>(my_data, num_rows(), num_cols(), stride(), 
Slicing());
+       Matrix<Cols, Rows, Precision, typename Slice<Stride>::ColMajor> T(){
+               return Matrix<Cols, Rows, Precision, typename 
Slice<Stride>::ColMajor>(my_data, num_rows(), num_cols(), stride(), Slicing());
        }
 
-       const Matrix<Cols, Rows, Precision, typename 
Slice<SliceStride>::ColMajor> T() const{
-               return Matrix<Cols, Rows, Precision, typename 
Slice<SliceStride>::ColMajor>(const_cast<Precision*>(my_data), num_rows(), 
num_cols(), stride(), Slicing());
+       const Matrix<Cols, Rows, Precision, typename Slice<Stride>::ColMajor> 
T() const{
+               return Matrix<Cols, Rows, Precision, typename 
Slice<Stride>::ColMajor>(const_cast<Precision*>(my_data), num_rows(), 
num_cols(), stride(), Slicing());
        }
 };
 
@@ -323,12 +323,12 @@
                return Matrix<-1, -1, Precision, typename 
Slice<SliceStride>::ColMajor >(const_cast<Precision*>(my_data+rs +stride()*cs), 
rl, cl, stride(), Slicing());
        }
 
-       Matrix<Cols, Rows, Precision, typename Slice<SliceStride>::RowMajor> 
T(){
-               return Matrix<Cols, Rows, Precision, typename 
Slice<SliceStride>::RowMajor>(my_data, num_rows(), num_cols(), stride(), 
Slicing());
+       Matrix<Cols, Rows, Precision, typename Slice<Stride>::RowMajor> T(){
+               return Matrix<Cols, Rows, Precision, typename 
Slice<Stride>::RowMajor>(my_data, num_rows(), num_cols(), stride(), Slicing());
        }
 
-       const Matrix<Cols, Rows, Precision, typename 
Slice<SliceStride>::RowMajor> T() const {
-               return Matrix<Cols, Rows, Precision, typename 
Slice<SliceStride>::RowMajor>(const_cast<Precision*>(my_data), num_rows(), 
num_cols(), stride(), Slicing());
+       const Matrix<Cols, Rows, Precision, typename Slice<Stride>::RowMajor> 
T() const {
+               return Matrix<Cols, Rows, Precision, typename 
Slice<Stride>::RowMajor>(const_cast<Precision*>(my_data), num_rows(), 
num_cols(), stride(), Slicing());
        }
 };
 

Index: test/mat_test.cc
===================================================================
RCS file: /cvsroot/toon/TooN/test/mat_test.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/mat_test.cc    11 Feb 2009 14:12:07 -0000      1.4
+++ test/mat_test.cc    24 Feb 2009 18:16:12 -0000      1.5
@@ -43,7 +43,7 @@
 
        cout << "Layout:\n";
 
-       copy(m.data(), m.data()+m.num_rows()*m.num_cols(), 
ostream_iterator<double>(cout, " "));
+       copy(&m[0][0], &m[0][0]+m.num_rows()*m.num_cols(), 
ostream_iterator<double>(cout, " "));
        cout << endl;
 }