Changeset 249

Timestamp:

01/21/05 15:35:44 (19 years ago)

Author:

kil064

Message:

rename some functions.
quotient now implemented via SDMath::binaryOperate

Location:

trunk/src

Files:

• SDMathWrapper.cc (modified) (5 diffs)
• SDMathWrapper.h (modified) (1 diff)

trunk/src/SDMathWrapper.cc

@@ -43 +43 @@
 {
     SDMath sdm;
-    return SDMemTableWrapper(sdm.quotient(on.getCP(), off.getCP(), preserveContinuum));
-}
-
-
-SDMemTableWrapper SDMathWrapper::simpleBinaryOperate(const SDMemTableWrapper& left,
-                                                     const SDMemTableWrapper& right,
-                                                     const std::string& op)
+    return SDMemTableWrapper(sdm.binaryOperate(on.getCP(), off.getCP(), 
+                             String("QUOTIENT"), preserveContinuum));
+}
+
+
+SDMemTableWrapper SDMathWrapper::binaryOperate(const SDMemTableWrapper& left,
+                                               const SDMemTableWrapper& right,
+                                               const std::string& op)
 {
     SDMath sdm;
-    return SDMemTableWrapper(sdm.simpleBinaryOperate(left.getCP(), right.getCP(), 
-                                                     String(op)));
+    return SDMemTableWrapper(sdm.binaryOperate(left.getCP(), right.getCP(), 
+                                               String(op), False));
 }
 
@@ -63 +64 @@
 //
   SDMath sdm;
-  SDMemTable* pOut = sdm.simpleOperate (*pIn, Float(factor), 
+  SDMemTable* pOut = sdm.unaryOperate (*pIn, Float(factor), 
                                         Bool(doAll), what);
   *pIn = *pOut;
@@ -75 +76 @@
   const uInt what = 0;
   SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.simpleOperate(*pIn,
+  return CountedPtr<SDMemTable>(sdm.unaryOperate(*pIn,
                                                   Float(factor), 
                                                   Bool(doAll), what));
@@ -88 +89 @@
 //
   SDMath sdm;
-  SDMemTable* pOut = sdm.simpleOperate (*pIn, Float(offset), 
+  SDMemTable* pOut = sdm.unaryOperate (*pIn, Float(offset), 
                                         Bool(doAll), what);
   *pIn = *pOut;
@@ -100 +101 @@
   const uInt what = 1;
   SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.simpleOperate(*pIn, Float(offset),
+  return CountedPtr<SDMemTable>(sdm.unaryOperate(*pIn, Float(offset),
                                                   Bool(doAll), what));
 }

trunk/src/SDMathWrapper.h

@@ -49 +49 @@
 
 // Simple binary operations
-  SDMemTableWrapper simpleBinaryOperate (const SDMemTableWrapper& left,
-                                         const SDMemTableWrapper& right,
-                                         const std::string& op);
+  SDMemTableWrapper binaryOperate (const SDMemTableWrapper& left,
+                                   const SDMemTableWrapper& right,
+                                   const std::string& op);
 
 // Multiply