Re #8023. Adding checks for MinValues and Maxvalues.

mantidproject · Oct 10, 2013 · 907bdd4 · 907bdd4
1 parent 4a324a2
commit 907bdd4
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
@@ -64,6 +64,7 @@ namespace MDAlgorithms
 
   private:
     void init();
+    std::map<std::string, std::string> validateInputs();
     void exec();
    /// Sets documentation strings for this algorithm
     virtual void initDocs();  

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
@@ -368,6 +368,48 @@ ConvertToMD::init()
 
 }
 
+std::map<std::string, std::string> ConvertToMD::validateInputs()
+{
+  std::map<std::string, std::string> result;
+
+  std::vector<double> minVals = this->getProperty("MinValues");
+  std::vector<double> maxVals = this->getProperty("MaxValues");
+
+  if (minVals.size() != maxVals.size())
+  {
+    std::stringstream msg;
+    msg << "Rank of MinValues != MaxValues (" << minVals.size() << "!=" << maxVals.size() << ")";
+    result["MinValues"] = msg.str();
+    result["MaxValues"] = msg.str();
+  }
+  else
+  {
+    std::stringstream msg;
+
+    size_t rank = minVals.size();
+    for (size_t i = 0; i < rank; ++i)
+    {
+      if (minVals[i] >= maxVals[i])
+      {
+        if (msg.str().empty())
+          msg << "max not bigger than min ";
+        else
+          msg << ", ";
+        msg << "at index=" << (i+1) << " ("
+            << minVals[i] << ">=" << maxVals[i] << ")";
+      }
+    }
+
+    if (!msg.str().empty())
+    {
+      result["MinValues"] = msg.str();
+      result["MaxValues"] = msg.str();
+    }
+  }
+
+  return result;
+}
+
  //----------------------------------------------------------------------------------------------
 /* Execute the algorithm.   */
 void ConvertToMD::exec()