[Toon-members] TooN internal/vbase.hh test/as_foo.cc

[Edward Rosten]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Edward Rosten <edrosten>        09/04/16 17:51:54

Modified files:
        internal       : vbase.hh 
Added files:
        test           : as_foo.cc 

Log message:
        Test program for Vector<>.as_FOO();
        
        Fixed bug in as_row() and as_col()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/vbase.hh?cvsroot=toon&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/TooN/test/as_foo.cc?cvsroot=toon&rev=1.1

Patches:
Index: internal/vbase.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/vbase.hh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- internal/vbase.hh   12 Apr 2009 09:48:56 -0000      1.24
+++ internal/vbase.hh   16 Apr 2009 17:51:54 -0000      1.25
@@ -142,19 +142,19 @@
        }
 
        const Matrix<1, Size, Precision, Slice<1,Stride> > as_row() const{
-               return Matrix<1, Size, Precision, Slice<1,Stride> 
>(const_cast<Precision*>(my_data), 1, Size, 1, stride(), Slicing());
+               return Matrix<1, Size, Precision, Slice<1,Stride> 
>(const_cast<Precision*>(my_data), 1, size(), 1, stride(), Slicing());
        }
 
        Matrix<1, Size, Precision, Slice<1,Stride> > as_row(){
-               return Matrix<1, Size, Precision, Slice<1,Stride> >(my_data, 1, 
Size, 1, stride(), Slicing());
+               return Matrix<1, Size, Precision, Slice<1,Stride> >(my_data, 1, 
size(), 1, stride(), Slicing());
        }
 
        const Matrix<Size, 1, Precision, Slice<Stride,1> > as_col() const{
-               return Matrix<Size, 1, Precision, Slice<Stride,1> 
>(const_cast<Precision*>(my_data), Size, 1, stride(), 1, Slicing());
+               return Matrix<Size, 1, Precision, Slice<Stride,1> 
>(const_cast<Precision*>(my_data), size(), 1, stride(), 1, Slicing());
        }
 
        Matrix<Size, 1, Precision, Slice<Stride,1> > as_col(){
-               return Matrix<Size, 1, Precision, Slice<Stride,1> >(my_data, 
Size, 1, stride(), 1, Slicing());
+               return Matrix<Size, 1, Precision, Slice<Stride,1> >(my_data, 
size(), 1, stride(), 1, Slicing());
        }
 };
 

Index: test/as_foo.cc
===================================================================
RCS file: test/as_foo.cc
diff -N test/as_foo.cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ test/as_foo.cc      16 Apr 2009 17:51:54 -0000      1.1
@@ -0,0 +1,18 @@
+#include <TooN/TooN.h>
+using namespace TooN;
+using namespace std;
+
+int main()
+{
+       Vector<3> v = makeVector(1, 2, 3);
+
+       cout << v.as_row() << endl;
+       cout << v.as_col() << endl;
+
+       Vector<> u = makeVector(1, 2, 3);
+
+       cout << u.as_row() << endl;
+       cout << u.as_col() << endl;
+
+
+}