Changeset 3443

Timestamp:

09/02/10 16:41:40 (17 months ago)

Author:

saunders

Message:

small tweaks

Location:

trunk/linbox

Files:

• examples/rank.C (modified) (1 diff)
• linbox/blackbox/blas-blackbox.h (modified) (2 diffs)
• linbox/field/PID-integer.h (modified) (1 diff)
• linbox/field/param-fuzzy.h (modified) (2 diffs)

trunk/linbox/examples/rank.C

@@ -36 +36 @@
         long unsigned int r;
 
-        if (argc == 2) { // rank over the integers.
+        if (argc == 2) { // rank over the rational numbers.
 
            /* We could pick a random prime and work mod that prime, But the point here 
            is that the rank function in solutions/ handles that issue.  Our matrix here 
-           is an integer matrix and our concept is that we are getting the rank of that 
+           is an integer or rational matrix and our concept is that we are getting the rank of that 
            matrix by some blackbox magic inside linbox.
            */

trunk/linbox/linbox/blackbox/blas-blackbox.h

@@ -298 +298 @@
 
                 const BlasBlackbox<MultiModDouble>& operator=(const BlasBlackbox<MultiModDouble> & A){                  
-                        //_F   = A._F;          
+                        _F   = A._F;            
                         _row = A._row;
                         _col = A._col;
@@ -393 +393 @@
         protected:
                 
-                const MultiModDouble                 &_F;  
+                MultiModDouble                 _F;  
                 const std::vector<MatrixDomain<Modular<double> > >   _MD; 
                 size_t                  _row,_col;

trunk/linbox/linbox/field/PID-integer.h

@@ -47 +47 @@
 
         public:
+
+                //PID_integer(){}
+                //PID_integer& operator=(PID_integer& K) { return *this; }
 
                 typedef integer Element;

trunk/linbox/linbox/field/param-fuzzy.h

@@ -103 +103 @@
                  */
                 Element &init (Element &x, const integer &y = 0) const
-                        { return x = static_cast<double> (y); }
+                        { return x = y; }
+                        //{ return x = static_cast<double> (y); }
                 Element &init (Element &x, const double &y) const
                         { return x = y; }
@@ -115 +116 @@
                  */
                 integer &convert (integer &x, const Element &y) const
-                        { return x = static_cast<integer> (y); }
+                        { return x = y; }
                 double &convert (double &x, const Element &y) const
                         { return x = y; }