Refs #9445. Added clone method to PoldiPeakCollection

mantidproject · Jun 26, 2014 · 0448cd9 · 0448cd9
1 parent ec947a6
commit 0448cd9
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h
@@ -38,6 +38,10 @@ namespace Poldi {
   Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
 
+class PoldiPeakCollection;
+
+typedef boost::shared_ptr<PoldiPeakCollection> PoldiPeakCollection_sptr;
+
 class MANTID_SINQ_DLL PoldiPeakCollection
 {    
 public:
@@ -50,6 +54,8 @@ class MANTID_SINQ_DLL PoldiPeakCollection
     PoldiPeakCollection(DataObjects::TableWorkspace_sptr workspace);
     virtual ~PoldiPeakCollection() {}
 
+    PoldiPeakCollection_sptr clone();
+
     size_t peakCount() const;
 
     void addPeak(PoldiPeak_sptr newPeak);
@@ -86,8 +92,6 @@ class MANTID_SINQ_DLL PoldiPeakCollection
     std::string m_profileFunctionName;
 };
 
-typedef boost::shared_ptr<PoldiPeakCollection> PoldiPeakCollection_sptr;
-
 }
 }
 

diff --git a/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp b/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp
@@ -29,6 +29,18 @@ PoldiPeakCollection::PoldiPeakCollection(TableWorkspace_sptr workspace) :
     }
 }
 
+PoldiPeakCollection_sptr PoldiPeakCollection::clone()
+{
+    PoldiPeakCollection_sptr clone(new PoldiPeakCollection(m_intensityType));
+    clone->setProfileFunctionName(m_profileFunctionName);
+
+    for(size_t i = 0; i < m_peaks.size(); ++i) {
+        clone->addPeak(m_peaks[i]->clone());
+    }
+
+    return clone;
+}
+
 size_t PoldiPeakCollection::peakCount() const
 {
     return m_peaks.size();

diff --git a/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h b/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h
@@ -208,6 +208,32 @@ class PoldiPeakCollectionTest : public CxxTest::TestSuite
         TS_ASSERT(peaks.checkColumns(newTable));
     }
 
+    void testClone()
+    {
+        PoldiPeakCollection_sptr peaks(new PoldiPeakCollection);
+        peaks->setProfileFunctionName("Test");
+        peaks->addPeak(PoldiPeak::create(2.0));
+        peaks->addPeak(PoldiPeak::create(3.0));
+
+        PoldiPeakCollection_sptr clone = peaks->clone();
+
+        // make sure those are different instances
+        TS_ASSERT(clone != peaks);
+
+        // everything else should be identical
+        TS_ASSERT_EQUALS(clone->getProfileFunctionName(), peaks->getProfileFunctionName());
+        TS_ASSERT_EQUALS(clone->intensityType(), peaks->intensityType());
+        TS_ASSERT_EQUALS(clone->peakCount(), peaks->peakCount());
+
+        for(size_t i = 0; i < clone->peakCount(); ++i) {
+            PoldiPeak_sptr clonePeak = clone->peak(i);
+            PoldiPeak_sptr peaksPeak = peaks->peak(i);
+
+            TS_ASSERT(clonePeak != peaksPeak);
+            TS_ASSERT_EQUALS(clonePeak->d(), peaksPeak->d());
+        }
+    }
+
 
 private:
     TableWorkspace_sptr m_dummyData;