Simplify --help=decision with only currently supported options

Add notice/warning when using incremental-mode + decision (it was
already disabled)

Some other minor cleanup

(this commit was certified error- and warning-free by the test-and-commit script.)

1 files changed, 12 insertions, 2 deletions

diff --git a/src/decision/decision_engine.cpp b/src/decision/decision_engine.cpp
index d5c819ace..22c70eb6d 100644
--- a/src/decision/decision_engine.cpp
+++ b/src/decision/decision_engine.cpp
@@ -50,8 +50,18 @@ void DecisionEngine::init()
   d_engineState = 1;
 
   Trace("decision-init") << "DecisionEngine::init()" << std::endl;
-  if(options::incrementalSolving()) return;
-
+  if(options::incrementalSolving()) {
+    if(options::decisionMode() != decision::DECISION_STRATEGY_INTERNAL) {
+      if(options::decisionMode.wasSetByUser()) {
+        Warning() << "Ignorning decision option since using incremental mode (currently not supported together)"
+                  << std::endl;
+      } else {
+        Notice() << "Using internal decision heuristic since using incremental mode (not supported currently)"
+                 << std::endl;
+      }
+    }
+    return;
+  }
   Trace("decision-init") << " * options->decisionMode: " 
                          << options::decisionMode() << std:: endl;
   Trace("decision-init") << " * options->decisionStopOnly: "