polish the FixedPrimeIterator

Author: ClementPernet

examples/dixonsolve.C

@@ -128,8 +128,8 @@ int test(_Matrix A, std::string vector_file, bool inv, bool pp, bool sparse_elim
     const size_t bitsize((size_t) FieldTraits<Field>::bestBitSize(A.rowdim()));
     Givaro::Integer randomPrime( *(PrimeIterator<>(bitsize)) );
 
-    FixPrime fixedprime( randomPrime );
-    DixonSolver<Ints, Field, FixPrime, _EliminationMethod> rsolve(A.field(), fixedprime);
+    FixedPrimeIterator fixedprime( randomPrime );
+    DixonSolver<Ints, Field, FixedPrimeIterator, _EliminationMethod> rsolve(A.field(), fixedprime);
     std::cout << "Using: " << *fixedprime << " as the fixed p-adic." << std::endl;
 
     chrono.start();

linbox/randiter/random-prime.h

@@ -317,15 +317,27 @@ namespace LinBox
         } while(!_IPD.isprime(_prime));
     }
 
-    struct FixPrime {
-        typedef Givaro::Integer Prime_Type;
-        const Prime_Type _myprime;
-        FixPrime(const Givaro::Integer& i) : _myprime(i) {}
-        inline FixPrime &operator ++ () { return *this; }
-        const Prime_Type &operator * () const { return randomPrime(); }
+   /*! @brief Adaptor class to make a single prime number behave like a PrimeIterator.
+    */
+   class FixedPrimeIterator {
+    public:
+        using Prime_Type = Givaro::Integer;
+        using UniqueSamplingTag = std::false_type;
+        using IteratorTag = IteratorCategories::DeterministicTag;
+
+        FixedPrimeIterator (const Givaro::Integer& i) : _myprime(i) {}
+
+        inline FixedPrimeIterator &operator ++ () { return *this; }
+
+        const Prime_Type & operator * () const { return randomPrime(); }
         const Prime_Type & randomPrime() const { return _myprime; }
+
         void setBits(uint64_t bits) {}
-        template<class _ModField> void setBitsField() { }
+
+        template<class _ModField> void setBitsField() {}
+
+   private:
+        const Prime_Type _myprime;
     };
 
 }