[Toon-members] TooN/internal vbase.hh

[Edward Rosten]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Edward Rosten <edrosten>        09/03/04 13:31:24

Modified files:
        internal       : vbase.hh 

Log message:
        Make .as_row() and .as_col() on dynamic vectors return half-dynamic
        matrices.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/vbase.hh?cvsroot=toon&r1=1.12&r2=1.13

Patches:
Index: vbase.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/vbase.hh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- vbase.hh    18 Feb 2009 20:29:10 -0000      1.12
+++ vbase.hh    4 Mar 2009 13:31:24 -0000       1.13
@@ -100,19 +100,19 @@
                return Vector<-1, Precision, SliceVBase<-1, Stride, Precision> 
>(const_cast<Precision*>(my_data + stride()*start), length, stride(), 
Slicing());
        }
 
-       const Matrix<(Size==-1?-1:1), Size, Precision, typename 
Slice<Stride>::ColMajor> as_row() const{
-               return Matrix<(Size==-1?-1:1), Size, Precision, typename 
Slice<Stride>::ColMajor>(const_cast<Precision*>(my_data), 1, Size, stride(), 
Slicing());
+       const Matrix<1, Size, Precision, typename Slice<Stride>::ColMajor> 
as_row() const{
+               return Matrix<1, Size, Precision, typename 
Slice<Stride>::ColMajor>(const_cast<Precision*>(my_data), 1, Size, stride(), 
Slicing());
        }
 
-       Matrix<(Size==-1?-1:1), Size, Precision, typename 
Slice<Stride>::ColMajor> as_row(){
-               return Matrix<(Size==-1?-1:1), Size, Precision, typename 
Slice<Stride>::ColMajor>(my_data, 1, Size, stride(), Slicing());
+       Matrix<1, Size, Precision, typename Slice<Stride>::ColMajor> as_row(){
+               return Matrix<1, Size, Precision, typename 
Slice<Stride>::ColMajor>(my_data, 1, Size, stride(), Slicing());
        }
 
-       const Matrix<Size, (Size==-1?-1:1), Precision, typename 
Slice<Stride>::RowMajor> as_col() const{
-               return Matrix<Size, (Size==-1?-1:1), Precision, typename 
Slice<Stride>::RowMajor>(const_cast<Precision*>(my_data), Size, 1, stride(), 
Slicing());
+       const Matrix<Size, 1, Precision, typename Slice<Stride>::RowMajor> 
as_col() const{
+               return Matrix<Size, 1, Precision, typename 
Slice<Stride>::RowMajor>(const_cast<Precision*>(my_data), Size, 1, stride(), 
Slicing());
        }
 
-       Matrix<Size, (Size==-1?-1:1), Precision, typename 
Slice<Stride>::RowMajor> as_col(){
-               return Matrix<Size, (Size==-1?-1:1), Precision, typename 
Slice<Stride>::RowMajor>(my_data, Size, 1, stride(), Slicing());
+       Matrix<Size, 1, Precision, typename Slice<Stride>::RowMajor> as_col(){
+               return Matrix<Size, 1, Precision, typename 
Slice<Stride>::RowMajor>(my_data, Size, 1, stride(), Slicing());
        }
 };