Dixon (dense) refacto

configure.ac

@@ -309,6 +309,7 @@ examples/data/Makefile
 doc/Makefile
 linbox/Makefile
 linbox/algorithms/Makefile
+linbox/algorithms/dixon-solver/Makefile
 linbox/algorithms/gauss/Makefile
 linbox/algorithms/matrix-blas3/Makefile
 linbox/algorithms/opencl-kernels/Makefile

examples/solver/t-rdisolve.C

@@ -184,7 +184,7 @@ int test()
 	cout<<"' and Z/pZ of type '";
 	F.write(cout)<<"'"<<endl;
 
-	typedef RationalSolver<Ring, Field, class RandomPrime, Method::Dixon> QSolver;
+	typedef DixonSolver<Ring, Field, class RandomPrime, Method::DenseElimination> QSolver;
 	typedef DiophantineSolver<QSolver> ZSolver;
 
 	//typedef std::vector<std::pair<RingElement, RingElement> > FractionVector;

linbox/algorithms/Makefile.am

@@ -21,7 +21,7 @@
 
 pkgincludesubdir=$(pkgincludedir)/algorithms
 
-SUBDIRS=gauss opencl-kernels matrix-blas3 polynomial-matrix
+SUBDIRS=dixon-solver gauss opencl-kernels matrix-blas3 polynomial-matrix
 #  IML
 
 noinst_LTLIBRARIES=libalgorithms.la

linbox/algorithms/det-rational.h

@@ -243,8 +243,8 @@ namespace LinBox
 		Integer lif = 1;
 		if ((s1 > 4*s2) && (!term)){
 			//cout << "lif " << std::flush;
-			RationalSolver < Givaro::IntegerDom , Givaro::Modular<double>, PrimeIterator<IteratorCategories::HeuristicTag>, Method::Dixon > RSolver;
-			LastInvariantFactor < Givaro::IntegerDom ,RationalSolver < Givaro::IntegerDom, Givaro::Modular<double>, PrimeIterator<IteratorCategories::HeuristicTag>, Method::Dixon > >  LIF(RSolver);
+			DixonSolver < Givaro::IntegerDom , Givaro::Modular<double>, PrimeIterator<IteratorCategories::HeuristicTag>, Method::DenseElimination > RSolver;
+			LastInvariantFactor < Givaro::IntegerDom ,DixonSolver < Givaro::IntegerDom, Givaro::Modular<double>, PrimeIterator<IteratorCategories::HeuristicTag>, Method::DenseElimination > >  LIF(RSolver);
 			IVect r_num2 (Z,Atilde. coldim());
 			t1.clear();
 			t1.start();

linbox/algorithms/diophantine-solver.inl

@@ -77,7 +77,13 @@ namespace LinBox
 		SolverReturnStatus status;
 
 		//this should eliminate all inconsistent systems; when level == SL_MONTECARLO maybe not.
-		status = _rationalSolver.monolithicSolve(x, den, A, b, (level >= SL_LASVEGAS), true, maxPrimes, level);
+        Method::Dixon method;
+        method.certifyMinimalDenominator = (level >= SL_LASVEGAS);
+        method.certifyInconsistency = (level >= SL_LASVEGAS);
+        method.singularSolutionType = SingularSolutionType::Random;
+        method.trialsBeforeFailure = maxPrimes;
+
+		status = _rationalSolver.monolithicSolve(x, den, A, b, method);
 		if (status != SS_OK) {
 			if (status == SS_FAILED && maxPrimes > 2)
 				std::cout << "ERROR, failed to find original solution and maxPrimes is not too small!" << std::endl;
@@ -113,7 +119,14 @@ namespace LinBox
 		int boredom = 0; //used in monte carlo, when we assume there's a diophantine solution
 		while (! _ring.areEqual(upperDenBound, lowerDenBound)) {
 			_rationalSolver.chooseNewPrime();
-			status = _rationalSolver.monolithicSolve(x, den, A, b, (level >= SL_LASVEGAS), true, 1, level);
+
+            Method::Dixon method;
+            method.certifyMinimalDenominator = (level >= SL_LASVEGAS);
+            method.certifyInconsistency = (level >= SL_LASVEGAS);
+            method.singularSolutionType = SingularSolutionType::Random;
+            method.trialsBeforeFailure = 1;
+
+			status = _rationalSolver.monolithicSolve(x, den, A, b, method);
 			numSolutionsNeeded++;
 #ifdef DEBUG_DIO
 			std::cout << '.' ;

linbox/algorithms/dixon-solver/Makefile.am

@@ -0,0 +1,26 @@
+# Copyright (c) 2010 the LinBox group
+# written by Brice Boyer <boyer.brice@gmail.com>
+# ========LICENCE========
+# This file is part of the library LinBox.
+#
+# LinBox is free software: you can redistribute it and/or modify
+# it under the terms of the  GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+# ========LICENCE========
+
+pkgincludesubdir=$(pkgincludedir)/algorithms/dixon-solver
+
+pkgincludesub_HEADERS =         \
+    dixon-solver-common.inl     \
+	dixon-solver-dense.h        \
+	dixon-solver-dense.inl

linbox/algorithms/dixon-solver/dixon-solver-common.inl

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) LinBox Team
+ *
+ * ========LICENCE========
+ * This file is part of the library LinBox.
+ *
+ * LinBox is free software: you can redistribute it and/or modify
+ * it under the terms of the  GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * ========LICENCE========
+ */
+#pragma once
+
+namespace LinBox {
+	/*! @brief NO DOC !
+	 * @bug why is this hard coded ?
+	*/
+	template <class Prime>
+	inline bool checkBlasPrime(const Prime& p)
+	{
+		return p < Prime(67108863);
+	}
+
+	template<>
+	inline bool checkBlasPrime(const BlasVector<Givaro::ZRing<Integer>>& p)
+	{
+		bool tmp=true;
+		for (size_t i=0;i<p.size();++i)
+			if  (p[i] >= integer(67108863)) {
+				tmp=false;
+				break;
+			}
+
+		return tmp;
+	}
+}