Merge branch 'master' into dixon

Author: ClementPernet

doc/mainpage.doxy

@@ -123,7 +123,7 @@
  * prolific documenters have been William J Turner, Bradford Hovinen, 
  * David Saunders, Brice Boyer.
  *
- * \version 1.6.3
+ * \version 1.7.0
  *
  * \par Support.
  * The project is supported by the National Science Foundation

doc/versionning.doxy

@@ -37,8 +37,8 @@
 *  <li> \b Revision number. <br/>
 *    Minor changes are changes that do not change any API and do not provoke
 * any miscompilation in LinBox. As a consequence, for instance, any release
-* \c 1.3.z of LinBox should  compile with any givaro \c 3.7.z and any
-* fflas-ffpack \c 1.6.z. <br/>
+* \c 1.7.z of LinBox should  compile with any givaro \c 4.2.z and any
+* fflas-ffpack \c 2.4.z. <br/>
 * This correspondance should be published on the website. It is however always put in
 * the \c auto-install.sh script.
 *  </li>

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);
 
@@ -286,14 +286,14 @@ namespace LinBox
 			/* Computation of the minimal polynomial */
 			Polynomial minPoly(F);
 			minpoly (minPoly, A, M);
-//             PD.write(std::cerr<<"Minpoly = ",minPoly) << std::endl;
+            //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/blackbox-container-base.h

@@ -32,7 +32,7 @@
 // - wait   : waits for the end of the current computation
 // ================================================================
 
-
+#include "linbox/solutions/constants.h"
 #include "linbox/vector/vector-domain.h"
 
 namespace LinBox
@@ -157,11 +157,20 @@ namespace LinBox
 		{
 			casenumber = 1;
 			u.resize (_BB->coldim ());
-			for (long i = (long)u.size (); i--;)
-				g.random (u[(size_t)i]);
-			v.resize (_BB->rowdim ());
-			return _VD.dot (_value, u, u);
-		}
+            v.resize (_BB->rowdim ());
+
+            size_t trials=0;
+            do {
+                for (long i = (long)this->u.size (); i--;)
+                    g.random (this->u[(size_t)i]);
+                this->_VD.dot (this->_value, this->u, this->u);
+            } while(_field->isZero(this->_value) && ++trials<= LINBOX_DEFAULT_TRIALS_BEFORE_FAILURE);
+
+            if (trials >= LINBOX_DEFAULT_TRIALS_BEFORE_FAILURE)
+                std::cerr<<"ERROR in "<<__FILE__<<" at line "<<__LINE__<<" -> projection always auto-orthogonal after "<<LINBOX_DEFAULT_TRIALS_BEFORE_FAILURE<<" attempts\n";;
+
+            return _value;
+        }
 
 		/// User Left vectors, Zero Right vector
 		template<class Vector>

linbox/algorithms/blackbox-container.h

@@ -33,6 +33,7 @@
 #include "linbox/randiter/archetype.h"
 #include "linbox/algorithms/blackbox-container-base.h"
 #include "linbox/util/timer.h"
+#include "linbox/solutions/constants.h"
 
 namespace LinBox
 {
@@ -87,13 +88,23 @@ namespace LinBox
 		{
 			this->casenumber = 1;
 			this->u.resize (this->_BB->coldim ());
-			for (long i = (long)this->u.size (); i--;)
-				g.random (this->u[(size_t)i]);
-			this->w.resize (this->_BB->coldim ());
-			for (long i = (long)this->w.size (); i--;)
-				g.random (this->w[(size_t)i]);
-			this->v.resize (this->_BB->rowdim ());
-			this->_VD.dot (this->_value, this->u, this->w);
+            this->w.resize (this->_BB->coldim ());
+            this->v.resize (this->_BB->rowdim ());
+
+            size_t trials=0;
+            do {
+                for (long i = (long)this->u.size (); i--;)
+                    g.random (this->u[(size_t)i]);
+                
+                for (long i = (long)this->w.size (); i--;)
+                    g.random (this->w[(size_t)i]);
+			
+                this->_VD.dot (this->_value, this->u, this->w);
+            } while(F.isZero(this->_value) && ++trials<= LINBOX_DEFAULT_TRIALS_BEFORE_FAILURE);
+
+            if (trials >= LINBOX_DEFAULT_TRIALS_BEFORE_FAILURE)
+                std::cerr<<"ERROR in "<<__FILE__<<" at line "<<__LINE__<<" -> projection always orthogonal after "<<LINBOX_DEFAULT_TRIALS_BEFORE_FAILURE<<" attempts\n";;
+                
 #ifdef INCLUDE_TIMING
 			_applyTime = _dotTime = 0.0;
 #endif

linbox/algorithms/gauss/gauss-gf2.inl

@@ -1,7 +1,7 @@
 /* linbox/algorithms/gauss-gf2.inl
  * Copyright (C) 2009 The LinBox group
  *
- * Time-stamp: <27 Aug 20 15:19:20 [email protected]>
+ * Time-stamp: <03 Dec 21 09:06:58 [email protected]>
  *
  *
  * ========LICENCE========
@@ -75,8 +75,8 @@ namespace LinBox
 
 		// assignment of LigneA with the domain object
 		for (size_t jj = 0; jj < Ni; ++jj)
-			for (size_t k = 0; k < LigneA[jj].size (); k++)
-				++col_density[LigneA[jj][(size_t)k]];
+			for (size_t k = 0; k < LigneA[jj].size(); ++k)
+				++col_density[LigneA[jj][k]];
 
 		long last = (long)Ni - 1;
 		long c;

linbox/algorithms/massey-domain.h

@@ -348,7 +348,6 @@ namespace LinBox
 
 			commentator().stop ("done", NULL, "masseyd");
 			//		commentator().stop ("Done", "Done", "LinBox::MasseyDomain::massey");
-
 			return L;
 		}
 
@@ -398,7 +397,14 @@ namespace LinBox
 		{
 			long dp = massey (phi, full_poly);
 			rank = (size_t) (v_degree(phi) - v_val (phi));
-			if (phi.size () > 0) {
+            //std::cerr<<"dp="<<dp<<" rank="<<rank<<" -> "<<phi.size()<<" : "<<phi<<std::endl;
+            
+            if (dp==0){// empty sequence, its minpoly is 1		
+                 phi.resize(1);		
+                 field().assign(phi[0],field().one);		
+                 return;		
+            }
+            if (phi.size () > 0) {
 				phi.resize ((size_t)dp+1);
 				for (long i = dp >> 1; i > 0; --i)
 					std::swap (phi[(size_t)i], phi[(size_t)(dp-i)]);

linbox/algorithms/polynomial-matrix/polynomial-matrix-domain.h

@@ -92,7 +92,7 @@ namespace LinBox
 	{
 		typedef typename Blackbox::Field Field;
 		typename Field::RandIter i (A.field());
-		size_t            deg;
+		size_t            seqrank;
 
 		commentator().start ("Wiedemann Minimal polynomial", "minpoly");
 
@@ -103,21 +103,21 @@ namespace LinBox
 			BlackboxContainer<Field, Squarize<Blackbox> > TF (&B, A.field(), i);
 			MasseyDomain< Field, BlackboxContainer<Field, Squarize<Blackbox> > > WD (&TF, M.earlyTerminationThreshold);
 
-			WD.minpoly (P, deg);
+			WD.minpoly (P, seqrank);
 		}
 		else if (M.shapeFlags == Shape::Symmetric) {
 			typedef BlackboxContainerSymmetric<Field, Blackbox> BBContainerSym;
 			BBContainerSym TF (&A, A.field(), i);
 			MasseyDomain< Field, BBContainerSym > WD (&TF, M.earlyTerminationThreshold);
 
-			WD.minpoly (P, deg);
+			WD.minpoly (P, seqrank);
 		}
 		else {
 			typedef BlackboxContainer<Field, Blackbox> BBContainer;
 			BBContainer TF (&A, A.field(), i);
 			MasseyDomain< Field, BBContainer > WD (&TF, M.earlyTerminationThreshold);
 
-			WD.minpoly (P, deg);
+			WD.minpoly (P, seqrank);
 #ifdef INCLUDE_TIMING
 			commentator().report (Commentator::LEVEL_IMPORTANT, TIMING_MEASURE)
 			<< "Time required for applies:      " << TF.applyTime () << std::endl;
@@ -130,15 +130,6 @@ namespace LinBox
 #endif // INCLUDE_TIMING
 		}
 
-//             std::cerr << "P: " << P << std::endl;
-//             std::cerr << "WD deg: " << deg << std::endl;
-        if (!deg) {
-                // zero sequence, matrix minpoly is X
-            P.resize(2);
-            A.field().assign(P[0],A.field().zero);
-            A.field().assign(P[1],A.field().one);
-        }
-
 		commentator().stop ("done", NULL, "minpoly");
 
 		return P;

linbox/algorithms/wiedemann.h

@@ -197,7 +197,7 @@ namespace LinBox
 		commentator().start ("Solving nonsingular system (Wiedemann)", "WiedemannSolver::solveNonsingular");
 
 		Polynomial m_A(A.field());
-		Vector     z(A.field());
+		Vector     z(A.field(),0);
 		bool       ret = true;
 
 		{
@@ -289,7 +289,7 @@ namespace LinBox
 	{
 		commentator().start ("Solving singular system (Wiedemann)", "WiedemannSolver::solveSingular");
 
-		Vector Ax(A.field());
+		Vector Ax(A.field(),0);
 		ReturnStatus status = OK, sfrs = OK;
 
 
@@ -430,7 +430,7 @@ namespace LinBox
 		commentator().start ("Solving singular system with generic rank profile (Wiedemann)",
 				   "WiedemannSolver::findRandomSolution");
 
-		Vector v(A.field()), Avpb(A.field()), PAvpb(A.field()), bp(A.field()), xp(A.field()), Qinvx(A.field());
+		Vector v(A.field(),0), Avpb(A.field(),0), PAvpb(A.field(),0), bp(A.field(),0), xp(A.field(),0), Qinvx(A.field(),0);
 
 		RandomDenseStream<Field, Vector> stream (field(), _randiter, A.coldim ());
 
@@ -503,7 +503,7 @@ namespace LinBox
 	{
 		commentator().start ("Finding a nullspace element (Wiedemann)", "WiedemannSolver::findNullspaceElement");
 
-		Vector v(A.field()), Av(A.field()), PAv(A.field()), vp(A.field()), xp(A.field()), Qinvx(A.field());
+		Vector v(A.field(),0), Av(A.field(),0), PAv(A.field(),0), vp(A.field(),0), xp(A.field(),0), Qinvx(A.field(),0);
 
 		RandomDenseStream<Field, Vector> stream (field(), _randiter, A.coldim ());