Changeset 00ea61 for src

Timestamp:

May 18, 2016, 10:03:09 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

706d48

Parents:

ed8a68

git-author:

Frederik Heber <heber@…> (03/10/16 14:11:01)

git-committer:

Frederik Heber <heber@…> (05/18/16 22:03:09)

Message:

ExportGraph::operator() now returns bool.

• FragmentationAction heeds this status and action may fail.

Location:

src

Files:

• Actions/FragmentationAction/FragmentationAction.cpp (modified) (1 diff)
• Fragmentation/Exporters/ExportGraph.hpp (modified) (1 diff)
• Fragmentation/Exporters/ExportGraph_ToAtomFragments.cpp (modified) (2 diffs)
• Fragmentation/Exporters/ExportGraph_ToAtomFragments.hpp (modified) (1 diff)
• Fragmentation/Exporters/ExportGraph_ToFiles.cpp (modified) (3 diffs)
• Fragmentation/Exporters/ExportGraph_ToFiles.hpp (modified) (1 diff)
• Fragmentation/Exporters/ExportGraph_ToJobs.cpp (modified) (2 diffs)
• Fragmentation/Exporters/ExportGraph_ToJobs.hpp (modified) (1 diff)

src/Actions/FragmentationAction/FragmentationAction.cpp

@@ -405 +405 @@
       exporter.setPrefix(params.prefix.get());
       exporter.setOutputTypes(params.types.get());
-      exporter();
+      if (!exporter())
+        return Action::failure;
     } else {
       // store molecule's fragment in FragmentJobQueue
       ExportGraph_ToJobs exporter(TotalGraph, treatment, saturation, globalsaturationpositions);
       exporter.setLevel(params.level.get());
-      exporter();
+      if (!exporter())
+        return Action::failure;
     }
     ExportGraph_ToAtomFragments exporter(TotalGraph, treatment, saturation, globalsaturationpositions);
-    exporter();
+    if (!exporter())
+      return Action::failure;
   }
   if (!AtomFragmentsMap::getInstance().checkCompleteness()) {

src/Fragmentation/Exporters/ExportGraph.hpp

@@ -48 +48 @@
   typedef boost::shared_ptr<SaturatedFragment> SaturatedFragment_ptr;
 
-  virtual void operator()()=0;
+  virtual bool operator()()=0;
 
   /** Returns a saturated fragment for immediate use only.

src/Fragmentation/Exporters/ExportGraph_ToAtomFragments.cpp

@@ -57 +57 @@
 {}
 
-void ExportGraph_ToAtomFragments::operator()()
+bool ExportGraph_ToAtomFragments::operator()()
 {
   AtomFragmentsMap &atomfragments = AtomFragmentsMap::getInstance();
@@ -92 +92 @@
   if (CurrentFragment == NULL) {
     ELOG(1, "Some error while obtaining the next fragment occured.");
-    return;
+    return false;
   }
+  return true;
 }

src/Fragmentation/Exporters/ExportGraph_ToAtomFragments.hpp

@@ -42 +42 @@
   virtual ~ExportGraph_ToAtomFragments();
 
-        void operator()();
+        bool operator()();
 };
 

src/Fragmentation/Exporters/ExportGraph_ToFiles.cpp

@@ -103 +103 @@
 /** Actual implementation of the export to files function.
  */
-void ExportGraph_ToFiles::operator()()
+bool ExportGraph_ToFiles::operator()()
 {
   LOG(1, "INFO: Writing " << TotalGraph.size() << " possible bond fragmentation configs.");
@@ -136 +136 @@
   if (CurrentFragment == NULL) {
     ELOG(1, "Some error while obtaining the next fragment occured.");
-    return;
+    return false;
   }
   ForcesFile.close();
@@ -150 +150 @@
   // restore orbital and Stop values
   //CalculateOrbitals(*configuration);
+  return true;
 }
 

src/Fragmentation/Exporters/ExportGraph_ToFiles.hpp

@@ -37 +37 @@
         virtual ~ExportGraph_ToFiles();
 
-        void operator()();
+        bool operator()();
 
         void setPrefix(const std::string &_prefix) {

src/Fragmentation/Exporters/ExportGraph_ToJobs.cpp

@@ -68 +68 @@
 {}
 
-void ExportGraph_ToJobs::operator()()
+bool ExportGraph_ToJobs::operator()()
 {
   std::vector<FragmentJob::ptr> jobs;
@@ -131 +131 @@
   if (CurrentFragment == NULL) {
     ELOG(1, "Some error while obtaining the next fragment occured.");
-    return;
+    return false;
   }
 
   // push final jobs
   FragmentJobQueue::getInstance().addJobs(jobs, KeySets, FullKeySets);
+
+  return true;
 }

src/Fragmentation/Exporters/ExportGraph_ToJobs.hpp

@@ -44 +44 @@
   virtual ~ExportGraph_ToJobs();
 
-        void operator()();
+        bool operator()();
 
   /** Sets the level for the sampling of the density.