Merge pull request #19 from SoftVarE-Group/dpll-run-return

Export run results from functions

Author: uulm-janbaudisch

src/methods/Counter.hpp

@@ -23,6 +23,7 @@
 #include "DpllStyleMethod.hpp"
 #include "nnf/Node.hpp"
 #include "src/exceptions/BadBehaviourException.hpp"
+#include "src/preprocs/PreprocManager.hpp"
 #include "src/problem/ProblemTypes.hpp"
 
 namespace d4 {

src/methods/DpllStyleMethod.hpp

@@ -522,8 +522,6 @@ class DpllStyleMethod : public MethodManager, public Counter<T> {
 
   /**
      Run the DPLL style algorithm with the operation manager.
-
-     @param[in] config, the configuration.
    */
   void run(Config &config) {
     std::vector<Var> setOfVar;
@@ -533,5 +531,15 @@ class DpllStyleMethod : public MethodManager, public Counter<T> {
     printFinalStats(m_out);
     m_operation->manageResult(result, config, m_out);
   }  // run
+
+  /**
+     Run the DPLL style algorithm and return the result.
+   */
+  U run_and_return() {
+    std::vector<Var> setOfVar;
+    for (int i = 1; i <= m_specs->getNbVariable(); i++) setOfVar.push_back(i);
+
+    return compute(setOfVar, m_out);
+  }  // run
 };
 }  // namespace d4

src/methods/ProjMCMethod.hpp

@@ -672,5 +672,12 @@ class ProjMCMethod : public MethodManager {
     printFinalStats(m_out);
     std::cout << "s " << res << "\n";
   }  // run
+
+  /**
+     Run the DPLL style algorithm and return the result.
+   */
+  T run_and_return() {
+    return compute(m_out);
+  }  // run
 };
 }  // namespace d4