refs #5744. fix naming issue

mantidproject · Aug 13, 2012 · 5dcb674 · 5dcb674
1 parent 6a1906b
commit 5dcb674
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 44 deletions.
diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt
@@ -74,7 +74,7 @@ set ( SRC_FILES
 	src/MultiDomainFunction.cpp
 	src/MultipleExperimentInfos.cpp
 	src/MultipleFileProperty.cpp
-	src/MutliPeriodGroupAlgorithm.cpp
+	src/MultiPeriodGroupAlgorithm.cpp
 	src/NullCoordTransform.cpp
 	src/NumericAxis.cpp
 	src/ParamFunction.cpp
@@ -206,7 +206,7 @@ set ( INC_FILES
 	inc/MantidAPI/MultiDomainFunction.h
 	inc/MantidAPI/MultipleExperimentInfos.h
 	inc/MantidAPI/MultipleFileProperty.h
-	inc/MantidAPI/MutliPeriodGroupAlgorithm.h
+	inc/MantidAPI/MultiPeriodGroupAlgorithm.h
 	inc/MantidAPI/NullCoordTransform.h
 	inc/MantidAPI/NumericAxis.h
 	inc/MantidAPI/ParamFunction.h
@@ -283,7 +283,7 @@ set ( TEST_FILES
 	test/MultiDomainFunctionTest.h
 	test/MultipleExperimentInfosTest.h
 	test/MultipleFilePropertyTest.h
-	test/MutliPeriodGroupAlgorithmTest.h
+	test/MultiPeriodGroupAlgorithmTest.h
 	test/NumericAxisTest.h
 	test/ParamFunctionAttributeHolderTest.h
 	test/ParameterReferenceTest.h

diff --git a/...inc/MantidAPI/MutliPeriodGroupAlgorithm.h → ...inc/MantidAPI/MultiPeriodGroupAlgorithm.h b/...inc/MantidAPI/MutliPeriodGroupAlgorithm.h → ...inc/MantidAPI/MultiPeriodGroupAlgorithm.h
@@ -32,11 +32,11 @@ namespace API
     File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
     */
-  class DLLExport MutliPeriodGroupAlgorithm : public Algorithm
+  class DLLExport MultiPeriodGroupAlgorithm : public Algorithm
   {
   public:
-    MutliPeriodGroupAlgorithm();
-    virtual ~MutliPeriodGroupAlgorithm();
+    MultiPeriodGroupAlgorithm();
+    virtual ~MultiPeriodGroupAlgorithm();
 
   private:
     /// Overriden from Algorithm base

diff --git a/...ork/API/src/MutliPeriodGroupAlgorithm.cpp → ...ork/API/src/MultiPeriodGroupAlgorithm.cpp b/...ork/API/src/MutliPeriodGroupAlgorithm.cpp → ...ork/API/src/MultiPeriodGroupAlgorithm.cpp
@@ -1,4 +1,4 @@
-#include "MantidAPI/MutliPeriodGroupAlgorithm.h"
+#include "MantidAPI/MultiPeriodGroupAlgorithm.h"
 #include "MantidAPI/AlgorithmManager.h"
 
 using namespace Mantid::Kernel;
@@ -10,22 +10,22 @@ namespace API
   //----------------------------------------------------------------------------------------------
   /** Constructor
    */
-  MutliPeriodGroupAlgorithm::MutliPeriodGroupAlgorithm() : m_useDefaultGroupingBehaviour(true) 
+  MultiPeriodGroupAlgorithm::MultiPeriodGroupAlgorithm() : m_useDefaultGroupingBehaviour(true) 
   {
   }
 
   //----------------------------------------------------------------------------------------------
   /** Destructor
    */
-  MutliPeriodGroupAlgorithm::~MutliPeriodGroupAlgorithm()
+  MultiPeriodGroupAlgorithm::~MultiPeriodGroupAlgorithm()
   {
   }
 
   /**
 Validate the multiperiods workspace groups. Gives the opportunity to exit processing if things don't look right.
 @input nInputWorkspaces: Number of input workspaces.
 */
-void MutliPeriodGroupAlgorithm::validateMultiPeriodGroupInputs(const size_t& nInputWorkspaces) const
+void MultiPeriodGroupAlgorithm::validateMultiPeriodGroupInputs(const size_t& nInputWorkspaces) const
 {
   const size_t multiPeriodGroupsSize = m_multiPeriodGroups.size();
   if(multiPeriodGroupsSize != 0 && multiPeriodGroupsSize != nInputWorkspaces)
@@ -75,7 +75,7 @@ void MutliPeriodGroupAlgorithm::validateMultiPeriodGroupInputs(const size_t& nIn
 *
 * This method (or an override) must NOT THROW any exception if there are no input workspace groups
 */
-bool MutliPeriodGroupAlgorithm::checkGroups()
+bool MultiPeriodGroupAlgorithm::checkGroups()
 {
   typedef std::vector<std::string> WorkspaceNameType;
 
@@ -132,7 +132,7 @@ merging must be A_1 + B_1 = C_1 and A_2 + B_2 = C_2. This method constructs the
 @param periodIndex : zero based index denoting the period.
 @return comma separated string of input workspaces.
 */
-std::string MutliPeriodGroupAlgorithm::createFormattedInputWorkspaceNames(const size_t& periodIndex) const
+std::string MultiPeriodGroupAlgorithm::createFormattedInputWorkspaceNames(const size_t& periodIndex) const
 {
   std::string prefix = "";
   std::string inputWorkspaces = "";
@@ -158,7 +158,7 @@ std::string MutliPeriodGroupAlgorithm::createFormattedInputWorkspaceNames(const
 *
 * @return true - if all the workspace members are executed.
 */
-bool MutliPeriodGroupAlgorithm::processGroups()
+bool MultiPeriodGroupAlgorithm::processGroups()
 {
   // If we are not processing multiperiod groups, use the base behaviour.
   if(m_useDefaultGroupingBehaviour)

diff --git a/Code/Mantid/Framework/API/test/MultiPeriodGroupAlgorithmTest.h b/Code/Mantid/Framework/API/test/MultiPeriodGroupAlgorithmTest.h
@@ -0,0 +1,28 @@
+#ifndef MANTID_API_MultiPeriodGroupAlgorithmTEST_H_
+#define MANTID_API_MultiPeriodGroupAlgorithmTEST_H_
+
+#include <cxxtest/TestSuite.h>
+
+#include "MantidAPI/MultiPeriodGroupAlgorithm.h"
+
+using Mantid::API::MultiPeriodGroupAlgorithm;
+
+class MultiPeriodGroupAlgorithmTest : public CxxTest::TestSuite
+{
+public:
+  // This pair of boilerplate methods prevent the suite being created statically
+  // This means the constructor isn't called when running other tests
+  static MultiPeriodGroupAlgorithmTest *createSuite() { return new MultiPeriodGroupAlgorithmTest(); }
+  static void destroySuite( MultiPeriodGroupAlgorithmTest *suite ) { delete suite; }
+
+
+  void test_Something()
+  {
+    TSM_ASSERT( "You forgot to write a test!", 0);
+  }
+
+
+};
+
+
+#endif /* MANTID_API_MultiPeriodGroupAlgorithmTEST_H_ */
diff --git a/Code/Mantid/Framework/API/test/MutliPeriodGroupAlgorithmTest.h b/Code/Mantid/Framework/API/test/MutliPeriodGroupAlgorithmTest.h
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/MergeRuns.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/MergeRuns.h
@@ -7,7 +7,7 @@
 #include <list>
 #include <vector>
 #include <boost/shared_ptr.hpp>
-#include "MantidAPI/MutliPeriodGroupAlgorithm.h"
+#include "MantidAPI/MultiPeriodGroupAlgorithm.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/System.h"
 
@@ -57,7 +57,7 @@ namespace Algorithms
     File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class DLLExport MergeRuns : public API::MutliPeriodGroupAlgorithm
+class DLLExport MergeRuns : public API::MultiPeriodGroupAlgorithm
 {
 public:
   MergeRuns();

diff --git a/Code/Mantid/Framework/Algorithms/src/MergeRuns.cpp b/Code/Mantid/Framework/Algorithms/src/MergeRuns.cpp
@@ -61,7 +61,7 @@ using namespace API;
 using namespace DataObjects;
 
 /// Default constructor
-MergeRuns::MergeRuns() : MutliPeriodGroupAlgorithm(),m_progress(NULL){}
+MergeRuns::MergeRuns() : MultiPeriodGroupAlgorithm(),m_progress(NULL){}
 
 /// Destructor
 MergeRuns::~MergeRuns()