factor function zeromatrix

Author: jgdumas

linbox/algorithms/bbcharpoly.h

@@ -204,8 +204,8 @@ namespace LinBox
 					FM* depend = NULL;
 					for (size_t j = 1; j <= exp[i]; ++j){
 						IntPoly * tmp2 = new IntPoly(*tmp);
-// 						FieldPoly *tmp2p = new FieldPoly(tmp2->size());
-// 						typename IntPoly::template rebind<Field>() (*tmp2p, *tmp2, F);
+//						FieldPoly *tmp2p = new FieldPoly(tmp2->size());
+//						typename IntPoly::template rebind<Field>() (*tmp2p, *tmp2, F);
 						FieldPoly *tmp2p = new FieldPoly(*tmp2, F);
 
 						FFM = new FM (tmp2p, tmp2, 0, depend);
@@ -223,8 +223,8 @@ namespace LinBox
 					leadingBlocks.insert (std::pair<FM*,bool>(FFM,false));
 				}
 				else {
-// 					FieldPoly* fp=new FieldPoly(intFactors[i].size());
-// 					typename IntPoly::template rebind<Field>() (*fp, (intFactors[i]), F);
+//					FieldPoly* fp=new FieldPoly(intFactors[i].size());
+//					typename IntPoly::template rebind<Field>() (*fp, (intFactors[i]), F);
                     IntPoly * ip=new IntPoly(intFactors[i]);
 					FieldPoly* fp=new FieldPoly(intFactors[i], F);
 
@@ -285,15 +285,15 @@ namespace LinBox
 
 			/* Computation of the minimal polynomial */
 			Polynomial minPoly(F);
-			minpoly (minPoly, A, M);            
+			minpoly (minPoly, A, M);
             //PD.write(std::cerr<<"Minpoly = ",minPoly) << std::endl;
 
 			if (minPoly.size() == n+1){
 				commentator().stop ("done", NULL, "MbbCharpoly");
 				return P = minPoly;
 			}
 
-            
+
 
 			Polynomial charPoly (F);
 

linbox/algorithms/massey-domain.h

@@ -348,7 +348,6 @@ namespace LinBox
 
 			commentator().stop ("done", NULL, "masseyd");
 			//		commentator().stop ("Done", "Done", "LinBox::MasseyDomain::massey");
-            std::cerr<<"SEQ: "<<S<<std::endl;
 			return L;
 		}
 

tests/test-regression.C

@@ -570,7 +570,8 @@ bool testDixonSmallFat() {
     return success = ZZ.areEqual(r[0], b[0]);
 }
 
-bool testZeroMatrixCharPoly() {
+template<typename CMethod=Method::Blackbox>
+bool testZeroMatrixCharPoly(const CMethod& cMeth=CMethod()) {
     bool success;
 	using Ring = Givaro::Modular<double>;
 	using Matrix = SparseMatrix<Ring>;
@@ -581,7 +582,7 @@ bool testZeroMatrixCharPoly() {
 
     PolynomialRing<Ring>::Element c_A, Ex;
 
-    charpoly(c_A, A);
+    charpoly(c_A, A, RingCategories::ModularTag(), cMeth );
 
     PolynomialRing<Ring> PZ(R,'X'); PZ.assign(Ex, Givaro::Degree(1), R.one);
 
@@ -596,38 +597,7 @@ bool testZeroMatrixCharPoly() {
         }
         return false;
     } else
-        if (writing) std::cout << "ZMCP: PASSED" << std::endl;
-
-    return success;
-}
-bool testZeroSymmetricMatrixCharPoly() {
-    bool success;
-	using Ring = Givaro::Modular<double>;
-	using Matrix = SparseMatrix<Ring>;
-    Ring R(3);
-
-    Matrix A(R, 1, 1);
-    A.setEntry(0, 0, R.zero);
-
-    PolynomialRing<Ring>::Element c_A, Ex;
-
-
-    charpoly(c_A, A, RingCategories::ModularTag(), Method::Blackbox(Shape::Symmetric));
-
-    PolynomialRing<Ring> PZ(R,'X'); PZ.assign(Ex, Givaro::Degree(1), R.one);
-
-    success = PZ.areEqual(c_A, Ex);
-
-    if (!success) {
-        if (writing) {
-            std::clog<<"**** ERROR **** Fail ZSMCP " <<std::endl;
-
-            PZ.write(std::clog << "Ex: ", Ex) << std::endl;
-            PZ.write(std::clog << "cA: ", c_A) << std::endl;
-        }
-        return false;
-    } else
-        if (writing) std::cout << "ZSMCP: PASSED" << std::endl;
+        if (writing) std::cout << "ZMCP" << cMeth.name() << cMeth.shapeFlags.flags << " : PASSED" << std::endl;
 
     return success;
 }
@@ -706,8 +676,10 @@ int main (int argc, char **argv)
     pass &= testSparseDiagDet(46);
     pass &= testZeroDimensionalCharPoly ();
     pass &= testZeroDimensionalMinPoly ();
-    pass &= testZeroMatrixCharPoly();
-    pass &= testZeroSymmetricMatrixCharPoly();  
+    pass &= testZeroMatrixCharPoly<>();
+    pass &= testZeroMatrixCharPoly(Method::Blackbox(Shape::Symmetric));
+    pass &= testZeroMatrixCharPoly(Method::DenseElimination());
+//     pass &= testZeroMatrixCharPoly(Method::SparseElimination());
     pass &= testBigScalarCharPoly ();
     pass &= testLocalSmith ();
     pass &= testInconsistent<DenseMatrix<ZRingInts>> (Method::DenseElimination());