Changeset d34341 for molecuilder/src/bondgraph.cpp

Timestamp:

Jan 27, 2010, 2:36:09 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

dbd19f

Parents:

41182a (diff), 478683 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'heber/Analysis_PairCorrelation' into MenuRefactoring

Conflicts:

molecuilder/src/unittests/Makefile.am

File:

• molecuilder/src/bondgraph.cpp (modified) (3 diffs)

molecuilder/src/bondgraph.cpp

@@ -11 +11 @@
 #include "bondgraph.hpp"
 #include "element.hpp"
+#include "info.hpp"
 #include "log.hpp"
 #include "molecule.hpp"
@@ -42 +43 @@
 bool BondGraph::LoadBondLengthTable(const string &filename)
 {
+  Info FunctionInfo(__func__);
   bool status = true;
   MatrixContainer *TempContainer = NULL;
@@ -53 +55 @@
 
   // parse in matrix
-  status = TempContainer->ParseMatrix(filename.c_str(), 0, 1, 0);
+  if (status = TempContainer->ParseMatrix(filename.c_str(), 0, 1, 0)) {
+    Log() << Verbose(1) << "Parsing bond length matrix successful." << endl;
+  } else {
+    eLog() << Verbose(1) << "Parsing bond length matrix failed." << endl;
+  }
 
   // find greatest distance