Changeset 543ce4 for molecuilder/src/graph.cpp

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/graph.cpp (modified) (6 diffs)

molecuilder/src/graph.cpp

@@ -11 +11 @@
 #include "config.hpp"
 #include "graph.hpp"
+#include "log.hpp"
 #include "molecule.hpp"
 
@@ -78 +79 @@
  * \param factor energy factor for the fragment
  */
-void InsertFragmentIntoGraph(ofstream *out, struct UniqueFragments *Fragment)
+void InsertFragmentIntoGraph(struct UniqueFragments *Fragment)
 {
   GraphTestPair testGraphInsert;
@@ -84 +85 @@
   testGraphInsert = Fragment->Leaflet->insert(GraphPair (*Fragment->FragmentSet,pair<int,double>(Fragment->FragmentCounter,Fragment->TEFactor)));  // store fragment number and current factor
   if (testGraphInsert.second) {
-    *out << Verbose(2) << "KeySet " << Fragment->FragmentCounter << " successfully inserted." << endl;
+    Log() << Verbose(2) << "KeySet " << Fragment->FragmentCounter << " successfully inserted." << endl;
     Fragment->FragmentCounter++;
   } else {
-    *out << Verbose(2) << "KeySet " << Fragment->FragmentCounter << " failed to insert, present fragment is " << ((*(testGraphInsert.first)).second).first << endl;
+    Log() << Verbose(2) << "KeySet " << Fragment->FragmentCounter << " failed to insert, present fragment is " << ((*(testGraphInsert.first)).second).first << endl;
     ((*(testGraphInsert.first)).second).second += Fragment->TEFactor;  // increase the "created" counter
-    *out << Verbose(2) << "New factor is " << ((*(testGraphInsert.first)).second).second << "." << endl;
+    Log() << Verbose(2) << "New factor is " << ((*(testGraphInsert.first)).second).second << "." << endl;
   }
 };
-//void inline InsertIntoGraph(ofstream *out, KeyStack &stack, Graph &graph, int *counter, double factor)
+//void inline InsertIntoGraph(KeyStack &stack, Graph &graph, int *counter, double factor)
 //{
 //  // copy stack contents to set and call overloaded function again
@@ -98 +99 @@
 //  for(KeyStack::iterator runner = stack.begin(); runner != stack.begin(); runner++)
 //    set.insert((*runner));
-//  InsertIntoGraph(out, set, graph, counter, factor);
+//  InsertIntoGraph(set, graph, counter, factor);
 //};
 
@@ -107 +108 @@
  * \param *counter keyset counter that gets increased
  */
-void InsertGraphIntoGraph(ofstream *out, Graph &graph1, Graph &graph2, int *counter)
+void InsertGraphIntoGraph(Graph &graph1, Graph &graph2, int *counter)
 {
   GraphTestPair testGraphInsert;
@@ -114 +115 @@
     testGraphInsert = graph1.insert(GraphPair ((*runner).first,pair<int,double>((*counter)++,((*runner).second).second)));  // store fragment number and current factor
     if (testGraphInsert.second) {
-      *out << Verbose(2) << "KeySet " << (*counter)-1 << " successfully inserted." << endl;
+      Log() << Verbose(2) << "KeySet " << (*counter)-1 << " successfully inserted." << endl;
     } else {
-      *out << Verbose(2) << "KeySet " << (*counter)-1 << " failed to insert, present fragment is " << ((*(testGraphInsert.first)).second).first << endl;
+      Log() << Verbose(2) << "KeySet " << (*counter)-1 << " failed to insert, present fragment is " << ((*(testGraphInsert.first)).second).first << endl;
       ((*(testGraphInsert.first)).second).second += (*runner).second.second;
-      *out << Verbose(2) << "New factor is " << (*(testGraphInsert.first)).second.second << "." << endl;
+      Log() << Verbose(2) << "New factor is " << (*(testGraphInsert.first)).second.second << "." << endl;
     }
   }