[Stdair-svn] SF.net SVN: stdair:[166] trunk/stdair/stdair

[<qua...@us...>]

Revision: 166
          http://stdair.svn.sourceforge.net/stdair/?rev=166&view=rev
Author:   quannaus
Date:     2010-04-06 14:19:00 +0000 (Tue, 06 Apr 2010)

Log Message:
-----------
[dev] test new implementation.

Modified Paths:
--------------
    trunk/stdair/stdair/batches/stdair.cpp
    trunk/stdair/stdair/bom/BR.hpp
    trunk/stdair/stdair/bom/BRKey.hpp
    trunk/stdair/stdair/bom/IN.hpp
    trunk/stdair/stdair/bom/INKey.hpp
    trunk/stdair/stdair/bom/INTypes.hpp
    trunk/stdair/stdair/bom/InventoryKey.hpp
    trunk/stdair/stdair/bom/Structure.hpp
    trunk/stdair/stdair/bom/sources.mk
    trunk/stdair/stdair/factory/FacBomContent.hpp

Added Paths:
-----------
    trunk/stdair/stdair/bom/BS.hpp
    trunk/stdair/stdair/bom/BSKey.hpp
    trunk/stdair/stdair/bom/BSTypes.hpp
    trunk/stdair/stdair/bom/FD.hpp
    trunk/stdair/stdair/bom/FDKey.hpp
    trunk/stdair/stdair/bom/FDTypes.hpp
    trunk/stdair/stdair/bom/ND.hpp
    trunk/stdair/stdair/bom/NDKey.hpp
    trunk/stdair/stdair/bom/NDTypes.hpp

Modified: trunk/stdair/stdair/batches/stdair.cpp
===================================================================
--- trunk/stdair/stdair/batches/stdair.cpp	2010-04-06 12:47:26 UTC (rev 165)
+++ trunk/stdair/stdair/batches/stdair.cpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -6,24 +6,32 @@
 #include <string>
 // StdAir
 #include <stdair/STDAIR_Types.hpp>
-#include <stdair/STDAIR_Service.hpp>
 #include <stdair/bom/BR.hpp>
 #include <stdair/bom/BRKey.hpp>
 #include <stdair/bom/BRTypes.hpp>
 #include <stdair/bom/IN.hpp>
 #include <stdair/bom/INKey.hpp>
 #include <stdair/bom/INTypes.hpp>
+#include <stdair/bom/FD.hpp>
+#include <stdair/bom/FDKey.hpp>
+#include <stdair/bom/FDTypes.hpp>
+#include <stdair/bom/ND.hpp>
+#include <stdair/bom/NDKey.hpp>
+#include <stdair/bom/NDTypes.hpp>
 #include <stdair/factory/FacBomContent.hpp>
 
 
 // ///////// M A I N ////////////
 int main (int argc, char* argv[]) {
    try {
-
-     stdair::BRKey_T lBRKey ();
+     stdair::BRKey_T lBRKey;
      stdair::BR& lBR =
        stdair::FacBomContent::instance().testCreate<stdair::BR> (lBRKey);
 
+     stdair::INKey_T lINKey ("BA");
+     stdair::IN& lIN =
+       stdair::FacBomContent::instance().testCreate<stdair::IN> (lINKey);
+ 
      
   } catch (const std::exception& stde) {
     std::cerr << "Standard exception: " << stde.what() << std::endl;

Modified: trunk/stdair/stdair/bom/BR.hpp
===================================================================
--- trunk/stdair/stdair/bom/BR.hpp	2010-04-06 12:47:26 UTC (rev 165)
+++ trunk/stdair/stdair/bom/BR.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -35,7 +35,8 @@
     typedef BRKey_T Key_T;
 
     /** Define the list of children holder types. */
-    typedef boost::fusion::map<boost::fusion::pair<IN, INHolder_T*> > ChildrenHolderTypeMap_T;
+    typedef boost::fusion::map<
+      boost::fusion::pair<IN, INHolder_T*> > ChildrenHolderTypeMap_T;
     // /////////////////////////////////////////////////////////////////////////
     
   public:
@@ -62,7 +63,9 @@
     
   public:
     // /////////// Getters /////////////
-
+    const Key_T& getKey () const {
+      return _key;
+    }
     
   public:
     // //////////// Setters //////////////
@@ -79,9 +82,10 @@
     /** Default constructors. */
     BR ();
     BR (const BR&);
-    BR (const Key_T&, Structure_T&);
+    BR (const Key_T& iKey, Structure_T& ioStructure) 
+      : _key (iKey), _structure (ioStructure) { }
     /** Destructor. */
-    virtual ~BR();
+    virtual ~BR() { }
 
   private:
     // Attributes

Modified: trunk/stdair/stdair/bom/BRKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BRKey.hpp	2010-04-06 12:47:26 UTC (rev 165)
+++ trunk/stdair/stdair/bom/BRKey.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -4,6 +4,24 @@
 namespace stdair {
   struct BRKey_T {
 
+    // /////////// Display support methods /////////
+    void toStream (std::ostream& ioOut) const {
+      ioOut << "BRKey: " << toString() << std::endl;
+    }
+
+    void fromStream (std::istream& ioIn) {
+    }
+
+    const std::string toString() const {
+      std::ostringstream oStr;
+      oStr << " -- ROOT -- ";
+      return oStr.str();
+    }
+    
+    const std::string describe() const {
+      return toString();
+    }
+
   };
 }
 

Copied: trunk/stdair/stdair/bom/BS.hpp (from rev 165, trunk/stdair/stdair/bom/BR.hpp)
===================================================================
--- trunk/stdair/stdair/bom/BS.hpp	                        (rev 0)
+++ trunk/stdair/stdair/bom/BS.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -0,0 +1,99 @@
+#ifndef __STDAIR_BOM_BS_HPP
+#define __STDAIR_BOM_BS_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <iosfwd>
+// BOOST Fusion
+#include <boost/fusion/container/map.hpp>
+#include <boost/fusion/include/map.hpp>
+// STDAIR 
+#include <stdair/bom/Structure.hpp>
+#include <stdair/bom/BomContent.hpp>
+#include <stdair/bom/BSKey.hpp>
+#include <stdair/bom/BSTypes.hpp>
+
+namespace stdair {
+  // Forward declarations.
+  class FacBomContent;
+  
+  /** Class representing the actual functional/business content
+      for the Bom root. */
+  class BS : public BomContent {
+    friend class FacBomContent;
+    
+  public:
+    // /////////////////////////////////////////////////////////////////////////
+    /** Definition allowing to retrieve the associated BOM structure type. */
+    typedef BSStructure_T Structure_T;
+
+    /** Definition allowing to retrieve the associated BOM key type. */
+    typedef BSKey_T Key_T;
+
+    /** Define the list of children holder types. */
+    typedef boost::fusion::map<
+      boost::fusion::pair<BS, BSHolder_T*> > ChildrenHolderTypeMap_T;
+    // /////////////////////////////////////////////////////////////////////////
+    
+  public:
+    // /////////// Display support methods /////////
+    /** Dump a Business Object into an output stream.
+        @param ostream& the output stream. */
+    void toStream (std::ostream& ioOut) const { ioOut << toString(); }
+
+    /** Read a Business Object from an input stream.
+        @param istream& the input stream. */
+    void fromStream (std::istream& ioIn) { }
+
+   /** Get the serialised version of the Business Object. */
+    std::string toString() const { return describeKey(); }
+    
+    /** Get a string describing the whole key (differentiating two objects
+        at any level). */
+    const std::string describeKey() const { return std::string (""); }
+
+    /** Get a string describing the short key (differentiating two objects
+        at the same level). */
+    const std::string describeShortKey() const { return std::string (""); }
+
+    
+  public:
+    // /////////// Getters /////////////
+    const Key_T& getKey () const {
+      return _key;
+    }
+    
+  public:
+    // //////////// Setters //////////////
+
+  private:     
+    /** Retrieve the BOM structure object. */
+    Structure_T& getStructure () {
+      return _structure;
+    }
+    
+  protected:
+    /** Constructors are private so as to force the usage of the Factory
+        layer. */
+    /** Default constructors. */
+    BS ();
+    BS (const BS&);
+    BS (const Key_T& iKey, Structure_T& ioStructure) 
+      : _key (iKey), _structure (ioStructure) { }
+    /** Destructor. */
+    virtual ~BS() { }
+
+  private:
+    // Attributes
+    /** Key. */
+    Key_T _key;
+    
+    /** Reference structure. */
+    Structure_T& _structure;
+
+  };
+
+}
+#endif // __STDAIR_BOM_BS_HPP

Copied: trunk/stdair/stdair/bom/BSKey.hpp (from rev 165, trunk/stdair/stdair/bom/BRKey.hpp)
===================================================================
--- trunk/stdair/stdair/bom/BSKey.hpp	                        (rev 0)
+++ trunk/stdair/stdair/bom/BSKey.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -0,0 +1,28 @@
+#ifndef __STDAIR_BOM_BSKEY_HPP
+#define __STDAIR_BOM_BSKEY_HPP
+
+namespace stdair {
+  struct BSKey_T {
+
+    // /////////// Display support methods /////////
+    void toStream (std::ostream& ioOut) const {
+      ioOut << "BSKey: " << toString() << std::endl;
+    }
+
+    void fromStream (std::istream& ioIn) {
+    }
+
+    const std::string toString() const {
+      std::ostringstream oStr;
+      oStr << " -- STOP -- ";
+      return oStr.str();
+    }
+    
+    const std::string describe() const {
+      return toString();
+    }
+
+  };
+}
+
+#endif // __STDAIR_BOM_BSKEY_HPP

Copied: trunk/stdair/stdair/bom/BSTypes.hpp (from rev 165, trunk/stdair/stdair/bom/BRTypes.hpp)
===================================================================
--- trunk/stdair/stdair/bom/BSTypes.hpp	                        (rev 0)
+++ trunk/stdair/stdair/bom/BSTypes.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -0,0 +1,23 @@
+// //////////////////////////////////////////////////////////////////////
+#ifndef __STDAIR_BOM_BSTYPES_HPP
+#define __STDAIR_BOM_BSTYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+
+namespace stdair {
+  // Forward declarations.
+  template <typename CONTENT> class Structure;
+  template <typename CONTENT> class BomChildrenHolderImp;
+  class BS;
+  
+  /** Define the BomRootStructure. */
+  typedef Structure<BS> BSStructure_T;
+
+  /** Define the BS holder type. */
+  typedef BomChildrenHolderImp<BS> BSHolder_T;
+
+}
+#endif // __STDAIR_BOM_BSTYPES_HPP
+

Copied: trunk/stdair/stdair/bom/FD.hpp (from rev 165, trunk/stdair/stdair/bom/IN.hpp)
===================================================================
--- trunk/stdair/stdair/bom/FD.hpp	                        (rev 0)
+++ trunk/stdair/stdair/bom/FD.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -0,0 +1,98 @@
+#ifndef __STDAIR_BOM_FD_HPP
+#define __STDAIR_BOM_FD_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <iosfwd>
+// STDAIR 
+#include <stdair/bom/Structure.hpp>
+#include <stdair/bom/BomContent.hpp>
+#include <stdair/bom/FDKey.hpp>
+#include <stdair/bom/FDTypes.hpp>
+#include <stdair/bom/BSTypes.hpp>
+
+namespace stdair {
+  // Forward declarations.
+  class FacBomContent;
+  
+  /** Class representing the actual functional/business content
+      for the Bom root. */
+  class FD : public BomContent {
+    friend class FacBomContent;
+    
+  public:
+    // /////////////////////////////////////////////////////////////////////////
+    /** Definition allowing to retrieve the associated BOM structure type. */
+    typedef FDStructure_T Structure_T;
+
+    /** Definition allowing to retrieve the associated BOM key type. */
+    typedef FDKey_T Key_T;
+    
+    /** Define the list of children holder types. */
+    typedef boost::fusion::map<
+      boost::fusion::pair<BS, BSHolder_T*> > ChildrenHolderTypeMap_T;
+    // /////////////////////////////////////////////////////////////////////////
+
+    
+  public:
+    // /////////// Display support methods /////////
+    /** Dump a Business Object into an output stream.
+        @param ostream& the output stream. */
+    void toStream (std::ostream& ioOut) const { ioOut << toString(); }
+
+    /** Read a Business Object from an input stream.
+        @param istream& the input stream. */
+    void fromStream (std::istream& ioIn) { }
+
+   /** Get the serialised version of the Business Object. */
+    std::string toString() const { return describeKey(); }
+    
+    /** Get a string describing the whole key (differentiating two objects
+        at any level). */
+    const std::string describeKey() const { return _key.describe(); }
+
+    /** Get a string describing the short key (differentiating two objects
+        at the same level). */
+    const std::string describeShortKey() const { return _key.describe(); }
+
+    
+  public:
+    // /////////// Getters /////////////
+    const Key_T& getKey () const {
+      return _key;
+    }
+    
+  public:
+    // //////////// Setters //////////////
+
+  private:     
+    /** Retrieve the BOM structure object. */
+    Structure_T& getStructure () {
+      return _structure;
+    }
+    
+  protected:
+    /** Constructors are private so as to force the usage of the Factory
+        layer. */
+    /** Default constructors. */
+    FD ();
+    FD (const FD&);
+    FD (const Key_T& iKey, Structure_T& ioStructure) 
+      : _key (iKey), _structure (ioStructure) { }
+    /** Destructor. */
+    virtual ~FD() { }
+
+  private:
+    // Attributes
+    /** Key. */
+    Key_T _key;
+    
+    /** Reference structure. */
+    Structure_T& _structure;
+
+  };
+
+}
+#endif // __STDAIR_BOM_FD_HPP

Copied: trunk/stdair/stdair/bom/FDKey.hpp (from rev 165, trunk/stdair/stdair/bom/INKey.hpp)
===================================================================
--- trunk/stdair/stdair/bom/FDKey.hpp	                        (rev 0)
+++ trunk/stdair/stdair/bom/FDKey.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -0,0 +1,50 @@
+#ifndef __STDAIR_BOM_FDKEY_HPP
+#define __STDAIR_BOM_FDKEY_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STDAIR
+#include <stdair/STDAIR_Types.hpp>
+#include <stdair/bom/BomKey.hpp>
+
+
+namespace stdair {
+  struct FDKey_T : public BomKey_T {
+
+    // /////////// Display support methods /////////
+    void toStream (std::ostream& ioOut) const {
+      ioOut << "FDKey: " << toString() << std::endl;
+    }
+
+    void fromStream (std::istream& ioIn) {
+    }
+
+    const std::string toString() const {
+      std::ostringstream oStr;
+      oStr << _flightNumber;
+      return oStr.str();
+    }
+    
+    const std::string describe() const {
+      return toString();
+    }
+
+  public:
+    // /////////// Construction ///////////
+    /** Constructors. */
+    FDKey_T (const int& iFlightNumber) : _flightNumber (iFlightNumber) { }
+    FDKey_T (const FDKey_T& iKey)
+      : _flightNumber (iKey._flightNumber) { }
+    /** Destructor. */
+    ~FDKey_T () { }
+
+  private:
+    // Attributes
+    /** Flight number. */
+    int _flightNumber;
+
+  };
+}
+
+#endif // __STDAIR_BOM_FDKEY_HPP

Copied: trunk/stdair/stdair/bom/FDTypes.hpp (from rev 165, trunk/stdair/stdair/bom/INTypes.hpp)
===================================================================
--- trunk/stdair/stdair/bom/FDTypes.hpp	                        (rev 0)
+++ trunk/stdair/stdair/bom/FDTypes.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -0,0 +1,31 @@
+// //////////////////////////////////////////////////////////////////////
+#ifndef __STDAIR_BOM_FDTYPES_HPP
+#define __STDAIR_BOM_FDTYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+
+namespace stdair {
+  // Forward declarations.
+  template <typename CONTENT> class Structure;
+  template <typename CONTENT> class BomChildrenHolderImp;
+  template <typename BOM> struct BomList_T;
+  template <typename BOM> struct BomMap_T;
+  class FD;
+  
+  /** Define the BomRootStructure. */
+  typedef Structure<FD> FDStructure_T;
+
+  /** Define the Inventory holder type. */
+  typedef BomChildrenHolderImp<FD> FDHolder_T;
+
+  /** Define the Inventory list. */
+  typedef BomList_T<FD> FDList_T;
+  
+  /** Define the Inventory map. */
+  typedef BomMap_T<FD> FDMap_T;
+  
+}
+#endif // __STDAIR_BOM_FDTYPES_HPP
+

Modified: trunk/stdair/stdair/bom/IN.hpp
===================================================================
--- trunk/stdair/stdair/bom/IN.hpp	2010-04-06 12:47:26 UTC (rev 165)
+++ trunk/stdair/stdair/bom/IN.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -9,8 +9,10 @@
 // STDAIR 
 #include <stdair/bom/Structure.hpp>
 #include <stdair/bom/BomContent.hpp>
+#include <stdair/bom/INKey.hpp>
 #include <stdair/bom/INTypes.hpp>
-#include <stdair/bom/INKey.hpp>
+#include <stdair/bom/FDTypes.hpp>
+#include <stdair/bom/NDTypes.hpp>
 
 namespace stdair {
   // Forward declarations.
@@ -29,8 +31,11 @@
     /** Definition allowing to retrieve the associated BOM key type. */
     typedef INKey_T Key_T;
     
+/** Define the list of children holder types. */
+    typedef boost::fusion::map<
+      boost::fusion::pair<FD, FDHolder_T*>, 
+      boost::fusion::pair<ND, NDHolder_T*> > ChildrenHolderTypeMap_T;
     // /////////////////////////////////////////////////////////////////////////
-
     
   public:
     // /////////// Display support methods /////////
@@ -47,16 +52,18 @@
     
     /** Get a string describing the whole key (differentiating two objects
         at any level). */
-    const std::string describeKey() const { return std::string (""); }
+    const std::string describeKey() const { return _key.describe(); }
 
     /** Get a string describing the short key (differentiating two objects
         at the same level). */
-    const std::string describeShortKey() const { return std::string (""); }
+    const std::string describeShortKey() const { return _key.describe(); }
 
     
   public:
     // /////////// Getters /////////////
-
+    const Key_T& getKey () const {
+      return _key;
+    }
     
   public:
     // //////////// Setters //////////////
@@ -73,9 +80,10 @@
     /** Default constructors. */
     IN ();
     IN (const IN&);
-    IN (const Key_T&, Structure_T&);
+    IN (const Key_T& iKey, Structure_T& ioStructure) 
+      : _key (iKey), _structure (ioStructure) { }
     /** Destructor. */
-    virtual ~IN();
+    virtual ~IN() { }
 
   private:
     // Attributes

Modified: trunk/stdair/stdair/bom/INKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/INKey.hpp	2010-04-06 12:47:26 UTC (rev 165)
+++ trunk/stdair/stdair/bom/INKey.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -1,9 +1,49 @@
 #ifndef __STDAIR_BOM_INKEY_HPP
 #define __STDAIR_BOM_INKEY_HPP
 
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STDAIR
+#include <stdair/STDAIR_Types.hpp>
+#include <stdair/bom/BomKey.hpp>
+
+
 namespace stdair {
-  struct INKey_T {
+  struct INKey_T : public BomKey_T {
 
+    // /////////// Display support methods /////////
+    void toStream (std::ostream& ioOut) const {
+      ioOut << "INKey: " << toString() << std::endl;
+    }
+
+    void fromStream (std::istream& ioIn) {
+    }
+
+    const std::string toString() const {
+      std::ostringstream oStr;
+      oStr << _airlineCode;
+      return oStr.str();
+    }
+    
+    const std::string describe() const {
+      return toString();
+    }
+
+  public:
+    // /////////// Construction ///////////
+    /** Constructors. */
+    INKey_T (const AirlineCode_T& iAirlineCode) : _airlineCode (iAirlineCode) { }
+    INKey_T (const INKey_T& iKey)
+      : _airlineCode (iKey._airlineCode) { }
+    /** Destructor. */
+    ~INKey_T () { }
+
+  private:
+    // Attributes
+    /** Airline code. */
+    AirlineCode_T _airlineCode;
+
   };
 }
 

Modified: trunk/stdair/stdair/bom/INTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/INTypes.hpp	2010-04-06 12:47:26 UTC (rev 165)
+++ trunk/stdair/stdair/bom/INTypes.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -10,6 +10,8 @@
   // Forward declarations.
   template <typename CONTENT> class Structure;
   template <typename CONTENT> class BomChildrenHolderImp;
+  template <typename BOM> struct BomList_T;
+  template <typename BOM> struct BomMap_T;
   class IN;
   
   /** Define the BomRootStructure. */
@@ -18,6 +20,12 @@
   /** Define the Inventory holder type. */
   typedef BomChildrenHolderImp<IN> INHolder_T;
 
+  /** Define the Inventory list. */
+  typedef BomList_T<IN> INList_T;
+  
+  /** Define the Inventory map. */
+  typedef BomMap_T<IN> INMap_T;
+  
 }
 #endif // __STDAIR_BOM_INTYPES_HPP
 

Modified: trunk/stdair/stdair/bom/InventoryKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/InventoryKey.hpp	2010-04-06 12:47:26 UTC (rev 165)
+++ trunk/stdair/stdair/bom/InventoryKey.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -10,7 +10,6 @@
 #include <stdair/bom/BomRootKey.hpp>
 
 namespace stdair {
-
   /** Key of inventory. */
   struct InventoryKey_T : public BomKey_T {
     friend struct FlightDateKey_T;
@@ -28,7 +27,6 @@
     /** Constructors. */
     InventoryKey_T (const AirlineCode_T& iAirlineCode);
     InventoryKey_T (const InventoryKey_T&);
-
     /** Destructor. */
     ~InventoryKey_T ();
     

Copied: trunk/stdair/stdair/bom/ND.hpp (from rev 165, trunk/stdair/stdair/bom/IN.hpp)
===================================================================
--- trunk/stdair/stdair/bom/ND.hpp	                        (rev 0)
+++ trunk/stdair/stdair/bom/ND.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -0,0 +1,96 @@
+#ifndef __STDAIR_BOM_ND_HPP
+#define __STDAIR_BOM_ND_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <iosfwd>
+// STDAIR 
+#include <stdair/bom/Structure.hpp>
+#include <stdair/bom/BomContent.hpp>
+#include <stdair/bom/NDKey.hpp>
+#include <stdair/bom/NDTypes.hpp>
+
+namespace stdair {
+  // Forward declarations.
+  class FacBomContent;
+  
+  /** Class representing the actual functional/business content
+      for the Bom root. */
+  class ND : public BomContent {
+    friend class FacBomContent;
+    
+  public:
+    // /////////////////////////////////////////////////////////////////////////
+    /** Definition allowing to retrieve the associated BOM structure type. */
+    typedef NDStructure_T Structure_T;
+
+    /** Definition allowing to retrieve the associated BOM key type. */
+    typedef NDKey_T Key_T;
+    
+/** Define the list of children holder types. */
+    typedef boost::fusion::map< > ChildrenHolderTypeMap_T;
+    // /////////////////////////////////////////////////////////////////////////
+
+    
+  public:
+    // /////////// Display support methods /////////
+    /** Dump a Business Object into an output stream.
+        @param ostream& the output stream. */
+    void toStream (std::ostream& ioOut) const { ioOut << toString(); }
+
+    /** Read a Business Object from an input stream.
+        @param istream& the input stream. */
+    void fromStream (std::istream& ioIn) { }
+
+   /** Get the serialised version of the Business Object. */
+    std::string toString() const { return describeKey(); }
+    
+    /** Get a string describing the whole key (differentiating two objects
+        at any level). */
+    const std::string describeKey() const { return _key.describe(); }
+
+    /** Get a string describing the short key (differentiating two objects
+        at the same level). */
+    const std::string describeShortKey() const { return _key.describe(); }
+
+    
+  public:
+    // /////////// Getters /////////////
+    const Key_T& getKey () const {
+      return _key;
+    }
+    
+  public:
+    // //////////// Setters //////////////
+
+  private:     
+    /** Retrieve the BOM structure object. */
+    Structure_T& getStructure () {
+      return _structure;
+    }
+    
+  protected:
+    /** Constructors are private so as to force the usage of the Factory
+        layer. */
+    /** Default constructors. */
+    ND ();
+    ND (const ND&);
+    ND (const Key_T& iKey, Structure_T& ioStructure) 
+      : _key (iKey), _structure (ioStructure) { }
+    /** Destructor. */
+    virtual ~ND() { }
+
+  private:
+    // Attributes
+    /** Key. */
+    Key_T _key;
+    
+    /** Reference structure. */
+    Structure_T& _structure;
+
+  };
+
+}
+#endif // __STDAIR_BOM_ND_HPP

Copied: trunk/stdair/stdair/bom/NDKey.hpp (from rev 165, trunk/stdair/stdair/bom/INKey.hpp)
===================================================================
--- trunk/stdair/stdair/bom/NDKey.hpp	                        (rev 0)
+++ trunk/stdair/stdair/bom/NDKey.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -0,0 +1,50 @@
+#ifndef __STDAIR_BOM_NDKEY_HPP
+#define __STDAIR_BOM_NDKEY_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STDAIR
+#include <stdair/STDAIR_Types.hpp>
+#include <stdair/bom/BomKey.hpp>
+
+
+namespace stdair {
+  struct NDKey_T : public BomKey_T {
+
+    // /////////// Display support methods /////////
+    void toStream (std::ostream& ioOut) const {
+      ioOut << "NDKey: " << toString() << std::endl;
+    }
+
+    void fromStream (std::istream& ioIn) {
+    }
+
+    const std::string toString() const {
+      std::ostringstream oStr;
+      oStr << _networkNumber;
+      return oStr.str();
+    }
+    
+    const std::string describe() const {
+      return toString();
+    }
+
+  public:
+    // /////////// Construction ///////////
+    /** Constructors. */
+    NDKey_T (const int& iNetworkNumber) : _networkNumber (iNetworkNumber) { }
+    NDKey_T (const NDKey_T& iKey)
+      : _networkNumber (iKey._networkNumber) { }
+    /** Destructor. */
+    ~NDKey_T () { }
+
+  private:
+    // Attributes
+    /** Network number. */
+    int _networkNumber;
+
+  };
+}
+
+#endif // __STDAIR_BOM_NDKEY_HPP

Copied: trunk/stdair/stdair/bom/NDTypes.hpp (from rev 165, trunk/stdair/stdair/bom/INTypes.hpp)
===================================================================
--- trunk/stdair/stdair/bom/NDTypes.hpp	                        (rev 0)
+++ trunk/stdair/stdair/bom/NDTypes.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -0,0 +1,31 @@
+// //////////////////////////////////////////////////////////////////////
+#ifndef __STDAIR_BOM_NDTYPES_HPP
+#define __STDAIR_BOM_NDTYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+
+namespace stdair {
+  // Forward declarations.
+  template <typename CONTENT> class Structure;
+  template <typename CONTENT> class BomChildrenHolderImp;
+  template <typename BOM> struct BomList_T;
+  template <typename BOM> struct BomMap_T;
+  class ND;
+  
+  /** Define the BomRootStructure. */
+  typedef Structure<ND> NDStructure_T;
+
+  /** Define the Inventory holder type. */
+  typedef BomChildrenHolderImp<ND> NDHolder_T;
+
+  /** Define the Inventory list. */
+  typedef BomList_T<ND> NDList_T;
+  
+  /** Define the Inventory map. */
+  typedef BomMap_T<ND> NDMap_T;
+  
+}
+#endif // __STDAIR_BOM_NDTYPES_HPP
+

Modified: trunk/stdair/stdair/bom/Structure.hpp
===================================================================
--- trunk/stdair/stdair/bom/Structure.hpp	2010-04-06 12:47:26 UTC (rev 165)
+++ trunk/stdair/stdair/bom/Structure.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -28,7 +28,7 @@
 
   public:
     // ////////// GETTERS ////////////
-    const Key_T& getKey () {
+    const Key_T& getKey () const {
       assert (_content != NULL);
       return _content->getKey();
     }

Modified: trunk/stdair/stdair/bom/sources.mk
===================================================================
--- trunk/stdair/stdair/bom/sources.mk	2010-04-06 12:47:26 UTC (rev 165)
+++ trunk/stdair/stdair/bom/sources.mk	2010-04-06 14:19:00 UTC (rev 166)
@@ -1,157 +1,163 @@
 bom_h_sources = \
-				$(top_srcdir)/stdair/bom/BomList.hpp \
-				$(top_srcdir)/stdair/bom/BomMap.hpp \
-				$(top_srcdir)/stdair/bom/BomKey.hpp \
-				$(top_srcdir)/stdair/bom/BomRootKey.hpp \
-				$(top_srcdir)/stdair/bom/InventoryKey.hpp \
-				$(top_srcdir)/stdair/bom/FlightDateKey.hpp \
-				$(top_srcdir)/stdair/bom/LegDateKey.hpp \
-				$(top_srcdir)/stdair/bom/LegCabinKey.hpp \
-				$(top_srcdir)/stdair/bom/SegmentDateKey.hpp \
-				$(top_srcdir)/stdair/bom/SegmentCabinKey.hpp \
-				$(top_srcdir)/stdair/bom/BookingClassKey.hpp \
-				$(top_srcdir)/stdair/bom/NetworkKey.hpp \
-				$(top_srcdir)/stdair/bom/NetworkDateKey.hpp \
-				$(top_srcdir)/stdair/bom/AirportDateKey.hpp \
-				$(top_srcdir)/stdair/bom/OutboundPathKey.hpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureSetKey.hpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureKey.hpp \
-				$(top_srcdir)/stdair/bom/DemandStreamKey.hpp \
-				$(top_srcdir)/stdair/bom/BomRootTypes.hpp \
-				$(top_srcdir)/stdair/bom/BomRoot.hpp \
-				$(top_srcdir)/stdair/bom/BomContent.hpp \
-				$(top_srcdir)/stdair/bom/BomRootContent.hpp \
-				$(top_srcdir)/stdair/bom/BomStopContent.hpp \
-				$(top_srcdir)/stdair/bom/BomStructure.hpp \
-				$(top_srcdir)/stdair/bom/BomRootStructure.hpp \
-				$(top_srcdir)/stdair/bom/BomStopStructure.hpp \
-				$(top_srcdir)/stdair/bom/Inventory.hpp \
-				$(top_srcdir)/stdair/bom/InventoryContent.hpp \
-				$(top_srcdir)/stdair/bom/InventoryTypes.hpp \
-				$(top_srcdir)/stdair/bom/InventoryStructure.hpp \
-				$(top_srcdir)/stdair/bom/FlightDate.hpp \
-				$(top_srcdir)/stdair/bom/FlightDateContent.hpp \
-				$(top_srcdir)/stdair/bom/FlightDateTypes.hpp \
-				$(top_srcdir)/stdair/bom/FlightDateStructure.hpp \
-				$(top_srcdir)/stdair/bom/SegmentDate.hpp \
-				$(top_srcdir)/stdair/bom/SegmentDateContent.hpp \
-				$(top_srcdir)/stdair/bom/SegmentDateTypes.hpp \
-				$(top_srcdir)/stdair/bom/SegmentDateStructure.hpp \
-				$(top_srcdir)/stdair/bom/LegDate.hpp \
-				$(top_srcdir)/stdair/bom/LegDateContent.hpp \
-				$(top_srcdir)/stdair/bom/LegDateTypes.hpp \
-				$(top_srcdir)/stdair/bom/LegDateStructure.hpp \
-				$(top_srcdir)/stdair/bom/SegmentCabin.hpp \
-				$(top_srcdir)/stdair/bom/SegmentCabinContent.hpp \
-				$(top_srcdir)/stdair/bom/SegmentCabinTypes.hpp \
-				$(top_srcdir)/stdair/bom/SegmentCabinStructure.hpp \
-				$(top_srcdir)/stdair/bom/LegCabin.hpp \
-				$(top_srcdir)/stdair/bom/LegCabinContent.hpp \
-				$(top_srcdir)/stdair/bom/LegCabinTypes.hpp \
-				$(top_srcdir)/stdair/bom/LegCabinStructure.hpp \
-				$(top_srcdir)/stdair/bom/BookingClass.hpp \
-				$(top_srcdir)/stdair/bom/BookingClassContent.hpp \
-				$(top_srcdir)/stdair/bom/BookingClassTypes.hpp \
-				$(top_srcdir)/stdair/bom/BookingClassStructure.hpp \
-				$(top_srcdir)/stdair/bom/Network.hpp \
-				$(top_srcdir)/stdair/bom/NetworkContent.hpp \
-				$(top_srcdir)/stdair/bom/NetworkTypes.hpp \
-				$(top_srcdir)/stdair/bom/NetworkStructure.hpp \
-				$(top_srcdir)/stdair/bom/NetworkDate.hpp \
-				$(top_srcdir)/stdair/bom/NetworkDateContent.hpp \
-				$(top_srcdir)/stdair/bom/NetworkDateTypes.hpp \
-				$(top_srcdir)/stdair/bom/NetworkDateStructure.hpp \
-				$(top_srcdir)/stdair/bom/AirportDate.hpp \
-				$(top_srcdir)/stdair/bom/AirportDateContent.hpp \
-				$(top_srcdir)/stdair/bom/AirportDateTypes.hpp \
-				$(top_srcdir)/stdair/bom/AirportDateStructure.hpp \
-				$(top_srcdir)/stdair/bom/OutboundPath.hpp \
-				$(top_srcdir)/stdair/bom/OutboundPathContent.hpp \
-				$(top_srcdir)/stdair/bom/OutboundPathTypes.hpp \
-				$(top_srcdir)/stdair/bom/OutboundPathStructure.hpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureSet.hpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureSetContent.hpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureSetTypes.hpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureSetStructure.hpp \
-				$(top_srcdir)/stdair/bom/AirlineFeature.hpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureContent.hpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureTypes.hpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureStructure.hpp \
-				$(top_srcdir)/stdair/bom/BomChildrenHolder.hpp \
-				$(top_srcdir)/stdair/bom/BomChildrenHolderImp.hpp \
-				$(top_srcdir)/stdair/bom/BomIterator.hpp \
-				$(top_srcdir)/stdair/bom/OptimizerStruct.hpp \
-				$(top_srcdir)/stdair/bom/DoWStruct.hpp \
-				$(top_srcdir)/stdair/bom/TravelSolutionStruct.hpp \
-				$(top_srcdir)/stdair/bom/TravelSolutionTypes.hpp \
-				$(top_srcdir)/stdair/bom/BookingRequestStruct.hpp \
-				$(top_srcdir)/stdair/bom/AirlineStruct.hpp \
-				$(top_srcdir)/stdair/bom/DemandStreamStructure.hpp \
-				$(top_srcdir)/stdair/bom/DemandStreamContent.hpp \
-				$(top_srcdir)/stdair/bom/DemandStream.hpp \
-				$(top_srcdir)/stdair/bom/DemandStreamTypes.hpp \
-				$(top_srcdir)/stdair/bom/EventStruct.hpp \
-				$(top_srcdir)/stdair/bom/EventQueue.hpp \
-				$(top_srcdir)/stdair/bom/EventTypes.hpp \
-				$(top_srcdir)/stdair/bom/BomManager.hpp \
-				$(top_srcdir)/stdair/bom/Structure.hpp \
-				$(top_srcdir)/stdair/bom/BR.hpp \
-				$(top_srcdir)/stdair/bom/BRKey.hpp \
-				$(top_srcdir)/stdair/bom/BRTypes.hpp \
-				$(top_srcdir)/stdair/bom/IN.hpp \
-				$(top_srcdir)/stdair/bom/INKey.hpp \
-				$(top_srcdir)/stdair/bom/INTypes.hpp
+		$(top_srcdir)/stdair/bom/BomList.hpp \
+		$(top_srcdir)/stdair/bom/BomMap.hpp \
+		$(top_srcdir)/stdair/bom/BomKey.hpp \
+		$(top_srcdir)/stdair/bom/BomRootKey.hpp \
+		$(top_srcdir)/stdair/bom/InventoryKey.hpp \
+		$(top_srcdir)/stdair/bom/FlightDateKey.hpp \
+		$(top_srcdir)/stdair/bom/LegDateKey.hpp \
+		$(top_srcdir)/stdair/bom/LegCabinKey.hpp \
+		$(top_srcdir)/stdair/bom/SegmentDateKey.hpp \
+		$(top_srcdir)/stdair/bom/SegmentCabinKey.hpp \
+		$(top_srcdir)/stdair/bom/BookingClassKey.hpp \
+		$(top_srcdir)/stdair/bom/NetworkKey.hpp \
+		$(top_srcdir)/stdair/bom/NetworkDateKey.hpp \
+		$(top_srcdir)/stdair/bom/AirportDateKey.hpp \
+		$(top_srcdir)/stdair/bom/OutboundPathKey.hpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureSetKey.hpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureKey.hpp \
+		$(top_srcdir)/stdair/bom/DemandStreamKey.hpp \
+		$(top_srcdir)/stdair/bom/BomRootTypes.hpp \
+		$(top_srcdir)/stdair/bom/BomRoot.hpp \
+		$(top_srcdir)/stdair/bom/BomContent.hpp \
+		$(top_srcdir)/stdair/bom/BomRootContent.hpp \
+		$(top_srcdir)/stdair/bom/BomStopContent.hpp \
+		$(top_srcdir)/stdair/bom/BomStructure.hpp \
+		$(top_srcdir)/stdair/bom/BomRootStructure.hpp \
+		$(top_srcdir)/stdair/bom/BomStopStructure.hpp \
+		$(top_srcdir)/stdair/bom/Inventory.hpp \
+		$(top_srcdir)/stdair/bom/InventoryContent.hpp \
+		$(top_srcdir)/stdair/bom/InventoryTypes.hpp \
+		$(top_srcdir)/stdair/bom/InventoryStructure.hpp \
+		$(top_srcdir)/stdair/bom/FlightDate.hpp \
+		$(top_srcdir)/stdair/bom/FlightDateContent.hpp \
+		$(top_srcdir)/stdair/bom/FlightDateTypes.hpp \
+		$(top_srcdir)/stdair/bom/FlightDateStructure.hpp \
+		$(top_srcdir)/stdair/bom/SegmentDate.hpp \
+		$(top_srcdir)/stdair/bom/SegmentDateContent.hpp \
+		$(top_srcdir)/stdair/bom/SegmentDateTypes.hpp \
+		$(top_srcdir)/stdair/bom/SegmentDateStructure.hpp \
+		$(top_srcdir)/stdair/bom/LegDate.hpp \
+		$(top_srcdir)/stdair/bom/LegDateContent.hpp \
+		$(top_srcdir)/stdair/bom/LegDateTypes.hpp \
+		$(top_srcdir)/stdair/bom/LegDateStructure.hpp \
+		$(top_srcdir)/stdair/bom/SegmentCabin.hpp \
+		$(top_srcdir)/stdair/bom/SegmentCabinContent.hpp \
+		$(top_srcdir)/stdair/bom/SegmentCabinTypes.hpp \
+		$(top_srcdir)/stdair/bom/SegmentCabinStructure.hpp \
+		$(top_srcdir)/stdair/bom/LegCabin.hpp \
+		$(top_srcdir)/stdair/bom/LegCabinContent.hpp \
+		$(top_srcdir)/stdair/bom/LegCabinTypes.hpp \
+		$(top_srcdir)/stdair/bom/LegCabinStructure.hpp \
+		$(top_srcdir)/stdair/bom/BookingClass.hpp \
+		$(top_srcdir)/stdair/bom/BookingClassContent.hpp \
+		$(top_srcdir)/stdair/bom/BookingClassTypes.hpp \
+		$(top_srcdir)/stdair/bom/BookingClassStructure.hpp \
+		$(top_srcdir)/stdair/bom/Network.hpp \
+		$(top_srcdir)/stdair/bom/NetworkContent.hpp \
+		$(top_srcdir)/stdair/bom/NetworkTypes.hpp \
+		$(top_srcdir)/stdair/bom/NetworkStructure.hpp \
+		$(top_srcdir)/stdair/bom/NetworkDate.hpp \
+		$(top_srcdir)/stdair/bom/NetworkDateContent.hpp \
+		$(top_srcdir)/stdair/bom/NetworkDateTypes.hpp \
+		$(top_srcdir)/stdair/bom/NetworkDateStructure.hpp \
+		$(top_srcdir)/stdair/bom/AirportDate.hpp \
+		$(top_srcdir)/stdair/bom/AirportDateContent.hpp \
+		$(top_srcdir)/stdair/bom/AirportDateTypes.hpp \
+		$(top_srcdir)/stdair/bom/AirportDateStructure.hpp \
+		$(top_srcdir)/stdair/bom/OutboundPath.hpp \
+		$(top_srcdir)/stdair/bom/OutboundPathContent.hpp \
+		$(top_srcdir)/stdair/bom/OutboundPathTypes.hpp \
+		$(top_srcdir)/stdair/bom/OutboundPathStructure.hpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureSet.hpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureSetContent.hpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureSetTypes.hpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureSetStructure.hpp \
+		$(top_srcdir)/stdair/bom/AirlineFeature.hpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureContent.hpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureTypes.hpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureStructure.hpp \
+		$(top_srcdir)/stdair/bom/BomChildrenHolder.hpp \
+		$(top_srcdir)/stdair/bom/BomChildrenHolderImp.hpp \
+		$(top_srcdir)/stdair/bom/BomIterator.hpp \
+		$(top_srcdir)/stdair/bom/OptimizerStruct.hpp \
+		$(top_srcdir)/stdair/bom/DoWStruct.hpp \
+		$(top_srcdir)/stdair/bom/TravelSolutionStruct.hpp \
+		$(top_srcdir)/stdair/bom/TravelSolutionTypes.hpp \
+		$(top_srcdir)/stdair/bom/BookingRequestStruct.hpp \
+		$(top_srcdir)/stdair/bom/AirlineStruct.hpp \
+		$(top_srcdir)/stdair/bom/DemandStreamStructure.hpp \
+		$(top_srcdir)/stdair/bom/DemandStreamContent.hpp \
+		$(top_srcdir)/stdair/bom/DemandStream.hpp \
+		$(top_srcdir)/stdair/bom/DemandStreamTypes.hpp \
+		$(top_srcdir)/stdair/bom/EventStruct.hpp \
+		$(top_srcdir)/stdair/bom/EventQueue.hpp \
+		$(top_srcdir)/stdair/bom/EventTypes.hpp \
+		$(top_srcdir)/stdair/bom/BomManager.hpp \
+		$(top_srcdir)/stdair/bom/Structure.hpp \
+		$(top_srcdir)/stdair/bom/BS.hpp \
+		$(top_srcdir)/stdair/bom/BSKey.hpp \
+		$(top_srcdir)/stdair/bom/BSTypes.hpp \
+		$(top_srcdir)/stdair/bom/BRKey.hpp \
+		$(top_srcdir)/stdair/bom/BRTypes.hpp \
+		$(top_srcdir)/stdair/bom/IN.hpp \
+		$(top_srcdir)/stdair/bom/INKey.hpp \
+		$(top_srcdir)/stdair/bom/FDTypes.hpp \
+		$(top_srcdir)/stdair/bom/FDKey.hpp \
+		$(top_srcdir)/stdair/bom/NDTypes.hpp \
+		$(top_srcdir)/stdair/bom/NDKey.hpp \
+		$(top_srcdir)/stdair/bom/NDTypes.hpp
 bom_cc_sources = \
-				$(top_srcdir)/stdair/bom/BomRootKey.cpp \
-				$(top_srcdir)/stdair/bom/InventoryKey.cpp \
-				$(top_srcdir)/stdair/bom/FlightDateKey.cpp \
-				$(top_srcdir)/stdair/bom/LegDateKey.cpp \
-				$(top_srcdir)/stdair/bom/LegCabinKey.cpp \
-				$(top_srcdir)/stdair/bom/SegmentDateKey.cpp \
-				$(top_srcdir)/stdair/bom/SegmentCabinKey.cpp \
-				$(top_srcdir)/stdair/bom/BookingClassKey.cpp \
-				$(top_srcdir)/stdair/bom/NetworkKey.cpp \
-				$(top_srcdir)/stdair/bom/NetworkDateKey.cpp \
-				$(top_srcdir)/stdair/bom/AirportDateKey.cpp \
-				$(top_srcdir)/stdair/bom/OutboundPathKey.cpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureSetKey.cpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureKey.cpp \
-				$(top_srcdir)/stdair/bom/DemandStreamKey.cpp \
-				$(top_srcdir)/stdair/bom/BomRoot.cpp \
-				$(top_srcdir)/stdair/bom/BomRootContent.cpp \
-				$(top_srcdir)/stdair/bom/Inventory.cpp \
-				$(top_srcdir)/stdair/bom/InventoryContent.cpp \
-				$(top_srcdir)/stdair/bom/FlightDate.cpp \
-				$(top_srcdir)/stdair/bom/FlightDateContent.cpp \
-				$(top_srcdir)/stdair/bom/SegmentDate.cpp \
-				$(top_srcdir)/stdair/bom/SegmentDateContent.cpp \
-				$(top_srcdir)/stdair/bom/LegDate.cpp \
-				$(top_srcdir)/stdair/bom/LegDateContent.cpp \
-				$(top_srcdir)/stdair/bom/SegmentCabin.cpp \
-				$(top_srcdir)/stdair/bom/SegmentCabinContent.cpp \
-				$(top_srcdir)/stdair/bom/LegCabin.cpp \
-				$(top_srcdir)/stdair/bom/LegCabinContent.cpp \
-				$(top_srcdir)/stdair/bom/BookingClass.cpp \
-				$(top_srcdir)/stdair/bom/BookingClassContent.cpp \
-				$(top_srcdir)/stdair/bom/Network.cpp \
-				$(top_srcdir)/stdair/bom/NetworkContent.cpp \
-				$(top_srcdir)/stdair/bom/NetworkDate.cpp \
-				$(top_srcdir)/stdair/bom/NetworkDateContent.cpp \
-				$(top_srcdir)/stdair/bom/AirportDate.cpp \
-				$(top_srcdir)/stdair/bom/AirportDateContent.cpp \
-				$(top_srcdir)/stdair/bom/OutboundPath.cpp \
-				$(top_srcdir)/stdair/bom/OutboundPathContent.cpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureSet.cpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureSetContent.cpp \
-				$(top_srcdir)/stdair/bom/AirlineFeature.cpp \
-				$(top_srcdir)/stdair/bom/AirlineFeatureContent.cpp \
-				$(top_srcdir)/stdair/bom/OptimizerStruct.cpp \
-				$(top_srcdir)/stdair/bom/DoWStruct.cpp \
-				$(top_srcdir)/stdair/bom/TravelSolutionStruct.cpp \
-				$(top_srcdir)/stdair/bom/BookingRequestStruct.cpp \
-				$(top_srcdir)/stdair/bom/AirlineStruct.cpp \
-				$(top_srcdir)/stdair/bom/DemandStreamContent.cpp \
-				$(top_srcdir)/stdair/bom/DemandStream.cpp \
-				$(top_srcdir)/stdair/bom/EventStruct.cpp \
-				$(top_srcdir)/stdair/bom/EventQueue.cpp \
-				$(top_srcdir)/stdair/bom/BomManager.cpp
+		$(top_srcdir)/stdair/bom/BomRootKey.cpp \
+		$(top_srcdir)/stdair/bom/InventoryKey.cpp \
+		$(top_srcdir)/stdair/bom/FlightDateKey.cpp \
+		$(top_srcdir)/stdair/bom/LegDateKey.cpp \
+		$(top_srcdir)/stdair/bom/LegCabinKey.cpp \
+		$(top_srcdir)/stdair/bom/SegmentDateKey.cpp \
+		$(top_srcdir)/stdair/bom/SegmentCabinKey.cpp \
+		$(top_srcdir)/stdair/bom/BookingClassKey.cpp \
+		$(top_srcdir)/stdair/bom/NetworkKey.cpp \
+		$(top_srcdir)/stdair/bom/NetworkDateKey.cpp \
+		$(top_srcdir)/stdair/bom/AirportDateKey.cpp \
+		$(top_srcdir)/stdair/bom/OutboundPathKey.cpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureSetKey.cpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureKey.cpp \
+		$(top_srcdir)/stdair/bom/DemandStreamKey.cpp \
+		$(top_srcdir)/stdair/bom/BomRoot.cpp \
+		$(top_srcdir)/stdair/bom/BomRootContent.cpp \
+		$(top_srcdir)/stdair/bom/Inventory.cpp \
+		$(top_srcdir)/stdair/bom/InventoryContent.cpp \
+		$(top_srcdir)/stdair/bom/FlightDate.cpp \
+		$(top_srcdir)/stdair/bom/FlightDateContent.cpp \
+		$(top_srcdir)/stdair/bom/SegmentDate.cpp \
+		$(top_srcdir)/stdair/bom/SegmentDateContent.cpp \
+		$(top_srcdir)/stdair/bom/LegDate.cpp \
+		$(top_srcdir)/stdair/bom/LegDateContent.cpp \
+		$(top_srcdir)/stdair/bom/SegmentCabin.cpp \
+		$(top_srcdir)/stdair/bom/SegmentCabinContent.cpp \
+		$(top_srcdir)/stdair/bom/LegCabin.cpp \
+		$(top_srcdir)/stdair/bom/LegCabinContent.cpp \
+		$(top_srcdir)/stdair/bom/BookingClass.cpp \
+		$(top_srcdir)/stdair/bom/BookingClassContent.cpp \
+		$(top_srcdir)/stdair/bom/Network.cpp \
+		$(top_srcdir)/stdair/bom/NetworkContent.cpp \
+		$(top_srcdir)/stdair/bom/NetworkDate.cpp \
+		$(top_srcdir)/stdair/bom/NetworkDateContent.cpp \
+		$(top_srcdir)/stdair/bom/AirportDate.cpp \
+		$(top_srcdir)/stdair/bom/AirportDateContent.cpp \
+		$(top_srcdir)/stdair/bom/OutboundPath.cpp \
+		$(top_srcdir)/stdair/bom/OutboundPathContent.cpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureSet.cpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureSetContent.cpp \
+		$(top_srcdir)/stdair/bom/AirlineFeature.cpp \
+		$(top_srcdir)/stdair/bom/AirlineFeatureContent.cpp \
+		$(top_srcdir)/stdair/bom/OptimizerStruct.cpp \
+		$(top_srcdir)/stdair/bom/DoWStruct.cpp \
+		$(top_srcdir)/stdair/bom/TravelSolutionStruct.cpp \
+		$(top_srcdir)/stdair/bom/BookingRequestStruct.cpp \
+		$(top_srcdir)/stdair/bom/AirlineStruct.cpp \
+		$(top_srcdir)/stdair/bom/DemandStreamContent.cpp \
+		$(top_srcdir)/stdair/bom/DemandStream.cpp \
+		$(top_srcdir)/stdair/bom/EventStruct.cpp \
+		$(top_srcdir)/stdair/bom/EventQueue.cpp \
+		$(top_srcdir)/stdair/bom/BomManager.cpp

Modified: trunk/stdair/stdair/factory/FacBomContent.hpp
===================================================================
--- trunk/stdair/stdair/factory/FacBomContent.hpp	2010-04-06 12:47:26 UTC (rev 165)
+++ trunk/stdair/stdair/factory/FacBomContent.hpp	2010-04-06 14:19:00 UTC (rev 166)
@@ -40,6 +40,7 @@
 
 
     // //////////////////////////////////////////////////////////////////
+
   public:
     template <typename CONTENT>
     CONTENT& testCreate (const typename CONTENT::Key_T& iKey) {
@@ -72,6 +73,7 @@
       ioStructure._content = &ioContent;
     }
 
+    // //////////////////////////////////////////////////////////////////
 
 
 
@@ -79,7 +81,8 @@
 
 
 
-    // //////////////////////////////////////////////////////////////////
+
+
     
   public:
     /** Create the root of the BOM tree, i.e., a pair of linked


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.