Changeset 188

Timestamp:

05/03/11 15:50:52 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src/xmlio

Files:

• calendar.hpp (modified) (1 diff)
• config/calendar_type.conf (added)
• config/functor_type.conf (added)
• data_treatment.cpp (modified) (1 diff)
• date.cpp (modified) (2 diffs)
• date/calendar_type.hpp (added)
• date/d360.hpp (modified) (1 diff)
• iface/interface.cpp.in (modified) (2 diffs)
• node/context.cpp (modified) (3 diffs)
• node/context.hpp (modified) (5 diffs)
• node/field.cpp (modified) (2 diffs)
• node/field.hpp (modified) (1 diff)
• node/file.cpp (modified) (8 diffs)
• output/nc4_data_output.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/src/xmlio/calendar.hpp

@@ -58 +58 @@
             /// Accesseurs ///
 
-            const CDuration& getTimeStep(void) const;
+            const CDuration & getTimeStep(void) const;
 
             const CDate & getInitDate(void) const;
             CDate & getCurrentDate(void);
-
+            
+         public :
+         
             //------------------------------------------------------------
             virtual int getMonthLength(const CDate & date) const;

XMLIO_V2/dev/dev_rv/src/xmlio/data_treatment.cpp

@@ -35 +35 @@
 
       void CDataTreatment::doTreatment(void)
-      {
+      {         
+         // Résolution du calendrier
+         this->currentContext->solveCalendar();         
+         
          // Résolution des héritages pour le context actuel.
          //std::cout << "(Message temporaire) Résolution des héritages ..." << std::endl;

XMLIO_V2/dev/dev_rv/src/xmlio/date.cpp

@@ -143 +143 @@
       //----------------------------------------------------------------
 
-      CDate FromString(const StdString & str, const CCalendar & calendar)
+      CDate CDate::FromString(const StdString & str, const CCalendar & calendar)
       {
          CDate dt(calendar);
@@ -150 +150 @@
          return dt;
       }
+      
+      //----------------------------------------------------------------
+      
+       StdString CDate::toString(void) const
+      { 
+         StdOStringStream oss;
+         oss << (*this);
+         return (oss.str()); 
+      }
 
       ///---------------------------------------------------------------

XMLIO_V2/dev/dev_rv/src/xmlio/date/d360.hpp

@@ -22 +22 @@
             CD360Calendar(const StdString & dateStr);
             CD360Calendar(int yr = 0, int mth = 1, int d   = 1,
-                            int hr = 0, int min = 0, int sec = 0);
+                          int hr = 0, int min = 0, int sec = 0);
             CD360Calendar(const CD360Calendar & calendar);       // Not implemented yet.
             CD360Calendar(const CD360Calendar * calendar);       // Not implemented yet.

XMLIO_V2/dev/dev_rv/src/xmlio/iface/interface.cpp.in

@@ -6 +6 @@
 INCLUDE "object_template_impl.hpp"
 INCLUDE "group_template_impl.hpp"
+
+INCLUDE "calendar_type.hpp"
 
 #ifdef __cplusplus
@@ -163 +165 @@
       boost::shared_ptr<CContext> context = CTreeManager::CreateContext(__ctxt_id);
       *_ctxt = context.get();
+      switch(_calType)
+      {
+         case (D360)     : 
+            context->setCalendar(boost::shared_ptr<date::CCalendar>
+               (new date::CD360Calendar(yr, mth, dd, hr, min, sec)));
+            break;
+         case (ALLLEAP)  : 
+            context->setCalendar(boost::shared_ptr<date::CCalendar>
+               (new date::CAllLeapCalendar(yr, mth, dd, hr, min, sec)));
+            break;
+         case (NOLEAP)   : 
+            context->setCalendar(boost::shared_ptr<date::CCalendar>
+               (new date::CNoLeapCalendar(yr, mth, dd, hr, min, sec)));
+            break;
+         case (JULIAN)   :
+            context->setCalendar(boost::shared_ptr<date::CCalendar>
+               (new date::CJulianCalendar(yr, mth, dd, hr, min, sec)));
+            break;
+         case (GREGORIAN): 
+            context->setCalendar(boost::shared_ptr<date::CCalendar>
+               (new date::CGregorianCalendar(yr, mth, dd, hr, min, sec)));
+             break;
+         default:
+            std::cerr << "Le calendrier n'est pas identifié" << std::endl;
+            exit (EXIT_FAILURE);
+      }    
    }
    catch (CException & exc)

XMLIO_V2/dev/dev_rv/src/xmlio/node/context.cpp

@@ -7 +7 @@
 #include "group_template_impl.hpp"
 
+#include "calendar_type.hpp"
+
 namespace xmlioserver {
 namespace tree {
@@ -14 +16 @@
    CContext::CContext(void)
       : CObjectTemplate<CContext>(), CContextAttributes()
+      , calendar()
    { /* Ne rien faire de plus */ }
 
    CContext::CContext(const StdString & id)
       : CObjectTemplate<CContext>(id), CContextAttributes()
+      , calendar()
    { /* Ne rien faire de plus */ }
 
@@ -37 +41 @@
       return (group_context); 
    }
-
+   
+   //----------------------------------------------------------------
+   
+   boost::shared_ptr<date::CCalendar> CContext::getCalendar(void) const
+   {
+      return (this->calendar);
+   }
+   
+   //----------------------------------------------------------------
+   
+   void CContext::setCalendar(boost::shared_ptr<date::CCalendar> newCalendar)
+   {
+      this->calendar = newCalendar;
+      calendar_type.setValue(this->calendar->getId());
+      start_date.setValue(this->calendar->getInitDate().toString());
+   }
+   
+   //----------------------------------------------------------------
+
+   void CContext::solveCalendar(void)
+   {
+      if (this->calendar.get() != NULL) return;
+      if (calendar_type.isEmpty() || start_date.isEmpty())
+         ERROR(" CContext::solveCalendar(void)",
+               << "[ context id = " << this->getId() << " ] "
+               << "Impossible de définir un calendrier (un attribut est manquant).");
+
+#define DECLARE_CALENDAR(MType  , mtype)                        \
+   if (calendar_type.getValue().compare(#mtype) == 0)           \
+   {                                                            \
+      this->calendar =  boost::shared_ptr<date::CCalendar>      \
+         (new date::C##MType##Calendar(start_date.getValue())); \
+      return;                                                   \
+   }
+#include "calendar_type.conf"
+
+      ERROR("CContext::solveCalendar(void)",
+            << "[ calendar_type = " << calendar_type.getValue() << " ] "
+            << "Le calendrier n'est pas définie dans le code !");
+   }
+   
    //----------------------------------------------------------------
 

XMLIO_V2/dev/dev_rv/src/xmlio/node/context.hpp

@@ -5 +5 @@
 #include "xmlioserver_spl.hpp"
 #include "node_type.hpp"
+#include "calendar.hpp"
 
 #include "declare_group.hpp"
@@ -40 +41 @@
          //---------------------------------------------------------
 
+      public :
+
          /// Constructeurs ///
          CContext(void);
@@ -51 +54 @@
          //---------------------------------------------------------
 
+      public :
+      
+         /// Mutateurs ///
+         void setCalendar(boost::shared_ptr<date::CCalendar> newCalendar);
+      
+         /// Accesseurs ///
+         boost::shared_ptr<date::CCalendar> getCalendar(void) const;
+
          /// Accesseurs statiques ///
          static StdString GetName(void);
-         static StdString GetDefName(void);
-         
-         static ENodeType GetType(void);
+         static StdString GetDefName(void);         
+         static ENodeType GetType(void);         
 
          static boost::shared_ptr<CContextGroup> GetContextGroup(void);
+
+      public :
 
          /// Traitements ///
          virtual void solveDescInheritance(const CAttributeMap * const parent = 0);
          void solveFieldRefInheritance(void);
+         void solveCalendar(void);
 
          /// Autres méthodes statiques ///
@@ -68 +81 @@
          /// Test ///
          virtual bool hasChild(void) const;
-
+         
+      public :
+      
          /// Autres ///
          virtual void parse(xml::CXMLNode & node);
@@ -75 +90 @@
          virtual void toBinary  (StdOStream & os) const;
          virtual void fromBinary(StdIStream & is);
+         
+      private :
+      
+         boost::shared_ptr<date::CCalendar> calendar;
 
    }; // class CContext

XMLIO_V2/dev/dev_rv/src/xmlio/node/field.cpp

@@ -102 +102 @@
       return (this->getBaseFieldReference()->getId());
    }
+   
+   //----------------------------------------------------------------
+   
+   const date::CDuration & CField::getFreqOperation(void) const
+   {
+      return (this->freq_operation);
+   }
+   
+   //----------------------------------------------------------------
+   const date::CDuration & CField::getFreqWrite(void) const
+   {
+      return (this->freq_write);
+   }
+   
+   //----------------------------------------------------------------
+         
+   boost::shared_ptr<func::CFunctor> CField::getFieldOperation(void) const
+   {
+      return (this->foperation);
+   }
 
    //----------------------------------------------------------------
@@ -166 +186 @@
          
 #define DECLARE_FUNCTOR(MType, mtype) \
-   if  (operation.getValue().compare(#mtype) == 0){}
+   if  (operation.getValue().compare(#mtype) == 0) \
+   { return; }
       //this->foperation = boost::shared_ptr<func::CFunctor>(new C##MType());
    
 #include "functor_type.conf"
+         
+         ERROR("CField::solveOperation(void)",
+               << "[ operation = " << operation.getValue() << "]"
+               << "L'opération n'est pas définie dans le code !");
       }
    }

XMLIO_V2/dev/dev_rv/src/xmlio/node/field.hpp

@@ -59 +59 @@
          boost::shared_ptr<CGrid> getRelGrid(void) const ;
          boost::shared_ptr<CFile> getRelFile(void) const ;
+         
+         const date::CDuration & getFreqOperation(void) const;
+         const date::CDuration & getFreqWrite(void) const;
+         
+         boost::shared_ptr<func::CFunctor> getFieldOperation(void) const;
+         
+         ARRAY(double, 1) getData(void) const;
 
          const StdString & getBaseFieldId(void) const;

XMLIO_V2/dev/dev_rv/src/xmlio/node/file.cpp

@@ -94 +94 @@
    { this->vFieldGroup = newVFieldGroup; }
 
+   //----------------------------------------------------------------
+
    void CFile::setVirtualFieldGroup(const StdString & newVFieldGroupId)
    {
@@ -99 +101 @@
          (CObjectFactory::CreateObject<CFieldGroup>(newVFieldGroupId));
    }
+
+   //----------------------------------------------------------------
 
    void CFile::initializeDataOutput(boost::shared_ptr<io::CDataOutput> dout)
@@ -121 +125 @@
       this->data_out->definition_end();
    }
+
+   //----------------------------------------------------------------
 
    void CFile::parse(xml::CXMLNode & node)
@@ -148 +154 @@
    }
 
-
+   //----------------------------------------------------------------
+   
    void CFile::solveDescInheritance(const CAttributeMap * const parent)
    {
@@ -154 +161 @@
       this->getVirtualFieldGroup()->solveDescInheritance(NULL);
    }
+
+   //----------------------------------------------------------------
 
    void CFile::solveFieldRefInheritance(void)
@@ -163 +172 @@
    }
 
+   //----------------------------------------------------------------
+
    void CFile::solveEFGridRef(void)
    {
@@ -168 +179 @@
          this->enabledFields[i]->solveGridReference();
    }
+
+   //----------------------------------------------------------------
 
    void CFile::solveEFOperation(void)
@@ -190 +203 @@
    }
    
+   //----------------------------------------------------------------
+   
    void CFile::fromBinary(StdIStream & is)
    {

XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.hpp

@@ -48 +48 @@
             virtual void writeFile_  (const boost::shared_ptr<tree::CFile>   file);
 
+
+         protected :
+         
             void writeLocalAttributes(int ibegin, int iend, int jbegin, int jend, StdString domid);