Merge pull request linbox-team#286 from linbox-team/zoempty

Zoempty

Author: pascalgiorgi

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/polynomial-matrix/polynomial-matrix-domain.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 ());
 

linbox/algorithms/wiedemann.inl

@@ -243,7 +243,7 @@ namespace LinBox
 
 		value_type operator*() const
 		{
-		       	return _elem;
+			return _elem;
 		}
 
 	private:
@@ -298,16 +298,18 @@ namespace LinBox
 			_row(rowidx),
 			_col(colidx)
 		{
-
 			if( _rowbeg == _rowend ) return;
 
 			while ( _colbeg == _rowbeg->end() ) {
 
 				if (++_rowbeg == _rowend) return;
 
+                ++_row;
+
 				_colbeg = _rowbeg->begin();
 
 			}
+            _col = *_colbeg;
 
 		}
 
@@ -375,12 +377,12 @@ namespace LinBox
 
 	inline ZeroOne<GF2>::IndexedIterator ZeroOne<GF2>::indexBegin()
 	{
-		return ZeroOne<GF2>::IndexedIterator(0, this->begin(), this->end(), this->front().front(), this->front().begin() );
+        return ZeroOne<GF2>::IndexedIterator(0, this->begin(), this->end(), 0, this->front().begin() );
 	}
 
 	inline const ZeroOne<GF2>::IndexedIterator ZeroOne<GF2>::indexBegin() const
 	{
-		return ZeroOne<GF2>::IndexedIterator(0, this->begin(), this->end(), this->front().front(), this->front().begin() );
+        return ZeroOne<GF2>::IndexedIterator(0, this->begin(), this->end(), 0, this->front().begin() );
 	}
 
 	inline ZeroOne<GF2>::IndexedIterator ZeroOne<GF2>::indexEnd()

linbox/blackbox/zo-gf2.inl

@@ -34,8 +34,6 @@
 
 #include <time.h>
 #include "linbox/linbox-config.h"
-#include "linbox/integer.h"
-// #include "linbox/field/modular.h"
 #include "linbox/element/abstract.h"
 #include "linbox/element/envelope.h"
 #include "linbox/util/commentator.h"
@@ -48,6 +46,7 @@ namespace LinBox
 	class GF2RandIter {
 	public:
 		typedef bool Element;
+		typedef size_t Residu_t;
 
 		/** Constructor from field, sampling size, and seed.
 		 * The random field element iterator works in the field F, is seeded
@@ -63,13 +62,13 @@ namespace LinBox
 		 *             generator (default = 0)
 		 */
 		GF2RandIter (const GF2 & F,
-			     const integer &size  = 0 ,
-			     const integer &seed = 0)
+			     const size_t &seed = 0,
+			     const size_t &size = 0)
 		{
-			int32_t _seed = seed;
+			size_t _seed = seed;
 
-			if (_seed == 0) _seed = (int32_t)time (NULL);
-			MT.setSeed ((uint32_t)_seed);
+			if (_seed == 0) _seed = (size_t)time (NULL);
+			MT.setSeed (_seed);
 		}
 
 		/// constructor
@@ -132,7 +131,7 @@ namespace LinBox
 		}
 
 
-		uint32_t& random (uint32_t& a)  const
+		size_t& random (size_t& a)  const
 		{ return a = MT.randomInt(); }
 
 		MersenneTwister& getMT() { return MT; }

linbox/randiter/gf2.h

@@ -300,8 +300,10 @@ int main (int argc, char **argv) {
 	FFLAS::writeCommandString(report << argv[0] << ' ', args) << std::endl;
     { // sparseelim
         pass0 &= test_sparse_local_smith(rseed,r,m,n,Givaro::Integer(2),e,d);
+        pass0 &= test_sparse_local_smith(rseed,r,m,n,Givaro::Integer(2),e,0.01); // to check code against issue #286 (first row is zero)
         pass0 &= test_sparse_local_smith(rseed,r,m,n,Givaro::Integer(q),e,d/2.);
         pass0 &= test_sparse_local_smith(rseed,r,m,n,uint64_t(2),e,d);
+        pass0 &= test_sparse_local_smith(rseed,r,m,n,uint64_t(2),e,0.01); // to check code against issue #286 (first row is zero)
         pass0 &= test_sparse_local_smith(rseed,r,m,n,uint64_t(q),e,d/2.);
         pass0 &= ruint_test<6>(rseed,r,m,n,2,e,d);
         pass0 &= ruint_test<6>(rseed,r,m,n,q,e,d/2.);

tests/test-local-smith-form-sparseelim.C

@@ -87,16 +87,16 @@ int main (int argc, char **argv)
         commentator().setReportStream(std::cout);
     }
 
-    using GFt = GF2;
-    using ZMatrix=ZeroOne<GFt>;
     using GMd = Givaro::Modular<double>;
     using MMatrix = SparseMatrix<GMd>;
 
 
     pass &= testWiedemannSingular<GMd,MMatrix>();
 
         // Still failing: see https://github.com/linbox-team/linbox/issues/233
-//     pass &= testWiedemannSingular<GFt,ZMatrix>();
+    // using GFt = GF2;
+    // using ZMatrix=ZeroOne<GFt>;
+    // pass &= testWiedemannSingular<GFt,ZMatrix>();
 
     return pass ? 0 : -1;
 }