Changeset 3056

Timestamp:

09/30/08 17:04:20 (2 months ago)

Author:

saunders

Message:

commentator mods to eliminate some destructor problems.
use of /dev/null may be less portable.

Location:

trunk/linbox

Files:

• linbox/util/commentator.C (modified) (12 diffs)
• linbox/util/commentator.h (modified) (8 diffs)
• linbox/vector/vector-domain.h (modified) (1 diff)
• tests/test-minpoly.C (modified) (2 diffs)

trunk/linbox/linbox/util/commentator.C

@@ -81 +81 @@
 
         Commentator::Commentator () 
-                : cnull (new nullstreambuf), _estimationMethod (BEST_ESTIMATE), _format (OUTPUT_CONSOLE),
+                //: cnull (new nullstreambuf), _estimationMethod (BEST_ESTIMATE), _format (OUTPUT_CONSOLE),
+                : cnull ("/dev/null"), _estimationMethod (BEST_ESTIMATE), _format (OUTPUT_CONSOLE),
                   _show_timing (true), _show_progress (true), _show_est_time (true)
         {
@@ -95 +96 @@
         }
         Commentator::Commentator (std::ostream& out) 
-                : cnull (new nullstreambuf), _estimationMethod (BEST_ESTIMATE), _format (OUTPUT_CONSOLE),
+                //: cnull (new nullstreambuf), _estimationMethod (BEST_ESTIMATE), _format (OUTPUT_CONSOLE),
+                : cnull ("/dev/null"), _estimationMethod (BEST_ESTIMATE), _format (OUTPUT_CONSOLE),
                   _show_timing (true), _show_progress (true), _show_est_time (true)
         {
-                registerMessageClass (BRIEF_REPORT,         out, 1, LEVEL_IMPORTANT);
+                //registerMessageClass (BRIEF_REPORT,         out, 1, LEVEL_IMPORTANT);
                 registerMessageClass (BRIEF_REPORT,         out, 1, LEVEL_IMPORTANT);
                 registerMessageClass (PROGRESS_REPORT,      _report);
@@ -110 +112 @@
 
         Commentator::~Commentator() {
-                std::map <const char *, MessageClass *, LessThanString>::iterator i;
+                std::map <const char *, MessageClass * >::iterator i;
                 for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i) 
                         delete i->second;
@@ -182 +184 @@
                 if (isPrinted (_activities.size (), LEVEL_IMPORTANT, BRIEF_REPORT, fn))
                 {
-                //std::cout << "calling finishA ";
                         finishActivityReport (*top_act, msg);
-                        //std::cout << std::endl;
                 }
 
@@ -282 +282 @@
         {
                 MessageClass &briefReportClass = getMessageClass (BRIEF_REPORT);
-                std::map <const char *, MessageClass *, LessThanString>::iterator i;
+                std::map <const char *, MessageClass *>::iterator i;
 
                 for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
@@ -292 +292 @@
         {
                 MessageClass &briefReportClass = getMessageClass (BRIEF_REPORT);
-                std::map <const char *, MessageClass *, LessThanString>::iterator i;
+                std::map <const char *, MessageClass *>::iterator i;
 
                 for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
@@ -336 +336 @@
         {
                 MessageClass &briefReportClass = getMessageClass (BRIEF_REPORT);
-                std::map <const char *, MessageClass *, LessThanString>::iterator i;
+                std::map <const char *, MessageClass *>::iterator i;
 
                 for (i = _messageClasses.begin (); i != _messageClasses.end (); ++i)
@@ -366 +366 @@
         void Commentator::setReportStream (std::ostream &stream) 
         {
+                setMessageClassStream (BRIEF_REPORT,      stream);
                 setMessageClassStream (PROGRESS_REPORT,      stream);
                 setMessageClassStream (TIMING_MEASURE,       stream);
@@ -472 +473 @@
         void Commentator::finishActivityReport (Activity &activity, const char *msg) 
         {
-        //std::cout << "finishA " << _show_progress << _show_timing << std::endl;
                 MessageClass &messageClass = getMessageClass (BRIEF_REPORT);
                 unsigned int i;
@@ -584 +584 @@
         bool MessageClass::isPrinted (unsigned long depth, unsigned long level, const char *fn)
         {
+                return 
+                        checkConfig (_configuration[""], depth, level) 
+                        ||
+                        (       fn != (const char *) 0 
+                                && 
+                                checkConfig (_configuration[fn], depth, level)
+                        );
+                /*
                 if (checkConfig (_configuration[""], depth, level))
-                {       //std::cout << " fn=\"\", d " << depth << ", l " << level << " false" << std::endl;
                         return true;
-                }
                 else if (fn != (const char *) 0)
                         //return checkConfig (_configuration[fn], depth, level);
                         { bool ans = checkConfig (_configuration[fn], depth, level);
                           if (ans) 
-                                {       //std::cout << " fn=" << fn << ", d " << depth << ", l " << level << " true" << std::endl;
+                                {       //std::cerr << " fn=" << fn << ", d " << depth << ", l " << level << " true" << std::endl;
                                         return true;
                                 }
                           else
-                                {       //std::cout << " fn=" << fn << ", d " << depth << ", l " << level << " false" << std::endl;
+                                {       //std::cerr << " fn=" << fn << ", d " << depth << ", l " << level << " false" << std::endl;
                                         return false;
                                 }
@@ -602 +608 @@
 
                 else
-                {       //std::cout << " fn=0, d " << depth << ", l " << level << " false" << std::endl;
+                {       //std::cerr << " fn=0, d " << depth << ", l " << level << " false" << std::endl;
                         return false;
                 }
+                */
         }
 
@@ -630 +637 @@
                 std::list <std::pair <unsigned long, unsigned long> >::iterator i;
 
-                i = config.begin ();
-                while (i != config.end ()) {
+                for ( i = config.begin (); i != config.end (); ++i) {
                         if (depth < i->first) {
-                                if (level <= i->second)
-                                        return true;
-                                else
-                                        return false;
-                        }
-
-                        i++;
+                                //// uninitialized value error goes away if we ignore level.
+                                //if (level <= i->second)
+                                //      return true;
+                                //else
+                                //      return false;
+                                return true;
+                        }
                 }
 

trunk/linbox/linbox/util/commentator.h

@@ -83 +83 @@
         class MessageClass;
         class Commentator;
-
-        // Utility object needed for associative containers
-        struct LessThanString
-        {
-                bool operator () (const char *str1, const char *str2) const 
-                        { return strcmp (str1, str2) < 0; }
-        };
 
         // \class ActivityState commentator.h linbox/util/commentator.h
@@ -528 +521 @@
                 /** Use this stream to disable a message class entirely
                  */
-                std::ostream cnull;
+                std::ofstream cnull;
 
             private:
+                /*
                 // Null std::ostream prints nothing
                 struct nullstreambuf : public std::streambuf {
@@ -541 +535 @@
                         void imbue(const std::locale &loc) {}
                 };
+                */
 
             protected:
@@ -567 +562 @@
                 std::stack<Activity *>           _activities;      // Stack of activity structures
 
-                std::map<const char *, MessageClass *, LessThanString>
+                std::map<const char *, MessageClass *>
                                                  _messageClasses;
                 EstimationMethod                 _estimationMethod;     // Activity estimator
@@ -668 +663 @@
 
             private:
-                typedef std::map <const char *, std::list<std::pair <unsigned long, unsigned long> >, LessThanString> Configuration;
+                typedef std::map <const char *, std::list<std::pair <unsigned long, unsigned long> > > Configuration;
 
                 class smartStreambuf : public std::streambuf 
@@ -743 +738 @@
         class Commentator {
             public: 
-                inline Commentator () : cnull (new nullstreambuf) {}
+                //inline Commentator () : cnull (new nullstreambuf) {}
+                inline Commentator () : cnull ("/dev/null") {}
                 inline  ~Commentator () {}
                 inline void start (const char *description, const char *fn = (const char *) 0, unsigned long len = 0) {}
@@ -800 +796 @@
                 inline bool printed (long msglevel, const char *msgclass) { return false; }
 
-                std::ostream cnull;
+                std::ofstream cnull;
 
             private:
+                /*
                 // Null std::ostream prints nothing
                 struct nullstreambuf : public std::streambuf {
@@ -813 +810 @@
                         inline void imbue (const std::locale &loc) {}
                 };
+                */
 
                 MessageClass _msgcls;

trunk/linbox/linbox/vector/vector-domain.h

@@ -423 +423 @@
                 //@} Implementation-Specific Methods
     
+                template <class Vector>
+                Vector& random(Vector& v)
+                {
+                        typename Field::RandIter r(field());
+
+                        typedef typename Vector::iterator iterator;
+                        for (iterator p = v.begin(); p != v.end(); ++p) r.random(*p);
+                        return v;
+                }
+
         protected:
 

trunk/linbox/tests/test-minpoly.C

@@ -363 +363 @@
 
         static size_t n = 10;
-        static integer q = 2147483647U;
+        //static integer q = 2147483647U;
+        static integer q = 1000003; // ok for both Modular<int> and Modular<double>
         static int iterations = 1;
         static int numVectors = 1;
@@ -386 +387 @@
         if (q > 5 && q % 2 != 0 && q % 3 != 0 && q % 5 != 0 )
         {
-        typedef Modular<LinBox::uint32> Field;
-//      typedef Modular<double> Field;
+        //typedef Modular<LinBox::uint32> Field;
+        //typedef Modular<int> Field;
+        typedef Modular<double> Field;
         Field F (q);
         srand (time (NULL));