Changeset 170 for trunk/src/SDMathWrapper.cc

Timestamp:

01/06/05 13:52:30 (19 years ago)

Author:

kil064

Message:

Modify SDMath to be a class rather than just a namespace

File:

• trunk/src/SDMathWrapper.cc (modified) (10 diffs)

trunk/src/SDMathWrapper.cc

@@ -32 +32 @@
 
 #include "SDMathWrapper.h"
+#include "SDMath.h"
+
 
 using namespace asap;
@@ -39 +41 @@
                                           const SDMemTableWrapper& off)
 {
-    return SDMemTableWrapper(SDMath::quotient(on.getCP(),
-                                             off.getCP()));
+    SDMath sdm;
+    return SDMemTableWrapper(sdm.quotient(on.getCP(), off.getCP()));
 }
 
 
-void SDMathWrapper::scaleInSitu(SDMemTableWrapper& in, casa::Float factor, casa::Bool doAll)
+void SDMathWrapper::scaleInSitu(SDMemTableWrapper& in, float factor, bool doAll)
 {
   SDMemTable* pIn = in.getPtr();
   const uInt what = 0;
-  SDMemTable* pOut = SDMath::simpleOperate (*pIn, factor, doAll, what);
+//
+  SDMath sdm;
+  SDMemTable* pOut = sdm.simpleOperate (*pIn, Float(factor), Bool(doAll), what);
   *pIn = *pOut;
    delete pOut;
@@ -54 +58 @@
 
 SDMemTableWrapper SDMathWrapper::scale(const SDMemTableWrapper& in,
-                          casa::Float factor, casa::Bool doAll)
+                          float factor, bool doAll)
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
   const uInt what = 0;
-  return CountedPtr<SDMemTable>(SDMath::simpleOperate(*pIn, factor, doAll, what));
+  SDMath sdm;
+  return CountedPtr<SDMemTable>(sdm.simpleOperate(*pIn, Float(factor), Bool(doAll), what));
 }
 
 
 
-void SDMathWrapper::addInSitu(SDMemTableWrapper& in, casa::Float offset, casa::Bool doAll)
+void SDMathWrapper::addInSitu(SDMemTableWrapper& in, float offset, bool doAll)
 {
   SDMemTable* pIn = in.getPtr();
   const uInt what = 1;
-  SDMemTable* pOut = SDMath::simpleOperate (*pIn, offset, doAll, what);
+//
+  SDMath sdm;
+  SDMemTable* pOut = sdm.simpleOperate (*pIn, Float(offset), Bool(doAll), what);
   *pIn = *pOut;
    delete pOut;
@@ -73 +80 @@
 
 SDMemTableWrapper SDMathWrapper::add(const SDMemTableWrapper& in,
-                                     casa::Float offset, casa::Bool doAll)
+                                     float offset, bool doAll)
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
   const uInt what = 1;
-  return CountedPtr<SDMemTable>(SDMath::simpleOperate(*pIn, offset, doAll, what));
+  SDMath sdm;
+  return CountedPtr<SDMemTable>(sdm.simpleOperate(*pIn, Float(offset), Bool(doAll), what));
 }
 
@@ -83 +91 @@
 SDMemTableWrapper SDMathWrapper::hanning(const SDMemTableWrapper& in) 
 {
-  return SDMemTableWrapper(SDMath::hanning(in.getCP()));
+  SDMath sdm;
+  return SDMemTableWrapper(sdm.hanning(in.getCP()));
 }
 
@@ -90 +99 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMemTable* pOut = SDMath::bin (*pIn, Int(width));
+  SDMath sdm;
+  SDMemTable* pOut = sdm.bin (*pIn, Int(width));
   *pIn = *pOut;
    delete pOut;
@@ -99 +109 @@
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
-  return CountedPtr<SDMemTable>(SDMath::bin(*pIn, Int(width)));
+  SDMath sdm;
+  return CountedPtr<SDMemTable>(sdm.bin(*pIn, Int(width)));
 }
 
@@ -106 +117 @@
 {
   SDMemTable* pIn = in.getPtr();
-  SDMemTable* pOut = SDMath::averagePol (*pIn, mask);
+  SDMath sdm;
+  SDMemTable* pOut = sdm.averagePol (*pIn, mask);
   *pIn = *pOut;
    delete pOut;
@@ -115 +127 @@
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
-  return CountedPtr<SDMemTable>(SDMath::averagePol(*pIn, mask));
+  SDMath sdm;
+  return CountedPtr<SDMemTable>(sdm.averagePol(*pIn, mask));
 }
 
@@ -123 +136 @@
                                             const std::string& which) 
 {
-  return SDMath::statistic(in.getCP(), mask, which);
+  SDMath sdm;
+  return sdm.statistic(in.getCP(), mask, which);
 }