Merge remote-tracking branch 'origin/feature/8023_converttomd_validat…

…einputs'
mantidproject · Oct 11, 2013 · dfe7bc3 · dfe7bc3
2 parents 4a4c3b8 + af06ec6
commit dfe7bc3
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
@@ -55,15 +55,16 @@ namespace MDAlgorithms
     ~ConvertToMD();
 
     /// Algorithm's name for identification 
-    virtual const std::string name() const { return "ConvertToMD";};
+    virtual const std::string name() const;
     /// Algorithm's version for identification 
-    virtual int version() const { return 1;};
+    virtual int version() const;
     /// Algorithm's category for identification
-    virtual const std::string category() const { return "MDAlgorithms";}  
+    virtual const std::string category() const;
 
 
   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
@@ -209,6 +209,22 @@ inline bool isNaN(T val)
   volatile T buf=val;
   return (val!=buf);
 }
+
+const std::string ConvertToMD::name() const
+{
+  return "ConvertToMD";
+}
+
+int ConvertToMD::version() const
+{
+  return 1;
+}
+
+const std::string ConvertToMD::category() const
+{
+  return "MDAlgorithms";
+}
+
 //----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
  */
@@ -352,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()

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/ConvertToQ3DdETest.h b/Code/Mantid/Framework/MDAlgorithms/test/ConvertToQ3DdETest.h
@@ -86,8 +86,7 @@ void testExecFailsOnNewWorkspaceNoMaxLimits(){
     TS_ASSERT_THROWS_NOTHING(pAlg->setPropertyValue("OutputWorkspace", "EnergyTransfer4DWS"));
     TS_ASSERT_THROWS_NOTHING(pAlg->setPropertyValue("MinValues", "-50.,-50.,-50,-2"));
 
-    pAlg->execute();
-    TSM_ASSERT("Should fail as no max limits were specified ",!pAlg->isExecuted());
+    TSM_ASSERT_THROWS("Should fail as no max limits were specified ",pAlg->execute(), std::runtime_error);
 
 }
 void testExecFailsLimits_MinGeMax(){
@@ -106,8 +105,7 @@ void testExecFailsLimits_MinGeMax(){
     TS_ASSERT_THROWS_NOTHING(pAlg->setPropertyValue("MinValues", "-50.,-50.,-50,-2"));
     TS_ASSERT_THROWS_NOTHING(pAlg->setPropertyValue("MaxValues", " 50., 50.,-50,-2"));
 
-    pAlg->execute();
-    TSM_ASSERT("Should fail as wrong max limits were specified ",!pAlg->isExecuted());
+    TSM_ASSERT_THROWS("Should fail as wrong max limits were specified ",pAlg->execute(), std::runtime_error);
 
 }
 void testExecFine(){