[Toon-members] TooN Makefile.in internal/comma.hh regressions/...

[Edward Rosten]

CVSROOT:        /cvsroot/toon
Module name:    TooN
Changes by:     Edward Rosten <edrosten>        09/12/09 18:51:14

Modified files:
        .              : Makefile.in 
        internal       : comma.hh 
Added files:
        regressions    : fill.cc fill.txt 

Log message:
        Fix bug in matrix filling with Fill(Matrix<>) for non square matrices.
        
        Regression test added.
        
        Reported by Gabriel Nützi.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/Makefile.in?cvsroot=toon&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/TooN/regressions/fill.cc?cvsroot=toon&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/TooN/regressions/fill.txt?cvsroot=toon&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/TooN/internal/comma.hh?cvsroot=toon&r1=1.2&r2=1.3

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/toon/TooN/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- Makefile.in 7 Dec 2009 12:45:29 -0000       1.19
+++ Makefile.in 9 Dec 2009 18:51:13 -0000       1.20
@@ -36,7 +36,7 @@
        doxygen 
 
 
-TESTS=lu slice vector_resize gauss_jordan eigen-sqrt determinant chol_toon 
chol_lapack simplex sym_eigen
+TESTS=lu slice vector_resize gauss_jordan eigen-sqrt determinant chol_toon 
chol_lapack simplex sym_eigen fill
 
 
 TEST_RESULT=$(TESTS:%=regressions/%.result)

Index: internal/comma.hh
===================================================================
RCS file: /cvsroot/toon/TooN/internal/comma.hh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- internal/comma.hh   10 Jul 2009 14:05:55 -0000      1.2
+++ internal/comma.hh   9 Dec 2009 18:51:14 -0000       1.3
@@ -71,7 +71,7 @@
                        Internal::CheckMOverFill<N, R, C>::check(m.num_rows() * 
m.num_cols());
                        m[r][c] = p;
                        c++;
-                       if(c == m.num_rows())
+                       if(c == m.num_cols())
                        {
                                c=0;
                                r++;

Index: regressions/fill.cc
===================================================================
RCS file: regressions/fill.cc
diff -N regressions/fill.cc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ regressions/fill.cc 9 Dec 2009 18:51:13 -0000       1.1
@@ -0,0 +1,61 @@
+#include <TooN/TooN.h>
+using namespace TooN;
+using namespace std;
+
+int main()
+{
+       {
+               Matrix <3,2> A;
+               Fill(A) =  1,2,
+                                  3,4,
+                                  5,6;
+
+               cout << A << endl;
+
+               Matrix <2,3> B;
+               Fill(B) =  1,2,3,
+                                  4,5,6;
+
+               cout << B << endl;
+
+               Matrix <3,2,float,ColMajor> C;
+               Fill(C) =  1,2,
+                                  3,4,
+                                  5,6;
+
+               cout << C << endl;
+
+               Matrix <2,3, float,ColMajor> D;
+               Fill(D) =  1,2,3,
+                                  4,5,6;
+
+               cout << D << endl;
+       }
+       {
+               Matrix<> A(3,2);
+               Fill(A) =  1,2,
+                                  3,4,
+                                  5,6;
+
+               cout << A << endl;
+
+               Matrix<> B(2,3);
+               Fill(B) =  1,2,3,
+                                  4,5,6;
+
+               cout << B << endl;
+
+               Matrix <Dynamic,Dynamic,float,ColMajor> C(3,2);
+               Fill(C) =  1,2,
+                                  3,4,
+                                  5,6;
+
+               cout << C << endl;
+
+               Matrix <Dynamic,Dynamic, float,ColMajor> D(2,3);
+               Fill(D) =  1,2,3,
+                                  4,5,6;
+
+               cout << D << endl;
+       }
+}

Index: regressions/fill.txt
===================================================================
RCS file: regressions/fill.txt
diff -N regressions/fill.txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ regressions/fill.txt        9 Dec 2009 18:51:13 -0000       1.1
@@ -0,0 +1,28 @@
+1 2
+3 4
+5 6
+
+1 2 3
+4 5 6
+
+1 2
+3 4
+5 6
+
+1 2 3
+4 5 6
+
+1 2
+3 4
+5 6
+
+1 2 3
+4 5 6
+
+1 2
+3 4
+5 6
+
+1 2 3
+4 5 6
+