refs #5388. Move implicitfunctions to geometry

Code/Mantid/Framework/Geometry/CMakeLists.txt

@@ -29,6 +29,7 @@ set ( SRC_FILES
 	src/Instrument/RectangularDetectorPixel.cpp
 	src/Instrument/ReferenceFrame.cpp
 	src/Instrument/XMLlogfile.cpp
+    src/MDGeometry/CompositeImplicitFunction.cpp
 	src/MDGeometry/IMDDimension.cpp
 	src/MDGeometry/IMDDimensionFactory.cpp
 	src/MDGeometry/MDBoxImplicitFunction.cpp
@@ -38,7 +39,8 @@ set ( SRC_FILES
 	src/MDGeometry/MDHistoDimensionBuilder.cpp
 	src/MDGeometry/MDImplicitFunction.cpp
 	src/MDGeometry/MDPlane.cpp
-        src/MDGeometry/MDPlaneImplicitFunction.cpp
+    src/MDGeometry/MDPlaneImplicitFunction.cpp
+	src/MDGeometry/NullImplicitFunction.cpp
 	src/Math/Acomp.cpp
 	src/Math/Algebra.cpp
 	src/Math/BnId.cpp
@@ -133,6 +135,7 @@ set ( INC_FILES
 	inc/MantidGeometry/Instrument/RectangularDetectorPixel.h
 	inc/MantidGeometry/Instrument/ReferenceFrame.h
 	inc/MantidGeometry/Instrument/XMLlogfile.h
+	inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
 	inc/MantidGeometry/MDGeometry/IMDDimension.h
 	inc/MantidGeometry/MDGeometry/IMDDimensionFactory.h
 	inc/MantidGeometry/MDGeometry/MDBoxImplicitFunction.h
@@ -143,9 +146,10 @@ set ( INC_FILES
 	inc/MantidGeometry/MDGeometry/MDHistoDimensionBuilder.h
 	inc/MantidGeometry/MDGeometry/MDImplicitFunction.h
 	inc/MantidGeometry/MDGeometry/MDPlane.h
-        inc/MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h
+    inc/MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h
 	inc/MantidGeometry/MDGeometry/MDTypes.h
 	inc/MantidGeometry/MDGeometry/MDWorkspaceConstants.h
+	inc/MantidGeometry/MDGeometry/NullImplicitFunction.h
 	inc/MantidGeometry/Math/Acomp.h
 	inc/MantidGeometry/Math/Algebra.h
 	inc/MantidGeometry/Math/BnId.h
@@ -192,6 +196,7 @@ set ( TEST_FILES
 	test/CompAssemblyTest.h
 	test/ComponentParserTest.h
 	test/ComponentTest.h
+	test/CompositeImplicitFunctionTest.h
 	test/ConeTest.h
 	test/ConventionalCellTest.h
 	test/ConvexPolygonTest.h
@@ -222,6 +227,7 @@ set ( TEST_FILES
 	test/MathSupportTest.h
 	test/NearestNeighboursFactoryTest.h
 	test/NearestNeighboursTest.h
+	test/NullImplicitFunctionTest.h
 	test/ObjCompAssemblyTest.h
 	test/ObjComponentTest.h
 	test/ObjectTest.h

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompositeImplicitFunction.h → Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h

@@ -11,7 +11,7 @@
 
 namespace Mantid
 {
-namespace MDAlgorithms
+namespace Geometry
 {
 /**
 

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/NullImplicitFunction.h → Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/NullImplicitFunction.h

@@ -11,7 +11,7 @@
 
 namespace Mantid
 {
-    namespace MDAlgorithms
+    namespace Geometry
     {
         /**
         This class represents a Null Implicit function. This type prevents the requirement

Code/Mantid/Framework/MDAlgorithms/src/CompositeImplicitFunction.cpp → Code/Mantid/Framework/Geometry/src/MDGeometry/CompositeImplicitFunction.cpp

@@ -1,4 +1,4 @@
-#include "MantidMDAlgorithms/CompositeImplicitFunction.h"
+#include "MantidGeometry/MDGeometry/CompositeImplicitFunction.h"
 #include <boost/algorithm/string.hpp> 
 #include <boost/format.hpp>
 #include <Poco/DOM/Document.h>
@@ -10,7 +10,7 @@
 
 namespace Mantid
 {
-    namespace MDAlgorithms
+    namespace Geometry
     {
 
         CompositeImplicitFunction::CompositeImplicitFunction()

Code/Mantid/Framework/MDAlgorithms/src/NullImplicitFunction.cpp → Code/Mantid/Framework/Geometry/src/MDGeometry/NullImplicitFunction.cpp

@@ -1,8 +1,8 @@
-#include "MantidMDAlgorithms/NullImplicitFunction.h"
+#include "MantidGeometry/MDGeometry/NullImplicitFunction.h"
 
 namespace Mantid
 {
-namespace MDAlgorithms
+namespace Geometry
 {
 
 NullImplicitFunction::NullImplicitFunction()

Code/Mantid/Framework/MDAlgorithms/test/CompositeImplicitFunctionTest.h → Code/Mantid/Framework/Geometry/test/CompositeImplicitFunctionTest.h

@@ -7,7 +7,9 @@
 #include <cmath>
 #include <typeinfo>
 
-#include "MantidMDAlgorithms/CompositeImplicitFunction.h"
+#include "MantidGeometry/MDGeometry/CompositeImplicitFunction.h"
+
+using namespace Mantid::Geometry;
 
 class CompositeImplicitFunctionTest : public CxxTest::TestSuite
 {
@@ -33,7 +35,6 @@ class CompositeImplicitFunctionTest : public CxxTest::TestSuite
 
   void testFunctionAddition()
   {
-    using namespace Mantid::MDAlgorithms;
     CompositeImplicitFunction composite;
     composite.addFunction(Mantid::Geometry::MDImplicitFunction_sptr(new MockImplicitFunction()));
     composite.addFunction(Mantid::Geometry::MDImplicitFunction_sptr(new MockImplicitFunction()));
@@ -43,7 +44,6 @@ class CompositeImplicitFunctionTest : public CxxTest::TestSuite
 
   void testEvaluateNestedFunctionsViaCoordinates()
   {
-    using namespace Mantid::MDAlgorithms;
     using namespace testing;
 
     CompositeImplicitFunction composite;
@@ -64,8 +64,6 @@ class CompositeImplicitFunctionTest : public CxxTest::TestSuite
 
   void testRecursiveToXML()
   {
-    using namespace Mantid::MDAlgorithms;
-
     MockImplicitFunction* mockFunctionA = new MockImplicitFunction;
     MockImplicitFunction* mockFunctionB = new MockImplicitFunction;
 
@@ -81,7 +79,6 @@ class CompositeImplicitFunctionTest : public CxxTest::TestSuite
 
   void testCannotAddNullDimension()
   {
-    using namespace Mantid::MDAlgorithms;
     CompositeImplicitFunction function;
 
     MockImplicitFunction* nullFunction = NULL;

Code/Mantid/Framework/MDAlgorithms/test/NullImplicitFunctionTest.h → Code/Mantid/Framework/Geometry/test/NullImplicitFunctionTest.h

@@ -4,7 +4,9 @@
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include "MantidMDAlgorithms/NullImplicitFunction.h"
+#include "MantidGeometry/MDGeometry/NullImplicitFunction.h"
+
+using namespace Mantid::Geometry;
 
 class NullImplicitFunctionTest: public CxxTest::TestSuite
 {
@@ -13,23 +15,20 @@ class NullImplicitFunctionTest: public CxxTest::TestSuite
 
 void testGetName()
 {
-  using namespace Mantid::MDAlgorithms;
   NullImplicitFunction function;
 
   TSM_ASSERT_EQUALS("The static and dynamic names do not align", NullImplicitFunction::functionName(), function.getName());
 }
 
 void testEvaluateReturnsTrue()
 {
-  using namespace Mantid::MDAlgorithms;
   NullImplicitFunction function;
   Mantid::coord_t coord[3] = {0, 0, 0};
   TS_ASSERT(function.isPointContained(coord));
 }
 
 void testToXMLEmpty()
 {
-  using namespace Mantid::MDAlgorithms;
   NullImplicitFunction function;
 
   TSM_ASSERT_EQUALS("The xml string should be empty for any instance of this type", std::string() , function.toXMLString());

Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt

@@ -6,16 +6,13 @@ set ( SRC_FILES
 	src/BooleanBinaryOperationMD.cpp
 	src/CobaltSpinWaveDSHO.cpp
 	src/CompareMDWorkspaces.cpp
-	src/CompositeFunctionBuilder.cpp
-	src/CompositeImplicitFunction.cpp
-	src/CompositeImplicitFunctionParser.cpp
 	src/ConvertToDetectorFaceMD.cpp
 	src/ConvertToMDEvents.cpp
 	src/ConvertToMDEventsParams.cpp
 	src/ConvertToMDEventsSubalgFactory.cpp
 	src/IConvertToMDEventsWS.cpp
 	src/ConvToMDPreprocDetectors.cpp	
-        src/DampedHisenbergFMSW.cpp
+  src/DampedHisenbergFMSW.cpp
 	src/DivideMD.cpp
 	src/EqualToMD.cpp
 	src/ExponentialMD.cpp
@@ -32,7 +29,6 @@ set ( SRC_FILES
 	src/MinusMD.cpp
 	src/MultiplyMD.cpp
 	src/NotMD.cpp
-	src/NullImplicitFunction.cpp
 	src/OrMD.cpp
 	src/PlusMD.cpp
 	src/PowerMD.cpp
@@ -59,9 +55,6 @@ set ( INC_FILES
 	inc/MantidMDAlgorithms/BooleanBinaryOperationMD.h
 	inc/MantidMDAlgorithms/CobaltSpinWaveDSHO.h
 	inc/MantidMDAlgorithms/CompareMDWorkspaces.h
-	inc/MantidMDAlgorithms/CompositeFunctionBuilder.h
-	inc/MantidMDAlgorithms/CompositeImplicitFunction.h
-	inc/MantidMDAlgorithms/CompositeImplicitFunctionParser.h
 	inc/MantidMDAlgorithms/ConvertToDetectorFaceMD.h
 	inc/MantidMDAlgorithms/ConvertToMDEvents.h
 	inc/MantidMDAlgorithms/ConvertToMDEventsWSInterface.h
@@ -76,7 +69,7 @@ set ( INC_FILES
 	inc/MantidMDAlgorithms/ConvToMDPreprocDetectors.h
 	inc/MantidMDAlgorithms/ConvertToMDEventsUnitsConv.h
 	inc/MantidMDAlgorithms/IConvertToMDEventsWS.h
-        inc/MantidMDAlgorithms/DampedHisenbergFMSW.h
+  inc/MantidMDAlgorithms/DampedHisenbergFMSW.h
 	inc/MantidMDAlgorithms/DivideMD.h
 	inc/MantidMDAlgorithms/EqualToMD.h
 	inc/MantidMDAlgorithms/ExponentialMD.h
@@ -93,7 +86,6 @@ set ( INC_FILES
 	inc/MantidMDAlgorithms/MinusMD.h
 	inc/MantidMDAlgorithms/MultiplyMD.h
 	inc/MantidMDAlgorithms/NotMD.h
-	inc/MantidMDAlgorithms/NullImplicitFunction.h
 	inc/MantidMDAlgorithms/OrMD.h
 	inc/MantidMDAlgorithms/PlusMD.h
 	inc/MantidMDAlgorithms/PowerMD.h
@@ -124,12 +116,12 @@ set ( TEST_FILES
 	test/ConvertToMDEventsCoordTransfTest.h
 	test/ConvertToMDEventsWSTest.h
 	test/ConvertToMDEventsParamsTest.h
-    test/ConvertToMDEventsSubalgFactoryTest.h
+  test/ConvertToMDEventsSubalgFactoryTest.h
 	test/ConvertToMDEventsTest.h
 	test/ConvertToMDEventsUnitsConvTest.h
 	test/ConvertToQ3DdETest.h
 	test/ConvertToMDEventsTestPerformance.h 	
-        test/DampedHisenbergFMSWTest.h
+  test/DampedHisenbergFMSWTest.h
 	test/DivideMDTest.h
 	test/EqualToMDTest.h
 	test/ExponentialMDTest.h
@@ -161,9 +153,6 @@ set ( TEST_FILES
 )
 
 set ( GMOCK_TEST_FILES
-	test/CompositeBuilderTest.h
-	test/CompositeImplicitFunctionTest.h
-	test/NullImplicitFunctionTest.h
 	test/BinaryOperationMDTest.h
 )