Fixed a bug and started implementing unit test. Refs #8109.

mantidproject · Oct 14, 2013 · 515a122 · 515a122
1 parent bc66762
commit 515a122
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/CurveFitting/src/FullprofPolynomial.cpp b/Code/Mantid/Framework/CurveFitting/src/FullprofPolynomial.cpp
@@ -15,7 +15,7 @@ namespace CurveFitting
   FullprofPolynomial::FullprofPolynomial():m_n(6), m_bkpos(1.)
   {
     // Declare first 6th order polynomial as default
-    for(int i=0; i<=m_n; ++i)
+    for(int i=0; i<m_n; ++i)
     {
       std::string parName = "A" + boost::lexical_cast<std::string>(i);
       declareParameter(parName);
@@ -151,7 +151,7 @@ namespace CurveFitting
         clearAllParameters();
 
         m_n = attint;
-        for(int i=0; i<=m_n; ++i)
+        for(int i=0; i<m_n; ++i)
         {
           std::string parName = "A" + boost::lexical_cast<std::string>(i);
           declareParameter(parName);

diff --git a/Code/Mantid/Framework/CurveFitting/test/FullprofPolynomialTest.h b/Code/Mantid/Framework/CurveFitting/test/FullprofPolynomialTest.h
@@ -4,9 +4,20 @@
 #include <cxxtest/TestSuite.h>
 
 #include "MantidCurveFitting/FullprofPolynomial.h"
+#include "MantidAPI/IFunction.h"
+#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidCurveFitting/Fit.h"
+#include "MantidDataObjects/Workspace2D.h"
+
 
 using Mantid::CurveFitting::FullprofPolynomial;
 
+using namespace Mantid;
+using namespace Mantid::API;
+using namespace Mantid::CurveFitting;
+using namespace Mantid::DataObjects;
+using namespace Mantid::Kernel;
+
 class FullprofPolynomialTest : public CxxTest::TestSuite
 {
 public:
@@ -16,13 +27,76 @@ class FullprofPolynomialTest : public CxxTest::TestSuite
   static void destroySuite( FullprofPolynomialTest *suite ) { delete suite; }
 
 
-  void test_Something()
+  void testForCategories()
+  {
+    FullprofPolynomial forCat;
+    const std::vector<std::string> categories = forCat.categories();
+    TS_ASSERT( categories.size() == 1 );
+    TS_ASSERT( categories[0] == "Background" );
+  }
+
+  void test_FPPolynomial()
   {
-    TSM_ASSERT( "You forgot to write a test!", 0);
+    // create mock data to test against
+    std::string wsName = "QuadraticBackgroundTest";
+    int histogramNumber = 1;
+    int timechannels = 5;
+    DataObjects::Workspace2D_sptr ws2D =
+        boost::dynamic_pointer_cast<DataObjects::Workspace2D>(
+            API::WorkspaceFactory::Instance().create("Workspace2D", histogramNumber, timechannels, timechannels));
+    for (int i = 0; i < timechannels; i++)
+    {
+      ws2D->dataX(0)[i] = i + 1;
+      ws2D->dataY(0)[i] = (i + 1)*(i + 1) + 2*(i+1) + 3.0;
+      ws2D->dataE(0)[i] = 1.0;
+    }
+
+    //put this workspace in the data service
+    TS_ASSERT_THROWS_NOTHING(AnalysisDataService::Instance().add(wsName, ws2D));
+
+    CurveFitting::Fit alg2;
+    TS_ASSERT_THROWS_NOTHING(alg2.initialize());
+    TS_ASSERT( alg2.isInitialized() );
+
+    // set up fitting function
+    IFunction_sptr quadB(new FullprofPolynomial());
+    quadB->setAttributeValue("n", 2);
+    quadB->initialize();
+
+    quadB->setParameter("A0", 0.0);
+    quadB->setParameter("A1", 1.0);
+
+    //alg2.setFunction(linB);
+    alg2.setProperty("Function", quadB);
+
+    // Set which spectrum to fit against and initial starting values
+    alg2.setPropertyValue("InputWorkspace", wsName);
+    alg2.setPropertyValue("WorkspaceIndex", "0");
+
+    // execute fit
+    TS_ASSERT_THROWS_NOTHING(TS_ASSERT( alg2.execute() ))
+
+    TS_ASSERT( alg2.isExecuted() );
+
+    // test the output from fit is what you expect
+    double dummy = alg2.getProperty("OutputChi2overDoF");
+
+    TS_ASSERT_DELTA( dummy, 0.0,0.1);
+    IFunction_sptr out = alg2.getProperty("Function");
+    TS_ASSERT_DELTA( out->getParameter("A0"), 3.0, 0.01);
+    TS_ASSERT_DELTA( out->getParameter("A1"), 2.0, 0.0003);
+    TS_ASSERT_DELTA( out->getParameter("A2"), 1.0, 0.01);
+
+    // check its categories
+    const std::vector<std::string> categories = out->categories();
+    TS_ASSERT( categories.size() == 1 );
+    TS_ASSERT( categories[0] == "Background" );
+
+    return;
   }
 
 
 };
 
 
-#endif /* MANTID_CURVEFITTING_FULLPROFPOLYNOMIALTEST_H_ */
+#endif /* MANTID_CURVEFITTING_FULLPROFPOLYNOMIALTEST_H_ */