Changeset 235

Timestamp:

01/21/05 12:21:36 (19 years ago)

Author:

kil064

Message:

Add binary table operator

opacity
gain elevation now handles polynomials
pass on row arg to SDMath::statistics

Location:

trunk/src

Files:

• SDMathWrapper.cc (modified) (6 diffs)
• SDMathWrapper.h (modified) (3 diffs)

trunk/src/SDMathWrapper.cc

@@ -46 +46 @@
 
 
+SDMemTableWrapper SDMathWrapper::simpleBinaryOperate(const SDMemTableWrapper& left,
+                                                     const SDMemTableWrapper& right,
+                                                     const std::string& op)
+{
+    SDMath sdm;
+    return SDMemTableWrapper(sdm.simpleBinaryOperate(left.getCP(), right.getCP(), 
+                                                     String(op)));
+}
+
+
 void SDMathWrapper::scaleInSitu(SDMemTableWrapper& in, float factor, bool doAll)
 {
@@ -142 +152 @@
   SDMemTable* pIn = in.getPtr();
   SDMath sdm;
-  SDMemTable* pOut = sdm.averagePol (*pIn, mask);
+  Vector<Bool> tMask(mask);
+  SDMemTable* pOut = sdm.averagePol (*pIn, tMask);
   *pIn = *pOut;
    delete pOut;
@@ -153 +164 @@
   const CountedPtr<SDMemTable>& pIn = in.getCP();
   SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.averagePol(*pIn, mask));
+  Vector<Bool> tMask(mask);
+  return CountedPtr<SDMemTable>(sdm.averagePol(*pIn, tMask));
 }
 
@@ -159 +171 @@
 std::vector<float> SDMathWrapper::statistic(const SDMemTableWrapper& in,
                                             const std::vector<bool>& mask, 
-                                            const std::string& which) 
-{
-  SDMath sdm;
-  return sdm.statistic(in.getCP(), mask, String(which));
+                                            const std::string& which, int row) 
+{
+  SDMath sdm;
+  Vector<Bool> tMask(mask);
+  return sdm.statistic(in.getCP(), tMask, String(which), Int(row));
 }
 
@@ -186 +199 @@
 
 
-void SDMathWrapper::gainElevationInSitu(SDMemTableWrapper& in, const string& fileName,
+void SDMathWrapper::gainElevationInSitu(SDMemTableWrapper& in, 
+                                        const std::vector<float>& coeffs,
+                                        const string& fileName,
                                         const string& method, bool doAll)
 {
   SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  SDMemTable* pOut = sdm.gainElevation(*pIn, String(fileName), String(method), Bool(doAll));
+  Vector<Float> tCoeffs(coeffs);
+  SDMath sdm;
+  SDMemTable* pOut = sdm.gainElevation(*pIn, tCoeffs, String(fileName), 
+                                       String(method), Bool(doAll));
   *pIn = *pOut;
   delete pOut;
@@ -198 +215 @@
 
 SDMemTableWrapper SDMathWrapper::gainElevation(const SDMemTableWrapper& in, 
+                                               const std::vector<float>& coeffs,
                                                const string& fileName, 
                                                const string& method, bool doAll)
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.gainElevation(*pIn, String(fileName), 
+  Vector<Float> tCoeffs(coeffs);
+  SDMath sdm;
+  return CountedPtr<SDMemTable>(sdm.gainElevation(*pIn, tCoeffs, String(fileName), 
                                                   String(method), Bool(doAll)));
 }
 
+void SDMathWrapper::opacityInSitu(SDMemTableWrapper& in, float tau, bool doAll)
+{
+  SDMemTable* pIn = in.getPtr();
+  SDMath sdm;
+  SDMemTable* pOut = sdm.opacity(*pIn, Float(tau), Bool(doAll));
+  *pIn = *pOut;
+  delete pOut;
+}
+
+
+SDMemTableWrapper SDMathWrapper::opacity(const SDMemTableWrapper& in, 
+                                         float tau, bool doAll)
+{
+  const CountedPtr<SDMemTable>& pIn = in.getCP();
+  SDMath sdm;
+  return CountedPtr<SDMemTable>(sdm.opacity(*pIn, Float(tau), Bool(doAll)));
+}
+

trunk/src/SDMathWrapper.h

@@ -47 +47 @@
                              const SDMemTableWrapper& off);
 
+// Simple binary operations
+  SDMemTableWrapper simpleBinaryOperate (const SDMemTableWrapper& left,
+                                         const SDMemTableWrapper& right,
+                                         const std::string& op);
+
 // Multiply
   void scaleInSitu(SDMemTableWrapper& in, float factor, bool doAll);
@@ -71 +76 @@
 
 // Apply gain elevation correction
-  void gainElevationInSitu (SDMemTableWrapper& in, const std::string& fileName, 
+  void gainElevationInSitu (SDMemTableWrapper& in, const std::vector<float>& coeffs,
+                            const std::string& fileName, 
                             const std::string& method, bool doAll);
-  SDMemTableWrapper gainElevation(const SDMemTableWrapper& in, const std::string& fileName, 
+  SDMemTableWrapper gainElevation(const SDMemTableWrapper& in, const std::vector<float>& coeffs,
+                                  const std::string& fileName, 
                                   const std::string& method, bool doAll);
+
+// Apply opacity correction
+  void opacityInSitu (SDMemTableWrapper& in, float tau, bool doAll);
+  SDMemTableWrapper opacity (const SDMemTableWrapper& in, float tau, bool doAll);
 
 // Average in time
@@ -89 +100 @@
   std::vector<float> statistic(const SDMemTableWrapper& in,
                                const std::vector<bool>& mask, 
-                               const std::string& which);
+                               const std::string& which, int row);
 };