Changeset 16f34d for molecuilder/src

Timestamp:

Dec 16, 2009, 4:17:50 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

281324

Parents:

3d4969

git-author:

Frederik Heber <heber@…> (12/16/09 16:13:53)

git-committer:

Frederik Heber <heber@…> (12/16/09 16:17:50)

Message:

Fixing the testsuite.

• Putting performCriticalExit() everywhere blindly, is not actually such a good idea. Sometimes, we try opening files but it its not really bad when it fails. As there are fallbacks:
  • MoleculeListClass::AddHydrogenCorrection() - no problem if FITCONSTANT is missing
  • molecule::PickLocalBackEdges() - no problem if BackEdgeStack is empty, just means we have a Tree graph.
  • builder.cpp: Change text of case 'u' to contain 'invalid' arguments

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

Location:

molecuilder/src

Files:

• builder.cpp (modified) (1 diff)
• molecule_graph.cpp (modified) (1 diff)
• moleculelist.cpp (modified) (1 diff)

molecuilder/src/builder.cpp

@@ -2081 +2081 @@
                 if (volume != -1)
                   ExitFlag = 255;
-                  eLog() << Verbose(0) << "Not enough arguments given for suspension: -u <density>" << endl;
+                  eLog() << Verbose(0) << "Not enough or invalid arguments given for suspension: -u <density>" << endl;
                   performCriticalExit();
               } else {

molecuilder/src/molecule_graph.cpp

@@ -1117 +1117 @@
   bool status = true;
   if (ReferenceStack->IsEmpty()) {
-    eLog() << Verbose(0) << "ReferenceStack is empty!" << endl;
-    performCriticalExit();
+    Log() << Verbose(1) << "ReferenceStack is empty!" << endl;
     return false;
   }

molecuilder/src/moleculelist.cpp

@@ -402 +402 @@
   input.open(line.c_str());
   if (input == NULL) {
-    eLog() << Verbose(0) << endl << "Unable to open " << line << ", is the directory correct?" << endl;
-    performCriticalExit();
+    Log() << Verbose(1) << endl << "Unable to open " << line << ", is the directory correct?" << endl;
     return false;
   }