Changeset 55

Timestamp:

02/20/08 14:38:40 (9 months ago)

Author:

pernet

Message:

fix several bugs

Files:

• include/fflas-ffpack/ffpack.h (modified) (11 diffs)

include/fflas-ffpack/ffpack.h

@@ -192 +192 @@
                 *info =0;
                 if (Side == FflasLeft) { // Left looking solve A X = B
-
+                        
                         solveLB2 (F, FflasLeft, M, N, R, A, lda, Q, B, ldb);
 
@@ -286 +286 @@
 
                 if (Side == FflasLeft) { // Left looking solve A X = B
-                        
+
                         // Initializing X to 0 (to be optimized)
                         for (size_t i = 0; i <N; ++i)
@@ -300 +300 @@
                                 solveLB2 (F, FflasLeft, M, NRHS, R, A, lda, Q, W, ldw);
                                 
-                                applyP (F, FflasLeft, FflasNoTrans, N, 0, R, W, ldw, Q);
+                                applyP (F, FflasLeft, FflasNoTrans, NRHS, 0, R, W, ldw, Q);
 
                                 bool consistent = true;
@@ -310 +310 @@
                                         std::cerr<<"System is inconsistent"<<std::endl;
                                         *info = 1;
+                                        delete[] W;
                                         return X;
                                 }
@@ -326 +327 @@
                                 for (size_t i=0; i < M; ++i)
                                         fcopy (F, NRHS, X + i*ldx, 1, B + i*ldb, 1);
-                               
+                                
                                 solveLB2 (F, FflasLeft, M, NRHS, R, A, lda, Q, X, ldx);
                                 
-                                applyP (F, FflasLeft, FflasNoTrans, N, 0, R, X, ldx, Q);
+                                applyP (F, FflasLeft, FflasNoTrans, NRHS, 0, R, X, ldx, Q);
 
                                 bool consistent = true;
@@ -348 +349 @@
                                 applyP (F, FflasLeft, FflasTrans, NRHS, 0, R, X, ldx, P);
                         }
-
                         return X;
                         
@@ -379 +379 @@
                                         std::cerr<<"System is inconsistent"<<std::endl;
                                         *info = 1;
+                                        delete[] W;
                                         return X;
                                 }
@@ -384 +385 @@
                                 for (size_t i=0; i < NRHS; ++i)
                                         fcopy (F, R, X + i*ldx, 1, W + i*ldb, 1);
-
+                                delete[] W;
                                 applyP (F, FflasRight, FflasNoTrans, NRHS, 0, R, X, ldx, Q);
 
@@ -583 +584 @@
                 size_t * P = new size_t[M];
                 size_t * Q = new size_t[M];
-                nullity = M - ReducedColumnEchelonForm (F, M, M, A, lda, P, Q);
-                applyP (F, FflasLeft, FflasTrans, M, 0, M, A, lda, P); 
-
-                delete[] P;
-                delete[] Q;
-                
-                if (nullity > 0)
-                        return NULL;
-                else
-                        return A;
+                size_t R =  ReducedColumnEchelonForm (F, M, M, A, lda, P, Q);
+                nullity = M - R;
+                applyP (F, FflasLeft, FflasTrans, M, 0, R, A, lda, P); 
+                delete [] P;
+                delete [] Q;
+                return A;
         }
 
@@ -1098 +1095 @@
         CharPoly( const Field& F, std::list<Polynomial>& charp, const size_t N,
                   typename Field::Element * A, const size_t lda,
-                  const FFPACK_CHARPOLY_TAG CharpTag= FfpackLUK);
+                  const FFPACK_CHARPOLY_TAG CharpTag= FfpackArithProg);
         
         /**
@@ -1347 +1344 @@
         KGFast ( const Field& F, std::list<Polynomial>& charp, const size_t N,
                  typename Field::Element * A, const size_t lda, 
-                 size_t * kg_mc, size_t* kg_mc, size_t* kg_j );
+                 size_t * kg_mc, size_t* kg_mb, size_t* kg_j );
 
         template <class Field, class Polynomial>