Changeset 7d1ad9

Timestamp:

Nov 23, 2009, 7:09:42 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

7df43b, cc9225

Parents:

3d4969

Message:

bugfix to errorLogger and some error verbosity changes.

• BUGFIX: errorLogger::operator << would first give the message, then the prefix and most of them to cout instead of cerr
• GetCenterofCircumcircle() did break if sum of angles was > 180 which is unnecessary.
• config::Load() - bond length table loading is now an error

Location:

molecuilder/src

Files:

• config.cpp (modified) (1 diff)
• errorlogger.cpp (modified) (2 diffs)
• tesselationhelpers.cpp (modified) (1 diff)

molecuilder/src/config.cpp

@@ -1060 +1060 @@
     Log() << Verbose(0) << "Bond length table loaded successfully." << endl;
   } else {
-    Log() << Verbose(0) << "Bond length table loading failed." << endl;
+    eLog() << Verbose(1) << "Bond length table loading failed." << endl;
   }
 

molecuilder/src/errorlogger.cpp

@@ -82 +82 @@
   l.nix->clear();
   if (v.DoOutput(verbosityLevel)) {
-    v.print(cout);
     switch(v.Verbosity) {
       case 0:
-        cout << "CRITICAL: ";
+        cerr << "CRITICAL: ";
         break;
       case 1:
-        cout << "ERROR: ";
+        cerr << "ERROR: ";
         break;
       case 2:
-        cout << "WARNING: ";
+        cerr << "WARNING: ";
         break;
       default:
         break;
     }
+    v.print(cerr);
     return cerr;
   } else
@@ -105 +105 @@
   l->nix->clear();
   if (v.DoOutput(verbosityLevel)) {
-    v.print(cout);
     switch(v.Verbosity) {
       case 0:
-        cout << "CRITICAL: ";
+        cerr << "CRITICAL: ";
         break;
       case 1:
-        cout << "ERROR: ";
+        cerr << "ERROR: ";
         break;
       case 2:
-        cout << "WARNING: ";
+        cerr << "WARNING: ";
         break;
       default:
         break;
     }
+    v.print(cerr);
     return cerr;
   } else

molecuilder/src/tesselationhelpers.cpp

@@ -188 +188 @@
   //Log() << Verbose(3) << "INFO: alpha = " << alpha/M_PI*180. << ", beta = " << beta/M_PI*180. << ", gamma = " << gamma/M_PI*180. << "." << endl;
   if (fabs(M_PI - alpha - beta - gamma) > HULLEPSILON) {
-    eLog() << Verbose(0) << "GetCenterofCircumcircle: Sum of angles " << (alpha+beta+gamma)/M_PI*180. << " > 180 degrees by " << fabs(M_PI - alpha - beta - gamma)/M_PI*180. << "!" << endl;
-    performCriticalExit();
+    eLog() << Verbose(1) << "GetCenterofCircumcircle: Sum of angles " << (alpha+beta+gamma)/M_PI*180. << " > 180 degrees by " << fabs(M_PI - alpha - beta - gamma)/M_PI*180. << "!" << endl;
   }