Changeset 70

Timestamp:

08/12/08 02:48:21 (5 months ago)

Author:

pernet

Message:

Minor change in the computation of the row permutation
Remove commented debugging code

Files:

• include/fflas-ffpack/ffpack_ludivine.inl (modified) (8 diffs)

include/fflas-ffpack/ffpack_ludivine.inl

@@ -421 +421 @@
                                         ip++;
                                 }
-                                if (ip == rowDim) {return 0;}
-                                else{
+                                if (ip == rowDim) {
+                                        return 0;
+                                } else {
                                         size_t oldip = ip;
                                         if ( Diag == FflasNonUnit ){
@@ -463 +464 @@
                 size_t Ndown =  rowDim - Nup;
                 // Recursive call on NW
-                //cerr<<"LUdivine1..";
-
-                //cerr<<"done"<<endl;
                 size_t R, R2;
                 if (trans == FflasTrans){
-                        //cerr<<"LUdivine1..."<<endl;
                         R = LUdivine (F, Diag, trans, colDim, Nup, A, lda, P, Q, LuTag, cutoff);
-                        //cerr<<"done"<<endl;
                         typename Field::Element *Ar = A + Nup*incRow; // SW
                         typename Field::Element *Ac = A + R*incCol;     // NE
@@ -480 +476 @@
                                 applyP (F, FflasLeft, FflasNoTrans, Ndown, 0, R, Ar, lda, P); 
                                 // Ar <- L1^-1 Ar
-                                //write_field(F,cerr<<"Avant ftrsm"<<endl, A, M, N, lda);
                                 ftrsm( F, FflasLeft, FflasLower, 
                                        FflasNoTrans, Diag, R, Ndown,  
                                        one, A, lda, Ar, lda);
                                 // An <- An - Ac*Ar
-                                //write_field(F,cerr<<"Avant fgemm"<<endl, A, M, N, lda);
                                 fgemm( F, FflasNoTrans, FflasNoTrans, colDim-R, Ndown, R,
                                        Mone, Ac, lda, Ar, lda, one, An, lda);
-                                //write_field(F,cerr<<"Apres fgemm"<<endl, A, M, N, lda);
-                                                        
                         }
                         // Recursive call on SE
-                        // cerr<<"LUdivine2..";
-//                      write_field(F,cerr<<"Apres mise a jour"<<endl, A, M, N, lda);
-                        
                         R2 = LUdivine (F, Diag, trans, colDim-R, Ndown, An, lda, P + R, Q + Nup, LuTag, cutoff);
-                        //cerr<<"done"<<endl;
                         for (size_t i = R; i < R + R2; ++i)
                                 P[i] += R;
@@ -515 +503 @@
                         } else {                        
                                 // Ar <- Ar.P
-                                
                                 applyP (F, FflasRight, FflasTrans, Ndown, 0, R, Ar, lda, P); 
                                 // Ar <- Ar.U1^-1
@@ -524 +511 @@
                                 fgemm( F, FflasNoTrans, FflasNoTrans, Ndown, colDim-R, R,
                                        Mone, Ar, lda, Ac, lda, one, An, lda);
-                                // Recursive call on SE
+                                
                         }
-                        // cerr<<"LUdivine2..";
-//                      write_field(F,cerr<<"Apres mise a jour"<<endl, A, M, N, lda);
+                        // Recursive call on SE
                         R2=LUdivine (F, Diag, trans, Ndown, N-R, An, lda,P+R, Q+Nup, LuTag, cutoff);
-                        //cerr<<"done"<<endl;
                         for (size_t i = R; i < R + R2; ++i)
                                 P[i] += R;
@@ -540 +525 @@
                 }
                 // Non zero row permutations
-                for (size_t i = Nup; i < rowDim; i++)
+                for (size_t i = Nup; i < Nup + R2; i++)
                         Q[i] += Nup;
                 if (R < Nup){
@@ -638 +623 @@
                         typename Field::Element * Xn = Xr + Nup;    //  SE
                         typename Field::Element * Xi = Xr;
-                        if ( computeX )
+                        if ( computeX ){
                                 if (MinTag == FfpackDense)
                                         for (size_t i=0; i< Ndown; ++i, Xi+=ldx){
@@ -651 +636 @@
                                                 fcopy(F, N, u,1,Xi, 1);
                                         }
-                         
+                        }
                         // Apply the permutation on SW
-                applyP( F, FflasRight, FflasTrans, Ndown, 0, R, Xr, ldx, P); 
+                        applyP( F, FflasRight, FflasTrans, Ndown, 0, R, Xr, ldx, P); 
                         // Triangular block inversion of NW and apply to SW
                         // Xr <- Xr.U1^-1