Changeset 2994

Timestamp:

07/02/08 08:10:55 (5 months ago)

Author:

aniau

Message:

=

Files:

• trunk/linbox/linbox/algorithms/rational-reconstruction-base.h (modified) (11 diffs)

trunk/linbox/linbox/algorithms/rational-reconstruction-base.h

@@ -2 +2 @@
 
 #include <iostream>
-#include <queue>
+#include <deque>
 
 #ifndef __LINBOXX__RECONSTRUCTION_BASE_H__
@@ -108 +108 @@
 class RationalReconstructionBase
 {
+protected:
+        Ring _Z;
+        OpCounter C;
 public:
-        Ring _Z;
+        //Ring _Z;
         typedef typename Ring::Element Element;
         
-        OpCounter C;
+        //OpCounter C;
 
         RationalReconstructionBase(const Ring& Z): _Z(Z) {}
@@ -134 +137 @@
         bool _reduce;
         bool _recursive;
+        Ring _Z;
+        OpCounter C;
 public:
         Ring _Z;
@@ -388 +393 @@
                         ++_size;
                 } else {
-                        if (!empty()) {
-                                top = front();
-                                pop_front();
+                        if (!this->empty()) {
+                                top = this->front();
+                                this->pop_front();
                                 push_back(bottom);
                                 
@@ -401 +406 @@
         
         QMatrix& clearmax(QMatrix& max1) {
-                while (!empty()) {
-                        QMatrix max2(front());
+                while (!this->empty()) {
+                        QMatrix max2(this->front());
                         if (max2.q > max1.q) return max1=max2;
-                        pop_front();
+                        this->pop_front();
                 }
         }
@@ -414 +419 @@
 protected:
         size_t _threshold;
+        Ring _Z;
+        OpCounter C;    
 
 typedef typename Ring::Element Element;
 public:
 
-        MaxQFastRationalReconstruction(const Ring& Z): RationalReconstructionBase<Ring>(Z) {            
+        MaxQFastRationalReconstruction(const Ring& Z): RationalReconstructionBase<Ring>(Z), _Z(Z) {             
                 _threshold = __FASTRR_DEFAULT_THRESHOLD;
                 if (_threshold <5) _threshold=5; 
@@ -677 +684 @@
                 }
 
-                size_t log_n = n.bitsize()-1;
+                //size_t log_n = n.bitsize()-1;
 
                 //              cout << d << " " << log_n << " "  << h << "\n"<< flush;
@@ -1034 +1041 @@
 class MaxQClassicRationalReconstruction: public RationalReconstructionBase<Ring>
 {
+protected:
+        Ring _Z;
+        OpCounter C;
 typedef typename Ring::Element Element;
 public:
@@ -1122 +1132 @@
 typedef typename Ring::Element Element;
 protected:
+        Ring _Z;
+        OpCounter C;
         size_t _threshold;
 
@@ -1759 +1771 @@
 class WangClassicRationalReconstruction: public RationalReconstructionBase<Ring>
 {
+        Ring _Z;
+        OpCounter C;
         bool _reduce;
         bool _recursive;
@@ -1783 +1797 @@
 
         bool reconstructRational(Element& a, Element& b, const Element& x, const Element& m, const Element& a_bound) {  
-                bool res;
+                bool res = false;
 
                 if (x == 0) {