Changeset 543ce4 for molecuilder/src/helpers.hpp

Timestamp:

Nov 4, 2009, 7:56:04 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

4ef101, aa8542

Parents:

ec70ec

Message:

Huge change from ofstream * (const) out --> Log().

• first shift was done via regular expressions
• then via error messages from the code
• note that class atom, class element and class molecule kept in parts their output stream, was they print to file.
• make check runs fine
• MISSING: Verbosity is not fixed for everything (i.e. if no endl; is present and next has Verbose(0) ...)

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/helpers.hpp (modified) (7 diffs)

molecuilder/src/helpers.hpp

@@ -19 +19 @@
 
 #include "defs.hpp"
+#include "log.hpp"
 #include "memoryallocator.hpp"
 
@@ -76 +77 @@
 
 /** Creates a lookup table for true father's Atom::Nr -> atom ptr.
- * \param *out output stream for debugging
  * \param *start begin of chain list
  * \paran *end end of chain list
@@ -83 +83 @@
  * \return true - success, false - failure
  */
-template <typename T> bool CreateFatherLookupTable(ofstream *out, T *start, T *end, T **&LookupTable, int count = 0)
+template <typename T> bool CreateFatherLookupTable(T *start, T *end, T **&LookupTable, int count = 0)
 {
   bool status = true;
@@ -90 +90 @@
 
   if (LookupTable != NULL) {
-    *out << "Pointer for Lookup table is not NULL! Aborting ..." <<endl;
+    Log() << Verbose(0) << "Pointer for Lookup table is not NULL! Aborting ..." <<endl;
     return false;
   }
@@ -103 +103 @@
   }
   if (count <= 0) {
-    *out << "Count of lookup list is 0 or less." << endl;
+    Log() << Verbose(0) << "Count of lookup list is 0 or less." << endl;
     return false;
   }
@@ -110 +110 @@
   LookupTable = Calloc<T*>(count, "CreateFatherLookupTable - **LookupTable");
   if (LookupTable == NULL) {
-    cerr << "LookupTable memory allocation failed!" << endl;
+    eLog() << Verbose(0) << "LookupTable memory allocation failed!" << endl;
     status = false;
   } else {
@@ -121 +121 @@
         LookupTable[AtomNo] = Walker;
       } else {
-        *out << "Walker " << *Walker << " exceeded range of nuclear ids [0, " << count << ")." << endl;
+        Log() << Verbose(0) << "Walker " << *Walker << " exceeded range of nuclear ids [0, " << count << ")." << endl;
         status = false;
         break;