Changeset 266 for XMLIO_V2/dev/common/src/xmlio/functor

Timestamp:

09/06/11 16:45:08 (13 years ago)

Author:

hozdoba

Message:

Corrections après tests sur titane

Location:

XMLIO_V2/dev/common/src/xmlio/functor

Files:

• average.cpp (modified) (1 diff)
• average.hpp (modified) (1 diff)
• functor_type.hpp (modified) (1 diff)
• instant.cpp (modified) (1 diff)
• maximum.cpp (added)
• maximum.hpp (added)
• minimum.cpp (added)
• minimum.hpp (added)
• once.cpp (modified) (1 diff)

XMLIO_V2/dev/common/src/xmlio/functor/average.cpp

@@ -16 +16 @@
       //---------------------------------------------------------------
 
-      void CAverage::apply(const DoubleArray         UNUSED(dinput),
-                                 DoubleArray         UNUSED(doutput))
+      void CAverage::apply(const DoubleArray _dinput,
+                                 DoubleArray _doutput)
       {
-         ERROR("CAverage::apply(...)", << "Not implemented yet !");
+         const double * it1  = _dinput->data(),
+                      * end1 = _dinput->data() + _dinput->num_elements(); 
+               double * it   = _doutput->data();
+         if (this->nbcall == 1)
+              for (; it1 != end1; it1++, it++) *it  = *it1;
+         else for (; it1 != end1; it1++, it++) *it += *it1;               
       }
-
-      //---------------------------------------------------------------
-
+      
+      void CAverage::final(void)
+      {
+          double * it1  = this->getDataOutput()->data(),
+                 * end1 = this->getDataOutput()->data() + this->getDataOutput()->num_elements();
+          for (; it1 != end1; it1++) *it1 /= this->nbcall;
+          this->nbcall = 0;                                                   
+      }
    } // namespace func
 } // namespace xmlioserver

XMLIO_V2/dev/common/src/xmlio/functor/average.hpp

@@ -27 +27 @@
             /// Traitement ///
             virtual void apply(const DoubleArray dinput, DoubleArray doutput);
-
+            virtual void final(void) ;
+            
             /// Destructeur ///
             virtual ~CAverage(void);

XMLIO_V2/dev/common/src/xmlio/functor/functor_type.hpp

@@ -5 +5 @@
 #include "instant.hpp"
 #include "once.hpp"
+#include "maximum.hpp"
+#include "minimum.hpp"
 
 #endif //__XMLIO_functor_type__

XMLIO_V2/dev/common/src/xmlio/functor/instant.cpp

@@ -16 +16 @@
       //---------------------------------------------------------------
 
-      void CInstant::apply(const DoubleArray         UNUSED(dinput),
-                                 DoubleArray         UNUSED(doutput))
+      void CInstant::apply(const DoubleArray _dinput,
+                                 DoubleArray _doutput)
       {
-         ERROR("CInstant::apply(...)", << "Not implemented yet !");
+         const double * it1  = _dinput->data(),
+                      * end1 = _dinput->data() + _dinput->num_elements();
+         double * it   = _doutput->data();
+         for (; it1 != end1; it1++, it++) *it  = *it1;
       }
 

XMLIO_V2/dev/common/src/xmlio/functor/once.cpp

@@ -16 +16 @@
       //---------------------------------------------------------------
 
-      void COnce::apply(const DoubleArray         UNUSED(dinput),
-                              DoubleArray         UNUSED(doutput))
+      void COnce::apply(const DoubleArray _dinput,
+                              DoubleArray _doutput)
       {
-         ERROR("COnce::apply(...)", << "Not implemented yet !");
+         const double * it1  = _dinput->data(),
+                      * end1 = _dinput->data() + _dinput->num_elements();
+               double * it   = _doutput->data();
+        for (; it1 != end1; it1++, it++) *it  = *it1;
       }