Changeset 1122

Timestamp:

05/05/17 08:58:36 (8 years ago)

Author:

rlacroix

Message:

CTemporalFilter: Improve const-correctness.

Location:

XIOS/trunk/src/filter

Files:

• temporal_filter.cpp (modified) (3 diffs)
• temporal_filter.hpp (modified) (2 diffs)

XIOS/trunk/src/filter/temporal_filter.cpp

@@ -5 +5 @@
 namespace xios
 {
+  static func::CFunctor* createFunctor(const std::string& opId, bool ignoreMissingValue, double missingValue, CArray<double, 1>& tmpData);
+
   CTemporalFilter::CTemporalFilter(CGarbageCollector& gc, const std::string& opId,
                                    const CDate& initDate, const CDuration samplingFreq, const CDuration samplingOffset, const CDuration opFreq,
                                    bool ignoreMissingValue /*= false*/, double missingValue /*= 0.0*/)
     : CFilter(gc, 1, this)
+    , functor(createFunctor(opId, ignoreMissingValue, missingValue, tmpData))
     , samplingFreq(samplingFreq)
     , opFreq(opFreq)
@@ -14 +17 @@
     , nextOperationDate(initDate + samplingOffset + opFreq)
     , isFirstOperation(true)
+    , isOnceOperation(functor->timeType() == func::CFunctor::once)
   {
-    double defaultValue = ignoreMissingValue ? std::numeric_limits<double>::quiet_NaN() : missingValue;
-    
-#define DECLARE_FUNCTOR(MType, mtype) \
-    if (opId.compare(#mtype) == 0) \
-    { \
-      if (ignoreMissingValue) \
-      { \
-        functor.reset(new func::C##MType(tmpData, defaultValue)); \
-      } \
-      else \
-      { \
-        functor.reset(new func::C##MType(tmpData)); \
-      } \
-    }
-
-#include "functor_type.conf"
-
-    if (!functor)
-      ERROR("CTemporalFilter::CTemporalFilter(CGarbageCollector& gc, const std::string& opId, ...)",
-            << "\"" << opId << "\" is not a valid operation.");
-
-    isOnceOperation = (functor->timeType() == func::CFunctor::once);
   }
 
@@ -80 +62 @@
     return isOnceOperation ? isFirstOperation : (date >= nextSamplingDate || date + samplingFreq > nextOperationDate);
   }
+
+  static func::CFunctor* createFunctor(const std::string& opId, bool ignoreMissingValue, double missingValue, CArray<double, 1>& tmpData)
+  {
+    func::CFunctor* functor = NULL;
+
+    double defaultValue = ignoreMissingValue ? std::numeric_limits<double>::quiet_NaN() : missingValue;
+
+#define DECLARE_FUNCTOR(MType, mtype) \
+    if (opId.compare(#mtype) == 0) \
+    { \
+      if (ignoreMissingValue) \
+      { \
+        functor = new func::C##MType(tmpData, defaultValue); \
+      } \
+      else \
+      { \
+        functor = new func::C##MType(tmpData); \
+      } \
+    }
+
+#include "functor_type.conf"
+
+    if (!functor)
+      ERROR("createFunctor(const std::string& opId, ...)",
+            << "\"" << opId << "\" is not a valid operation.");
+
+    return functor;
+  }
 } // namespace xios

XIOS/trunk/src/filter/temporal_filter.hpp

@@ -48 +48 @@
 
     private:
-      boost::scoped_ptr<func::CFunctor> functor; //!< The functor corresponding to the temporal operation
+      const boost::scoped_ptr<func::CFunctor> functor; //!< The functor corresponding to the temporal operation
       CArray<double, 1> tmpData; //!< The array of data used for temporary storage
       const CDuration samplingFreq; //!< The sampling frequency, i.e. the frequency at which the input data will be used
@@ -55 +55 @@
       CDate nextOperationDate; //!< The date of the next operation
       bool isFirstOperation; //!< True before the first operation was been computed
-      bool isOnceOperation; //!< True if the operation should be computed just once
+      const bool isOnceOperation; //!< True if the operation should be computed just once
   }; // class CTemporalFilter
 } // namespace xios