Menu
▾
▴
stdair-svn
|
From: <den...@us...> - 2010-09-16 08:00:33
|
Revision: 332
http://stdair.svn.sourceforge.net/stdair/?rev=332&view=rev
Author: denis_arnaud
Date: 2010-09-16 08:00:27 +0000 (Thu, 16 Sep 2010)
Log Message:
-----------
[Release 0.5.0] Release of the 0.5.0 version.
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/stdair.spec
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2010-09-15 12:50:01 UTC (rev 331)
+++ trunk/stdair/configure.ac 2010-09-16 08:00:27 UTC (rev 332)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
-AC_INIT([STDAIR],[99.99.99],[den...@us...],[stdair])
+AC_INIT([STDAIR],[0.5.0],[den...@us...],[stdair])
AC_CONFIG_HEADER([stdair/config.h])
AC_CONFIG_SRCDIR([stdair/bom/BomRoot.hpp])
AC_CONFIG_AUX_DIR([config])
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# Shared library versioning
-GENERIC_LIBRARY_VERSION="99:99:99"
+GENERIC_LIBRARY_VERSION="0:5:0"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-09-15 12:50:01 UTC (rev 331)
+++ trunk/stdair/stdair.spec 2010-09-16 08:00:27 UTC (rev 332)
@@ -2,7 +2,7 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 99.99.99
+Version: 0.5.0
Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
@@ -111,7 +111,7 @@
%changelog
-* Sun Aug 30 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
+* Sun Aug 30 2010 Son Nguyen Kim <ngu...@gm...> 0.5.0-1
- Upstream update
* Fri Sep 03 2010 Son Nguyen Kim <ngu...@gm...> 0.4.0-1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-10-14 11:13:16
|
Revision: 344
http://stdair.svn.sourceforge.net/stdair/?rev=344&view=rev
Author: denis_arnaud
Date: 2010-10-14 11:13:10 +0000 (Thu, 14 Oct 2010)
Log Message:
-----------
[Release 0.6.0] Release of version 0.6.0.
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/stdair.spec
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2010-10-14 11:10:10 UTC (rev 343)
+++ trunk/stdair/configure.ac 2010-10-14 11:13:10 UTC (rev 344)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
-AC_INIT([STDAIR],[99.99.99],[den...@us...],[stdair])
+AC_INIT([STDAIR],[0.6.0],[den...@us...],[stdair])
AC_CONFIG_HEADER([stdair/config.h])
AC_CONFIG_SRCDIR([stdair/bom/BomRoot.hpp])
AC_CONFIG_AUX_DIR([config])
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# Shared library versioning
-GENERIC_LIBRARY_VERSION="99:99:99"
+GENERIC_LIBRARY_VERSION="0:6:0"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-10-14 11:10:10 UTC (rev 343)
+++ trunk/stdair/stdair.spec 2010-10-14 11:13:10 UTC (rev 344)
@@ -2,7 +2,7 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 99.99.99
+Version: 0.6.0
Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
@@ -111,9 +111,12 @@
%changelog
-* Sun Sep 19 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
+* Thu Oct 21 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
- Upstream update
+* Thu Oct 14 2010 Son Nguyen Kim <ngu...@gm...> 0.6.0-1
+- Upstream update
+
* Thu Sep 16 2010 Son Nguyen Kim <ngu...@gm...> 0.5.0-1
- Upstream update
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-10-14 17:19:00
|
Revision: 351
http://stdair.svn.sourceforge.net/stdair/?rev=351&view=rev
Author: denis_arnaud
Date: 2010-10-14 17:18:52 +0000 (Thu, 14 Oct 2010)
Log Message:
-----------
[Release] Back to working version (99.99.99).
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/stdair.spec
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2010-10-14 17:17:29 UTC (rev 350)
+++ trunk/stdair/configure.ac 2010-10-14 17:18:52 UTC (rev 351)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
-AC_INIT([STDAIR],[0.7.0],[den...@us...],[stdair])
+AC_INIT([STDAIR],[99.99.99],[den...@us...],[stdair])
AC_CONFIG_HEADER([stdair/config.h])
AC_CONFIG_SRCDIR([stdair/bom/BomRoot.hpp])
AC_CONFIG_AUX_DIR([config])
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# Shared library versioning
-GENERIC_LIBRARY_VERSION="0:7:0"
+GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-10-14 17:17:29 UTC (rev 350)
+++ trunk/stdair/stdair.spec 2010-10-14 17:18:52 UTC (rev 351)
@@ -2,7 +2,7 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 0.7.0
+Version: 99.99.99
Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
@@ -111,6 +111,9 @@
%changelog
+* Thu Oct 14 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
+- Upstream update
+
* Thu Oct 14 2010 Son Nguyen Kim <ngu...@gm...> 0.7.0-1
- Upstream update
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-11-06 12:45:34
|
Revision: 360
http://stdair.svn.sourceforge.net/stdair/?rev=360&view=rev
Author: denis_arnaud
Date: 2010-11-06 12:45:28 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
[Release 0.8.0] Release of version 0.8.0.
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/stdair.spec
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2010-11-04 17:30:55 UTC (rev 359)
+++ trunk/stdair/configure.ac 2010-11-06 12:45:28 UTC (rev 360)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
-AC_INIT([STDAIR],[99.99.99],[den...@us...],[stdair])
+AC_INIT([STDAIR],[0.8.0],[den...@us...],[stdair])
AC_CONFIG_HEADER([stdair/config.h])
AC_CONFIG_SRCDIR([stdair/bom/BomRoot.hpp])
AC_CONFIG_AUX_DIR([config])
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# Shared library versioning
-GENERIC_LIBRARY_VERSION="99:99:99"
+GENERIC_LIBRARY_VERSION="0:8:0"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-11-04 17:30:55 UTC (rev 359)
+++ trunk/stdair/stdair.spec 2010-11-06 12:45:28 UTC (rev 360)
@@ -2,7 +2,7 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 99.99.99
+Version: 0.8.0
Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
@@ -111,7 +111,7 @@
%changelog
-* Thu Oct 14 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
+* Thu Oct 14 2010 Son Nguyen Kim <ngu...@gm...> 0.8.0-1
- Upstream update
* Thu Oct 14 2010 Son Nguyen Kim <ngu...@gm...> 0.7.0-1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-11-06 12:46:29
|
Revision: 361
http://stdair.svn.sourceforge.net/stdair/?rev=361&view=rev
Author: denis_arnaud
Date: 2010-11-06 12:46:23 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
[Release] Back to working version (99.99.99).
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/stdair.spec
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2010-11-06 12:45:28 UTC (rev 360)
+++ trunk/stdair/configure.ac 2010-11-06 12:46:23 UTC (rev 361)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
-AC_INIT([STDAIR],[0.8.0],[den...@us...],[stdair])
+AC_INIT([STDAIR],[99.99.99],[den...@us...],[stdair])
AC_CONFIG_HEADER([stdair/config.h])
AC_CONFIG_SRCDIR([stdair/bom/BomRoot.hpp])
AC_CONFIG_AUX_DIR([config])
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# Shared library versioning
-GENERIC_LIBRARY_VERSION="0:8:0"
+GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-11-06 12:45:28 UTC (rev 360)
+++ trunk/stdair/stdair.spec 2010-11-06 12:46:23 UTC (rev 361)
@@ -2,7 +2,7 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 0.8.0
+Version: 99.99.99
Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
@@ -111,9 +111,12 @@
%changelog
-* Thu Oct 14 2010 Son Nguyen Kim <ngu...@gm...> 0.8.0-1
+* Sat Nov 06 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
- Upstream update
+* Sat Nov 06 2010 Son Nguyen Kim <ngu...@gm...> 0.8.0-1
+- Upstream update
+
* Thu Oct 14 2010 Son Nguyen Kim <ngu...@gm...> 0.7.0-1
- Upstream update
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-11-14 16:39:50
|
Revision: 366
http://stdair.svn.sourceforge.net/stdair/?rev=366&view=rev
Author: denis_arnaud
Date: 2010-11-14 16:39:38 +0000 (Sun, 14 Nov 2010)
Log Message:
-----------
[Doc] Started the user guide and cleaned the tutorial.
Modified Paths:
--------------
trunk/stdair/Makefile.am
trunk/stdair/batches/stdair.cpp
trunk/stdair/doc/Makefile.am
trunk/stdair/doc/doxygen_html.cfg.in
trunk/stdair/doc/local/users_guide.doc
trunk/stdair/doc/tutorial/src/sources.mk
trunk/stdair/doc/tutorial/tutorial.doc
trunk/stdair/test/archi_static_cast/archi_static_cast.cpp
trunk/stdair/test/archi_static_cast/sources.mk
trunk/stdair/test/architecture/Makefile.am
trunk/stdair/test/architecture/architecture.cpp
trunk/stdair/test/architecture/sources.mk
trunk/stdair/test/stdair/Makefile.am
trunk/stdair/test/stdair/sources.mk
Added Paths:
-----------
trunk/stdair/doc/tutorial/src/architecture.ref
trunk/stdair/doc/tutorial/src/stdair.ref
trunk/stdair/test/archi_static_cast/MP2BomHolder.hpp
trunk/stdair/test/archi_static_cast/MP2BomManager.hpp
trunk/stdair/test/archi_static_cast/MP2BomRoot.cpp
trunk/stdair/test/archi_static_cast/MP2BomRoot.hpp
trunk/stdair/test/archi_static_cast/MP2FacBom.hpp
trunk/stdair/test/archi_static_cast/MP2FacBomManager.hpp
trunk/stdair/test/archi_static_cast/MP2Inventory.cpp
trunk/stdair/test/archi_static_cast/MP2Inventory.hpp
trunk/stdair/test/archi_static_cast/MP2Types.hpp
trunk/stdair/test/architecture/MPBomRoot.cpp
trunk/stdair/test/architecture/MPBomRoot.hpp
trunk/stdair/test/architecture/MPInventory.cpp
trunk/stdair/test/architecture/MPInventory.hpp
Removed Paths:
-------------
trunk/stdair/doc/tutorial/src/completeex.cpp
trunk/stdair/doc/tutorial/src/completeex.ref
trunk/stdair/doc/tutorial/src/invobject.cpp
trunk/stdair/doc/tutorial/src/invobject.ref
trunk/stdair/doc/tutorial/src/makefile.tutorial
trunk/stdair/doc/tutorial/src/rootinvobject.cpp
trunk/stdair/doc/tutorial/src/rootinvobject.ref
trunk/stdair/doc/tutorial/src/rootobject.cpp
trunk/stdair/doc/tutorial/src/rootobject.ref
trunk/stdair/test/archi_static_cast/BomHolder.hpp
trunk/stdair/test/archi_static_cast/BomManager.hpp
trunk/stdair/test/archi_static_cast/BomRoot.cpp
trunk/stdair/test/archi_static_cast/BomRoot.hpp
trunk/stdair/test/archi_static_cast/FacBom.hpp
trunk/stdair/test/archi_static_cast/FacBomManager.hpp
trunk/stdair/test/archi_static_cast/Inventory.cpp
trunk/stdair/test/archi_static_cast/Inventory.hpp
trunk/stdair/test/archi_static_cast/Types.hpp
trunk/stdair/test/architecture/BomRoot.cpp
trunk/stdair/test/architecture/BomRoot.hpp
trunk/stdair/test/architecture/Inventory.cpp
trunk/stdair/test/architecture/Inventory.hpp
Property Changed:
----------------
trunk/stdair/doc/tutorial/src/
Modified: trunk/stdair/Makefile.am
===================================================================
--- trunk/stdair/Makefile.am 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/Makefile.am 2010-11-14 16:39:38 UTC (rev 366)
@@ -60,10 +60,10 @@
$(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
snapshot-html:
- $(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-doc-`date +"%Y%m%d"`
+ $(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-doc-html-`date +"%Y%m%d"`
snapshot-pdf:
- $(MAKE) -C doc dist-pdf pdf_tarname=@PACKAGE_TARNAME@-pdf-`date +"%Y%m%d"`
+ $(MAKE) -C doc dist-pdf pdf_tarname=@PACKAGE_TARNAME@-doc-pdf-`date +"%Y%m%d"`
upload: upload-src upload-html upload-pdf
@@ -72,10 +72,10 @@
@PACKAGE_TARNAME@-@VERSION@.tar.bz2
upload-html: dist-html
- @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-doc-@VERSION@.tar.gz \
- @PACKAGE_TARNAME@-doc-@VERSION@.tar.bz2
+ @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-doc-html-@VERSION@.tar.gz \
+ @PACKAGE_TARNAME@-doc-html-@VERSION@.tar.bz2
upload-pdf: dist-pdf
- @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-pdf-@VERSION@.tar.gz \
- @PACKAGE_TARNAME@-pdf-@VERSION@.tar.bz2
+ @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-doc-pdf-@VERSION@.tar.gz \
+ @PACKAGE_TARNAME@-doc-pdf-@VERSION@.tar.bz2
Modified: trunk/stdair/batches/stdair.cpp
===================================================================
--- trunk/stdair/batches/stdair.cpp 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/batches/stdair.cpp 2010-11-14 16:39:38 UTC (rev 366)
@@ -1,3 +1,7 @@
+/*!
+ * \page batch_stdair_cpp Command-Line Utility to Demonstrate Typical StdAir Usage
+ * \code
+ */
// STL
#include <cassert>
#include <iostream>
@@ -565,7 +569,7 @@
// ///////// M A I N ////////////
int main (int argc, char* argv[]) {
- try {
+ // try {
// Built-in
bool isBuiltin;
@@ -613,6 +617,12 @@
// Close the Log outputFile
logOutputFile.close();
+ /*
+ Note: as that program is not intended to be run on a server in
+ production, it is better not to catch the exceptions, as when it
+ happens (that an exception is throwned), that way we get the
+ call stack.
+
} catch (const std::exception& stde) {
std::cerr << "Standard exception: " << stde.what() << std::endl;
return -1;
@@ -620,6 +630,11 @@
} catch (...) {
return -1;
}
-
+ */
+
return 0;
}
+
+/*!
+ * \endcode
+ */
Modified: trunk/stdair/doc/Makefile.am
===================================================================
--- trunk/stdair/doc/Makefile.am 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/doc/Makefile.am 2010-11-14 16:39:38 UTC (rev 366)
@@ -9,13 +9,16 @@
include $(top_srcdir)/stdair/command/sources.mk
include $(top_srcdir)/stdair/service/sources.mk
include $(top_srcdir)/stdair/sources.mk
+include $(top_srcdir)/batches/sources.mk
+include $(top_srcdir)/test/stdair/sources.mk
+include $(top_srcdir)/test/architecture/sources.mk
SUBDIRS = images tutorial local
docdir = @docdir@
-html_tarname = @PACKAGE_TARNAME@-doc-@PACKAGE_VERSION@
-pdf_tarname = @PACKAGE_TARNAME@-pdf-@PACKAGE_VERSION@
+html_tarname = @PACKAGE_TARNAME@-doc-html-@PACKAGE_VERSION@
+pdf_tarname = @PACKAGE_TARNAME@-doc-pdf-@PACKAGE_VERSION@
noinst_DATA =
EXTRA_DIST = $(noinst_DATA)
@@ -28,14 +31,17 @@
html/index.html: doxygen_html.cfg \
$(doc_local_sources) $(html_local_sources) \
$(doc_tutorial_sources) $(cpp_tutorial_sources) \
- $(stdair_test_lib_h_sources) $(stdair_test_lib_cc_sources) \
$(stdair_service_h_sources) $(stdair_service_cc_sources) \
$(stdair_bas_h_sources) $(stdair_bas_cc_sources) \
$(stdair_bom_h_sources) $(stdair_bom_cc_sources) \
$(stdair_fac_h_sources) $(stdair_fac_cc_sources) \
$(stdair_dba_h_sources) $(stdair_dba_cc_sources) \
$(stdair_cmd_h_sources) $(stdair_cmd_cc_sources) \
- $(stdair_svc_h_sources) $(stdair_svc_cc_sources)
+ $(stdair_svc_h_sources) $(stdair_svc_cc_sources) \
+ $(stdair_batches_h_sources) $(stdair_batches_cc_sources) \
+ $(stdair_test_lib_h_sources) $(stdair_test_lib_cc_sources) \
+ $(stdair_test_bin_h_sources) $(stdair_test_bin_cc_sources) \
+ $(stdair_archi_h_sources) $(stdair_archi_cc_sources)
doxygen $<; \
if test -d html; then \
cp $(srcdir)/images/stdair_logo.png html; \
Modified: trunk/stdair/doc/doxygen_html.cfg.in
===================================================================
--- trunk/stdair/doc/doxygen_html.cfg.in 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/doc/doxygen_html.cfg.in 2010-11-14 16:39:38 UTC (rev 366)
@@ -584,7 +584,9 @@
INPUT = @top_srcdir@/@PACKAGE@ \
@top_srcdir@/doc/local \
@top_srcdir@/doc/tutorial \
- @top_srcdir@/test
+ @top_srcdir@/batches \
+ @top_srcdir@/test/stdair \
+ @top_srcdir@/test/architecture
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -645,7 +647,9 @@
# the \include command).
EXAMPLE_PATH = @top_srcdir@/doc/tutorial/src \
- @top_srcdir@/test
+ @top_srcdir@/batches \
+ @top_srcdir@/test/stdair \
+ @top_srcdir@/test/architecture
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
Modified: trunk/stdair/doc/local/users_guide.doc
===================================================================
--- trunk/stdair/doc/local/users_guide.doc 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/doc/local/users_guide.doc 2010-11-14 16:39:38 UTC (rev 366)
@@ -3,26 +3,16 @@
\section ug_toc Table of Contents
- \ref ug_introduction
-- \ref predefined_types
- - \ref scalar_types
- - \ref vector_types
- - \ref matrix_types
-- \ref using_vectors
- - \ref defining_vectors
- - \ref vector_manipulation
- - \ref vector_converters
- - \ref vector_functions
-- \ref using_matrices
- - \ref matrix_converters
-- \ref array_class
-- \ref random_variables
- - \ref random_vec_mat
- - \ref rng
-- \ref deterministic_sources
-- \ref filters
-- \ref signal_processing
-- \ref timer_class
-- \ref itfile_class
+- \ref ug_get_started
+ - \ref ug_get_source
+ - \ref ug_build_binaries
+ - \ref ug_build_and_run_tests
+ - \ref ug_install_project
+- \ref ug_bom_tree
+ - \ref ug_bom_distribution
+ - \ref ug_bom_schedule
+ - \ref ug_bom_inventory
+- \ref ug_extending_bom_tree
\section ug_introduction Introduction
@@ -30,587 +20,51 @@
The \c StdAir library contains classes for airline business management.
This document does not cover all the aspects of the \c StdAir library. It
does however explain the most important things you need to know in order
- to start using \c StdAir.
+to start using \c StdAir.
-\section predefined_types Predefined Data Types
+\section ug_get_started Get Started
+\subsection ug_get_source Get the StdAir library
-\subsection scalar_types Predefined Scalar Types
+\subsection ug_build_binaries Build the StdAir project
+To run the configuration script the first time, go to the
+top directory (where the StdAir package has been un-packed), and issue
+either of the following two commands, depending on whether the StdAir
+project has been checked out from the Subversion repository or
+downloaded as a tar-ball package from the Sourceforge Web site:
+ - <tt>./autogen.sh</tt>
+ - <tt>./configure</tt>
-Apart from the standard C++ types e.g. \c char, \c short, \c int, \c long,
-\c double, \c float, and \c long \c long, the following types are specific
-for \c IT++:
-- \c complex<double>: Contains real and imaginary parts of type \c double
-- \c bin: Used for binary (0,1) data
+\subsection ug_build_and_run_tests Build and Run the Tests
+\subsection ug_install_project Install the StdAir Project (Binaries, Documentation)
-\subsection vector_types Prepared Vector Types
+\section ug_bom_tree Exploring the Predefined BOM Tree
-A vector can in principle be of arbitrary type (that support addition,
-subtraction, multiplication and division), since the general vector class \c
-Vec<TYPE> is templated. However, the most commonly used vector types are
-predefined. These predefined vector types are:
+\c StdAir predefines a BOM (Business Object Model) tree specific to the
+airline IT arena.
-- \c vec: Basic vector type containing \c double
-- \c cvec: Vector type containing \c complex<double>
-- \c ivec: Vector type containing \c int
-- \c bvec: Vector type containing \c bin
-- \c svec: Vector type containing \c short
+\subsection ug_bom_distribution Airline Distribution BOM Tree
+- \c stdair::TravelSolutionStruct
-The general vector class is used to define the specialized classes above.
-The \c vec class is actually a \c Vec<double>. We urge you to use these
-predefined classes instead of \c Vec<TYPE> when ever possible.
+\subsection ug_bom_schedule Airline Network BOM Tree
+- \c stdair::FlightPeriod
+\subsection ug_bom_inventory Airline Inventory BOM Tree
+- \c stdair::Inventory
+- \c stdair::FlightDate
-\subsection matrix_types Prepared Matrix Types
+\subsubsection ug_bom_segment_branch Airline Inventory Marketing BOM Tree
+- \c stdair::SegmentDate
+- \c stdair::SegmentCabin
+- \c stdair::FareFamily
+- \c stdair::BookingClass
-The general matrix class is called \c Mat<TYPE>. These predefined matrix
-types are:
+\subsubsection ug_bom_leg_branch Airline Inventory Operating BOM Tree
+- \c stdair::LegDate
+- \c stdair::LegCabin
+- \c stdair::Bucket
-- \c mat: Basic matrix type containing double
-- \c cmat: Matrix type containing \c complex<double>
-- \c imat: Matrix type containing \c int
-- \c bmat: Matrix type containing \c bin
-- \c smat: Matrix type containing \c short
+\section ug_extending_bom_tree Extending the BOM Tree
-As with vector, the general matrix class is used to define the specialized
-classes above. The \c mat class is thus a \c Mat<double>. We urge you to use
-these predefined classes instead of \c Mat<TYPE> whenever possible.
-
-
-\section using_vectors Using Vectors
-
-Vectors and matrices in \c IT++ are very similar. We therefore begin to
-describe the vector class in detail and then briefly explain the differences
-regarding matrices in the next section.
-
-
-\subsection defining_vectors Defining a Vector
-
-A vector containing elements of type \c double is defined with:
-
-\code
-vec my_vector;
-\endcode
-
-However, this will not assign a size (memory) to the vector. To assign size
-10 to the vector we may use:
-
-\code
-vec my_vector(10);
-\endcode
-
-or
-
-\code
-vec my_vector;
-my_vector.set_size(10,false);
-\endcode
-
-where the second parameter in the \c set_size call (\c true or \c false)
-determines if you want to copy the contents of the old data area into the
-new resized one, or not. This may be useful when down-sizing a vector, but
-in this case it is not. It is also equivalent to use
-
-\code
-my_vector.set_length(10,false);
-\endcode
-
-instead of \c set_size.
-
-Observe that a declared vector (or matrix) is not cleared (the element
-values are undefined). To clear a vector we simply write
-
-\code
-my_vector.clear();
-\endcode
-
-or
-
-\code
-my_vector.zeros();
-\endcode
-
-To fill the vector with ones we write
-
-\code
-my_vector.ones();
-\endcode
-
-It is possible to retrieve the length (size) of a vector in any of the
-following ways:
-
-\code
-length_of_vector = my_vector.length();
-length_of_vector = my_vector.size();
-length_of_vector = length(my_vector);
-\endcode
-
-To assign values to a vector
-
-\code
-vec a = "0 0.7 5 9.3"; // that is a = [0 0.7 5 9.3]
-ivec b = "0:5"; // that is b = [0 1 2 3 4 5]
-vec c = "3:2.5:13"; // that is c = [3 5.5 8 10.5 13]
-ivec d = "1:3:5,0:2:4"; // that is d = [1 3 5 0 2 4]
-vec e("1.2,3.4,5.6"); // that is e = [1.2 3.4 5.6]
-vec f;
-f.set("1.0 2.0 3.0 4.0"); // that is f = [1.0 2.0 3.0 4.0]
-vec g;
-g = f; // that is g is a copy of f
-\endcode
-
-A comma or a space character separates the vector elements. When assigning
-or retrieving a specific vector element use
-
-\code
-a(i) = 3.14;
-a(i);
-\endcode
-
-for element number \a i. Vector elements are numbered such that \a a(0)
-denotes the first element. It is also possible to use square brackets as in
-the C language, i.e.
-
-\code
-a[i] = 3.14;
-a[i];
-\endcode
-
-Parts or a vector are retrieved by
-
-\code
-a.left(3); // a vector containing the first 3 elements of a
-a.right(2); // a vector containing the last 2 elements of a
-a.mid(1,2); // a vector containing the 2 elements starting with a(1)
-a(2,4); // a vector containing all elements from a(2) to a(4)
-\endcode
-
-If you have a vector called \a index_list containing indexes (\a ivec) you
-may write
-
-\code
-// this gives a vector containing all elements in index_list
-a(index_list);
-\endcode
-
-If you have a \c bvec called e.g. \a bin_list you may write
-
-\code
-a.get(bin_list); // this gives a vector containing all elements a(i)
- // for which bin_list(i) equals 1
-\endcode
-
-Have a look at the following example:
-
-\code
-#include "itbase.h"
-
-int man() {
- vec a = linspace(0,1,11);
- ivec index_list = "3 5 2 2";
- bvec bin_list = "1 0 1 0 1 0 1 0 1 0 1";
-
- cout << "a = " << a << endl;
- cout << "a(index_list) = " << a(index_list) << endl;
- cout << "a.get(bin_list) = " << a.get(bin_list) << endl;
-}
-\endcode
-
-When you run this program you will see
-
-\code
-a = [0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0]
-a(index_list) = [0.3 0.5 0.2 0.2]
-a(bin_list) = [0.0 0.2 0.4 0.6 0.8 1.0]
-\endcode
-
-
-\subsection vector_manipulation Vector Manipulation
-
-Below follows a listing of the most common vector manipulation commands that
-are available. All examples are given for an \c ivec denoted \a my_ivec, but
-of course this will work for other vector types as well.
-
-- \c shift_right:
-\code
-// Shift in scalar data (10) at position 0
-my_ivec.shift_right(10);
-
-// Shift in vector at position 0
-my_ivec.shift_right("10 4");
-\endcode
-
-- \c shift_left:
-\code
-// Shift in scalar data (10) at position Size()-1
-my_ivec.shift_left(10);
-
-// Shift in vector at position Size()-1
-my_ivec.shift_left("10 4");
-\endcode
-
-- \c replace_mid:
-\code
-// Replace part of vector from position (10) with the vector "11 13"
-my_ivec.replace_mid(10,"11 13");
-\endcode
-
-- \c del:
-\code
-// Delete element at index (10), making vector size one less
-my_ivec.del(10);
-\endcode
-
-- \c ins:
-\code
-// Insert element at index (10), making vector size one extra
-my_ivec.ins(10);
-\endcode
-
-- \c split:
-\code
-// Splits vector at pos (10). Returns first part, keep second part.
-ivec first_part = my_ivec.split(10);
-\endcode
-
-- \c elem_mult:
-\code
-// Multiply two vectors element wise.
-ivec my_product = elem_mult(my_invec1,my_ivec2);
-\endcode
-
-- \c elem_div:
-\code
-// Dividide two vectors element wise.
-ivec my_product = elem_div(my_invec1,my_ivec2);
-\endcode
-
-- Calculation: +, -, *, /
-\code
-a = my_ivec1 + my_ivec2; // Addition of vectors
-a = my_ivec + 10; // Addition of vector and scalar
-a = my_ivec1 - my_ivec2; // Subtraction of vectors
-a = my_ivec - 10; // Subtraction of vector and scalar
-a = my_ivec * 10; // Multiplication of vector and scalar
-a = my_ivec / 10; // Division of vector and scalar
-\endcode
-
-- Calculation: +=, -=, *=, /=, |=
-\code
-a += my_ivec; // Addition of vectors (a = a+my_ivec)
-my_ivec += 10; // Addition of vector and scalar (10)
-a -= my_ivec; // Subtraction of vectors (a = a-my_ivec)
-my_ivec -= 10; // Subtraction of vector and scalar (10)
-my_ivec *= 10; // Multiplication of vector and scalar (10)
-my_ivec /= 10; // Divsion of vector and scalar (10)
-my_ivec |= a; // Element wise division
-\endcode
-
-- \c concat
-\code
-a = concat(my_ivec1, my_ivec2); // concatenation of two vectors
-\endcode
-
-
-\subsection vector_converters Vector Converters
-
-In order to convert e.g an \c ivec to a \c vec we can write some thing like
-\c my_vec = \c to_vec(my_ivec). The following converters are available:
-- \c to_bvec,
-- \c to_svec,
-- \c to_ivec,
-- \c to_vec,
-- \c to_cvec.
-
-
-\subsection vector_functions Vector Functions
-
-There are several functions that operate on vectors. Some examples are:
-\c max, \c max_index, \c min, \c min_index, \c product, \c energy,
-\c geometric_mean, \c mean, \c median, \c norm, \c round, \c variance,
-\c ceil_i, \c floor_i, \c round_i, \c find.
-
-Examples of functions that generate different kinds of vectors are:
-\c linspace, \c ones_b, \c ones_c, \c ones_i, \c ones \c zeros_b. There
-are several more than these. Please refer to the IT++ reference manual
-for a description of these.
-
-
-\section using_matrices Using Matrices
-
-Matrices are two-dimensional arrays, and most of their functionality is
-similar to that of vectors. The predefined matrix types are:
-
-- \c mat,
-- \c cmat,
-- \c imat,
-- \c smat,
-- \c bmat.
-
-Below follows some examples that are specific for matrices only:
-
-<ul>
-<li> Define a matrix of type \c double with 3 rows and 4 columns
-\code
-mat a(3,4);
-\endcode
-</li>
-
-<li> Define a matrix of type \c int with 2 rows and 3 columns. A comma (,)
-or space is used to separate columns and a semicolon (;) is used to separate
-rows.
-\code
-imat a = "1 2 3;4 5 6";
-\endcode
-</li>
-
-<li> Access to rows and columns with \c get_row and \c get_col
-\code
-a.get_row(1); // Returns the second row of the matrix b
-a.get_col(0); // Returns the first column of the matrix b
-\endcode
-</li>
-
-<li> Set rows and columns with \c set_row and \c set_col
-\code
-a.set_row(1,"9 8 7"); // Set second row to "9 8 7"
-a.set_col(0,"7 2"); // Set first column to "7 2"
-\endcode
-</li>
-
-<li> The size of a matrix
-\code
-// Set the size. "false" means "do not copy"
-a.set_size(4,5,false);
-int nr_of_rows = a.rows(); // return the number of rows
-int nr_of_columns = a.cols(); // return the number of columns
-\endcode
-</li>
-
-<li> Access to parts of a matrix
-\code
-a(r,c); // Access to a single element.
-a(i); // Access to a single element. Linear addressing, by rows.
-
-// Returns the sub-matrix from rows r1 to r2 and columns c1 to c2.
-a(r1,r2,c1,c2);
-\endcode
-</li>
-
-<li> Copy rows and columns
-\code
-// Copy row number "from" to row number "to"
-a.copy_row(to,from)
-
-// Copy column number "from" to column number "to"
-a.copy_col(to,from)
-\endcode
-</li>
-
-<li> Swap rows and columns
-\code
-// Swap rows number r1 and r2
-a.swap_row(r1,r2)
-
-// Swap columns number c1 and c2
-a.swap_col(c1,c2)
-\endcode
-</li>
-
-<li> Horizontal and vertical concatenation
-\code
-// Equivalent to the MATLAB command c = [a b]
-c = concat_horizontal(a,b);
-
-// Equivalent to the MATLAB command c = [a;b]
-c = concat_vertical(a,b);
-\endcode
-</li>
-</ul>
-
-
-\subsection matrix_converters Matrix Converters
-
-The following converters are available:
-
-- \c to_mat,
-- \c to_imat,
-- \c to_cmat,
-- \c to_bmat.
-
-
-\section array_class The Array Class
-
-The \c itbase library contains, among other things, the \c Array class. An
-\c Array can contain any type of data. Below is an example of an \c Array
-containing vectors (\c vec):
-
-\code
-#include <itpp/itbase.h>
-
-using namespace itpp;
-using namespace std;
-
-int main() {
- Array<vec> my_vec_array(2);
- my_vec_array(0) = linspace(0,1,4);
- my_vec_array(1) = "0.1 0.2 0.3 0.4 0.3 0.2 0.1";
- cout << "my_vec_array = " << my_vec_array << endl;
-
- return 0;
-}
-\endcode
-
-
-\section random_variables Random Vectors, Matrices, and Generators
-
-
-\subsection random_vec_mat Random Vectors and Matrices
-
-Random vectors and matrices are easily obtained by using these predefined
-functions:
-
-- \c randb: Generates a random bit vector or matrix
-- \c randu: Generates a random uniform vector or matrix
-- \c randi: Generates a random index vector or matrix
-- \c randray: Generates a random Rayleigh vector or matrix
-- \c randrice: Generates a random Rice vector or matrix
-- \c randexp: Generates a random Exponential vector or matrix
-- \c randn: Generates a random Gaussian vector or matrix
-- \c randn_c: Generates a random complex Gaussian vector or matrix
-
-
-\subsection rng Random Number Generators (RNG)
-
-The following discrete valued random number generators are available. More
-information about these can be found in the IT++ reference manual.
-
-- \c Bernoulli_RNG
-- \c I_Uniform_RNG
-
-The following continuous valued random number generators are available.
-
-- \c Uniform_RNG
-- \c Exponential_RNG
-- \c Normal_RNG
-- \c Complex_Normal_RNG
-- \c AR1_Normal_RNG
-- \c Weibull_RNG
-- \c Rayleigh_RNG
-- \c Rice_RNG
-
-
-\section deterministic_sources Deterministic Sources
-
-The following deterministic sources are available:
-
-- \c Sine_Source
-- \c Square_Source
-- \c Triangle_Source
-- \c Sawtooth_Source
-- \c Impulse_Source
-- \c Pattern_Source
-
-
-\section filters Filter Classes and Functions
-
-The following filter classes are available:
-
-- \c AR_Filter
-- \c MA_Filter
-- \c ARMA_Filter
-- \c Freq_Filt
-
-The following filter functions are available:
-
-- \c filter
-
-
-\subsection signal_processing Signal Processing Functions
-
-The following signal processing functions are available:
-
-- \c a2k, \c k2a, \c a2lar, \c k2lar, \c lpc, \c levinsson, \c lerouxguegen
-- \c fft, \c ifft, \c fft_real, \c ifft_real
-- \c dct, \c idct
-- \c spectrum
-- \c cov, \c xcorr
-- \c chirp
-- \c dht, \c dht2, \c dwht, \c dhwt2, \c self_dht, \c self_dwht
-- \c filter_spectrum
-- \c filter_whiteness
-
-
-\section timer_class Timer Classes
-
-The \c Real_Timer class can be used to measure execution time of a program
-as in the following example:
-
-\code
-#include <itpp/itbase.h>
-
-using namespace itpp;
-using namespace std;
-
-int main() {
- long sum = 0;
- Real_Timer my_timer;
-
- my_timer.tic();
- for (int i=0; i<10000000; i++) {
- sum += i;
- }
- my_timer.toc_print();
-
- cout << "The sum is " << sum << endl;
-
- return 0;
-}
-\endcode
-
-
-\section itfile_class Reading and Writing to Files
-
-The following example saves the variable \a a to the file
-\c my_file_name.it:
-
-\code
-#include <itpp/itbase.h>
-
-using namespace itpp;
-
-int main() {
- it_file my_file("my_file_name.it");
- vec a = "1.0 2.0 3.0 4.0";
- my_file << Name("a") << a;
-
- return 0;
-}
-\endcode
-
-The following example reads the variable \a a from the file
-\c my_file_name.it and prints it:
-\code
-#include <itpp/itbase.h>
-
-using namespace itpp;
-using namespace std;
-
-int main() {
- it_file my_file("my_file_name.it");
- vec a;
- my_file >> Name("a") >> a;
- cout << "a = " << a << endl;
-
- return 0;
-}
-\endcode
-
-Note that <tt>*.it</tt> files can be read and written in Matlab/Octave by
-using the \c itload.m and \c itsave.m functions.
-
-Also available is the class \c it_ifile that can only be used for reading of
-files.
-
*/
Property changes on: trunk/stdair/doc/tutorial/src
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
rootobject
invobject
rootinvobject
completeex
+ Makefile
Makefile.in
Added: trunk/stdair/doc/tutorial/src/architecture.ref
===================================================================
--- trunk/stdair/doc/tutorial/src/architecture.ref (rev 0)
+++ trunk/stdair/doc/tutorial/src/architecture.ref 2010-11-14 16:39:38 UTC (rev 366)
@@ -0,0 +1,2 @@
+Inventory: BA
+Inventory: AF
Deleted: trunk/stdair/doc/tutorial/src/completeex.cpp
===================================================================
--- trunk/stdair/doc/tutorial/src/completeex.cpp 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/doc/tutorial/src/completeex.cpp 2010-11-14 16:39:38 UTC (rev 366)
@@ -1,347 +0,0 @@
-/*!
- * \page tut_completeex_cpp Tutorial Full Basic Example
- * \code
- */
-// STL
-#include <cassert>
-// StdAir
-#include <stdair/bom/BomRoot.hpp>
-#include <stdair/bom/Inventory.hpp>
-#include <stdair/bom/InventoryTypes.hpp>
-#include <stdair/bom/FlightDate.hpp>
-#include <stdair/bom/FlightDateTypes.hpp>
-#include <stdair/bom/LegDate.hpp>
-#include <stdair/bom/LegDateTypes.hpp>
-#include <stdair/bom/LegCabin.hpp>
-#include <stdair/bom/LegCabinTypes.hpp>
-#include <stdair/bom/SegmentDate.hpp>
-#include <stdair/bom/SegmentDateTypes.hpp>
-#include <stdair/bom/SegmentCabin.hpp>
-#include <stdair/bom/SegmentCabinTypes.hpp>
-#include <stdair/bom/FareFamily.hpp>
-#include <stdair/bom/FareFamilyTypes.hpp>
-#include <stdair/bom/BookingClass.hpp>
-#include <stdair/bom/BookingClassTypes.hpp>
-#include <stdair/bom/BomManager.hpp> // Utility class to display BOM objects
-#include <stdair/factory/FacBomManager.hpp>
-
-// /////////////////////// M A I N ///////////////////////////
-int main() {
-
- // ///////////// Step 0.0: Initialisation ////////////
- // Create the root of the Bom tree (i.e., a BomRoot object)
- stdair::BomRoot& lBomRoot =
- stdair::FacBom<stdair::BomRoot>::instance().create();
-
- // Step 0.1: Inventory level
- // Create an Inventory for BA
- const stdair::InventoryKey lBAKey ("BA");
- stdair::Inventory& lBAInv =
- stdair::FacBom<stdair::Inventory>::instance().create (lBAKey);
- stdair::FacBomManager::instance().addToList (lBomRoot, lBAInv);
-
- // Create an Inventory for AF
- const stdair::InventoryKey lAFKey ("AF");
- stdair::Inventory& lAFInv =
- stdair::FacBom<stdair::Inventory>::instance().create (lAFKey);
- stdair::FacBomManager::instance().addToList (lBomRoot, lAFInv);
-
- // ////// BA ///////
- // Step 0.2: Flight-date level
- // Create a FlightDate (BA15/10-JUN-2010) for BA's Inventory
- stdair::FlightNumber_T lFlightNumber = 15;
- stdair::Date_T lDate (2010, 6, 10);
- stdair::FlightDateKey lFlightDateKey (lFlightNumber, lDate);
-
- stdair::FlightDate& lBA15_20100610_FD =
- stdair::FacBom<stdair::FlightDate>::instance().create (lFlightDateKey);
- stdair::FacBomManager::instance().addToList (lBAInv, lBA15_20100610_FD);
-
- // Step 0.3: Segment-date level
- // Create a first SegmentDate (LHR-SYD) for BA's Inventory
- const stdair::AirportCode_T lLHR ("LHR");
- const stdair::AirportCode_T lSYD ("SYD");
- stdair::SegmentDateKey lSegmentDateKey (lLHR, lSYD);
-
- stdair::SegmentDate& lLHRSYDSegment =
- stdair::FacBom<stdair::SegmentDate>::instance().create (lSegmentDateKey);
- stdair::FacBomManager::instance().addToList (lBA15_20100610_FD,
- lLHRSYDSegment);
-
- // Create a second SegmentDate (LHR-BKK) for BA's Inventory
- const stdair::AirportCode_T lBKK ("BKK");
- lSegmentDateKey = stdair::SegmentDateKey (lLHR, lBKK);
-
- stdair::SegmentDate& lLHRBKKSegment =
- stdair::FacBom<stdair::SegmentDate>::instance().create (lSegmentDateKey);
- stdair::FacBomManager::instance().addToList (lBA15_20100610_FD,
- lLHRBKKSegment);
-
- // Create a third SegmentDate (BKK-SYD) for BA's Inventory
- lSegmentDateKey = stdair::SegmentDateKey (lBKK, lSYD);
-
- stdair::SegmentDate& lBKKSYDSegment =
- stdair::FacBom<stdair::SegmentDate>::instance().create (lSegmentDateKey);
- stdair::FacBomManager::instance().addToList (lBA15_20100610_FD,
- lBKKSYDSegment);
-
- // Step 0.4: Leg-date level
- // Create a first LegDate (LHR) for BA's Inventory
- stdair::LegDateKey lLegDateKey (lLHR);
-
- stdair::LegDate& lLHRLeg =
- stdair::FacBom<stdair::LegDate>::instance().create (lLegDateKey);
- stdair::FacBomManager::instance().addToList (lBA15_20100610_FD, lLHRLeg);
-
- // Create a second LegDate (BKK)
- lLegDateKey = stdair::LegDateKey (lBKK);
-
- stdair::LegDate& lBKKLeg =
- stdair::FacBom<stdair::LegDate>::instance().create (lLegDateKey);
- stdair::FacBomManager::instance().addToList (lBA15_20100610_FD, lBKKLeg);
-
- // Step 0.5: segment-cabin level
- // Create a SegmentCabin (Y) for the Segment LHR-BKK of BA's Inventory
- const stdair::CabinCode_T lY ("Y");
- stdair::SegmentCabinKey lYSegmentCabinKey (lY);
-
- stdair::SegmentCabin& lLHRBKKSegmentYCabin =
- stdair::FacBom<stdair::SegmentCabin>::instance().create(lYSegmentCabinKey);
- stdair::FacBomManager::instance().addToList (lLHRBKKSegment,
- lLHRBKKSegmentYCabin);
-
- // Create a SegmentCabin (Y) of the Segment BKK-SYD;
- stdair::SegmentCabin& lBKKSYDSegmentYCabin =
- stdair::FacBom<stdair::SegmentCabin>::instance().create(lYSegmentCabinKey);
- stdair::FacBomManager::instance().addToList (lBKKSYDSegment,
- lBKKSYDSegmentYCabin);
-
- // Create a SegmentCabin (Y) of the Segment LHR-SYD;
- stdair::SegmentCabin& lLHRSYDSegmentYCabin =
- stdair::FacBom<stdair::SegmentCabin>::instance().create(lYSegmentCabinKey);
- stdair::FacBomManager::instance().addToList (lLHRSYDSegment,
- lLHRSYDSegmentYCabin);
-
- // Step 0.6: leg-cabin level
- // Create a LegCabin (Y) for the Leg LHR-BKK on BA's Inventory
- stdair::LegCabinKey lYLegCabinKey (lY);
-
- stdair::LegCabin& lLHRLegYCabin =
- stdair::FacBom<stdair::LegCabin>::instance().create (lYLegCabinKey);
- stdair::FacBomManager::instance().addToList (lLHRLeg, lLHRLegYCabin);
-
- // Create a LegCabin (Y) for the Leg BKK-SYD
- stdair::LegCabin& lBKKLegYCabin =
- stdair::FacBom<stdair::LegCabin>::instance().create (lYLegCabinKey);
- stdair::FacBomManager::instance().addToList (lBKKLeg, lBKKLegYCabin);
-
- // Step 0.7: fare family level
- // Create a FareFamily (1) for the Segment LHR-BKK, cabin Y on BA's Inv
- const stdair::FamilyCode_T l1 ("1");
- stdair::FareFamilyKey l1FareFamilyKey (l1);
-
- stdair::FareFamily& lLHRBKKSegmentYCabin1Family =
- stdair::FacBom<stdair::FareFamily>::instance().create(l1FareFamilyKey);
- stdair::FacBomManager::instance().addToList (lLHRBKKSegmentYCabin,
- lLHRBKKSegmentYCabin1Family);
-
- // Create a FareFamily (1) for the Segment BKK-SYD, cabin Y on BA's Inv
- stdair::FareFamily& lBKKSYDSegmentYCabin1Family =
- stdair::FacBom<stdair::FareFamily>::instance().create(l1FareFamilyKey);
- stdair::FacBomManager::instance().addToList (lBKKSYDSegmentYCabin,
- lBKKSYDSegmentYCabin1Family);
-
- // Create a FareFamily (1) for the Segment LHR-SYD, cabin Y on BA's Inv
- stdair::FareFamily& lLHRSYDSegmentYCabin1Family =
- stdair::FacBom<stdair::FareFamily>::instance().create(l1FareFamilyKey);
- stdair::FacBomManager::instance().addToList (lLHRSYDSegmentYCabin,
- lLHRSYDSegmentYCabin1Family);
-
- // Step 0.8: booking class level
- // Create a BookingClass (Q) for the Segment LHR-BKK, cabin Y, fare
- // family 1 on BA's Inv
- const stdair::ClassCode_T lQ ("Q");
- stdair::BookingClassKey lQBookingClassKey (lQ);
-
- stdair::BookingClass& lLHRBKKSegmentYCabin1FamilyQClass =
- stdair::FacBom<stdair::BookingClass>::instance().create(lQBookingClassKey);
- stdair::FacBomManager::instance().addToList (lLHRBKKSegmentYCabin1Family,
- lLHRBKKSegmentYCabin1FamilyQClass);
-
- // Create a BookingClass (Q) for the Segment BKK-SYD, cabin Y, fare
- // family 1 on BA's Inv
- stdair::BookingClass& lBKKSYDSegmentYCabin1FamilyQClass =
- stdair::FacBom<stdair::BookingClass>::instance().create(lQBookingClassKey);
- stdair::FacBomManager::instance().addToList (lBKKSYDSegmentYCabin1Family,
- lBKKSYDSegmentYCabin1FamilyQClass);
-
- // Create a BookingClass (Q) for the Segment LHR-SYD, cabin Y, fare
- // family 1 on BA's Inv
- stdair::BookingClass& lLHRSYDSegmentYCabin1FamilyQClass =
- stdair::FacBom<stdair::BookingClass>::instance().create(lQBookingClassKey);
- stdair::FacBomManager::instance().addToList (lLHRSYDSegmentYCabin1Family,
- lLHRSYDSegmentYCabin1FamilyQClass);
-
- // ////// AF ///////
- // Step 0.2: Flight-date level
- // Create a FlightDate (AF102/20-MAR-2010) for AF's Inventory
- lFlightNumber = 102;
- lDate = stdair::Date_T (2010, 3, 20);
- lFlightDateKey = stdair::FlightDateKey (lFlightNumber, lDate);
-
- stdair::FlightDate& lAF102_20100320_FD =
- stdair::FacBom<stdair::FlightDate>::instance().create (lFlightDateKey);
- stdair::FacBomManager::instance().addToList (lAFInv, lAF102_20100320_FD);
-
- // Step 0.3: Segment-date level
- // Create a SegmentDate (CDG-SFO) for AF's Inventory
- const stdair::AirportCode_T lCDG ("CDG");
- const stdair::AirportCode_T lSFO ("SFO");
- lSegmentDateKey = stdair::SegmentDateKey (lCDG, lSFO);
-
- stdair::SegmentDate& lCDGSFOSegment =
- stdair::FacBom<stdair::SegmentDate>::instance().create (lSegmentDateKey);
- stdair::FacBomManager::instance().addToList (lAF102_20100320_FD,
- lCDGSFOSegment);
-
- // Step 0.4: Leg-date level
- // Create a LegDate (CDG) for AF's Inventory
- lLegDateKey = stdair::LegDateKey (lCDG);
-
- stdair::LegDate& lCDGLeg =
- stdair::FacBom<stdair::LegDate>::instance().create (lLegDateKey);
- stdair::FacBomManager::instance().addToList (lAF102_20100320_FD, lCDGLeg);
-
- // Step 0.5: segment-cabin level
- // Create a SegmentCabin (Y) for the Segment CDG-SFO of AF's Inventory
- stdair::SegmentCabin& lCDGSFOSegmentYCabin =
- stdair::FacBom<stdair::SegmentCabin>::instance().create(lYSegmentCabinKey);
- stdair::FacBomManager::instance().addToList (lCDGSFOSegment,
- lCDGSFOSegmentYCabin);
-
- // Step 0.6: leg-cabin level
- // Create a LegCabin (Y) for the Leg CDG-SFO on AF's Inventory
- stdair::LegCabin& lCDGLegYCabin =
- stdair::FacBom<stdair::LegCabin>::instance().create (lYLegCabinKey);
- stdair::FacBomManager::instance().addToList (lCDGLeg, lCDGLegYCabin);
-
- // Step 0.7: fare family level
- // Create a fareFamily (1) for the Segment CDG-SFO, cabin Y on AF's Inv
- stdair::FareFamily& lCDGSFOSegmentYCabin1Family =
- stdair::FacBom<stdair::FareFamily>::instance().create(l1FareFamilyKey);
- stdair::FacBomManager::instance().addToList (lCDGSFOSegmentYCabin,
- lCDGSFOSegmentYCabin1Family);
-
- // Step 0.8: booking class level
- // Create a BookingClass (Q) for the Segment CDG-SFO, cabin Y, fare
- // family 1 on AF's Inv
- stdair::BookingClass& lCDGSFOSegmentYCabin1FamilyQClass =
- stdair::FacBom<stdair::BookingClass>::instance().create(lQBookingClassKey);
- stdair::FacBomManager::instance().addToList (lCDGSFOSegmentYCabin1Family,
- lCDGSFOSegmentYCabin1FamilyQClass);
-
-
- // /////////// Step 1.0: Display the BOM tree //////////
- // 1.0. Bom root level
- std::cout << lBomRoot << std::endl;
-
- // 1.1. Inventory level
- const stdair::InventoryList_T& lInventoryList =
- stdair::BomManager::getList<stdair::Inventory> (lBomRoot);
- for (stdair::InventoryList_T::const_iterator itInv = lInventoryList.begin();
- itInv != lInventoryList.end(); ++itInv) {
- const stdair::Inventory* lInv_ptr = *itInv;
- assert (lInv_ptr != NULL);
-
- std::cout << " " << *lInv_ptr << std::endl;
-
- // 1.2. FlightDate level
- const stdair::FlightDateList_T& lFlightDateList =
- stdair::BomManager::getList<stdair::FlightDate> (*lInv_ptr);
- for (stdair::FlightDateList_T::const_iterator itFD=lFlightDateList.begin();
- itFD != lFlightDateList.end(); ++itFD) {
- const stdair::FlightDate* lFD_ptr = *itFD;
- assert (lFD_ptr != NULL);
-
- std::cout << " " << *lFD_ptr << std::endl;
-
- // 1.4. LegDate level
- const stdair::LegDateList_T& lLegDateList =
- stdair::BomManager::getList<stdair::LegDate> (*lFD_ptr);
- for (stdair::LegDateList_T::const_iterator itLD =
- lLegDateList.begin();
- itLD != lLegDateList.end(); ++itLD) {
- const stdair::LegDate* lLD_ptr = *itLD;
- assert (lLD_ptr != NULL);
-
- std::cout << " " << *lLD_ptr << std::endl;
-
- // 1.6. LegCabin level
- const stdair::LegCabinList_T& lLegCabinList =
- stdair::BomManager::getList<stdair::LegCabin> (*lLD_ptr);
- for (stdair::LegCabinList_T::const_iterator itLC =
- lLegCabinList.begin();
- itLC != lLegCabinList.end(); ++itLC) {
- const stdair::LegCabin* lLC_ptr = *itLC;
- assert (lLC_ptr != NULL);
-
- std::cout << " " << *lLC_ptr << std::endl;
- }
- }
-
- // 1.3. SegmentDate level
- const stdair::SegmentDateList_T& lSegmentDateList =
- stdair::BomManager::getList<stdair::SegmentDate> (*lFD_ptr);
- for (stdair::SegmentDateList_T::const_iterator itSD =
- lSegmentDateList.begin();
- itSD != lSegmentDateList.end(); ++itSD) {
- const stdair::SegmentDate* lSD_ptr = *itSD;
- assert (lSD_ptr != NULL);
-
- std::cout << " " << *lSD_ptr << std::endl;
-
- // 1.5. SegmentCabin level
- const stdair::SegmentCabinList_T& lSegmentCabinList =
- stdair::BomManager::getList<stdair::SegmentCabin> (*lSD_ptr);
- for (stdair::SegmentCabinList_T::const_iterator itSC =
- lSegmentCabinList.begin();
- itSC != lSegmentCabinList.end(); ++itSC) {
- const stdair::SegmentCabin* lSC_ptr = *itSC;
- assert (lSC_ptr != NULL);
-
- std::cout << " " << *lSC_ptr << std::endl;
-
- // 1.7. FareFamily level
- const stdair::FareFamilyList_T& lFareFamilyList =
- stdair::BomManager::getList<stdair::FareFamily> (*lSC_ptr);
- for (stdair::FareFamilyList_T::const_iterator itFF =
- lFareFamilyList.begin();
- itFF != lFareFamilyList.end(); ++itFF) {
- const stdair::FareFamily* lFF_ptr = *itFF;
- assert (lFF_ptr != NULL);
-
- std::cout << " " << *lFF_ptr << std::endl;
-
- // 1.8. BookingClass level
- const stdair::BookingClassList_T& lBookingClassList =
- stdair::BomManager::getList<stdair::BookingClass> (*lFF_ptr);
- for (stdair::BookingClassList_T::const_iterator itBC =
- lBookingClassList.begin();
- itBC != lBookingClassList.end(); ++itBC) {
- const stdair::BookingClass* lBC_ptr = *itBC;
- assert (lBC_ptr != NULL);
-
- std::cout << " " << *lBC_ptr << std::endl;
- }
- }
- }
- }
- }
- }
- // Exit program:
- return 0;
-}
-
-/*!
- * \endcode
- */
Deleted: trunk/stdair/doc/tutorial/src/completeex.ref
===================================================================
--- trunk/stdair/doc/tutorial/src/completeex.ref 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/doc/tutorial/src/completeex.ref 2010-11-14 16:39:38 UTC (rev 366)
@@ -1,27 +0,0 @@
- -- ROOT --
- BA
- 15, 2010-Jun-10
- LHR
- Y
- BKK
- Y
- LHR-SYD
- Y
- 1
- Q
- LHR-BKK
- Y
- 1
- Q
- BKK-SYD
- Y
- 1
- Q
- AF
- 102, 2010-Mar-20
- CDG
- Y
- CDG-SFO
- Y
- 1
- Q
Deleted: trunk/stdair/doc/tutorial/src/invobject.cpp
===================================================================
--- trunk/stdair/doc/tutorial/src/invobject.cpp 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/doc/tutorial/src/invobject.cpp 2010-11-14 16:39:38 UTC (rev 366)
@@ -1,29 +0,0 @@
-/*!
- * \page tut_invobject_cpp Tutorial for the BOM Inventory Object Creation
- * \code
- */
-// StdAir
-#include <stdair/bom/BomRoot.hpp>
-#include <stdair/bom/Inventory.hpp>
-#include <stdair/factory/FacBomManager.hpp>
-
-// /////////////////////// M A I N ///////////////////////////
-int main() {
-
- // Create an inventory key (i.e., an airline code)
- const stdair::InventoryKey lBAKey ("BA");
-
- // Create an inventory object whose airline code is BA
- stdair::Inventory& lBAInv =
- stdair::FacBom<stdair::Inventory>::instance().create (lBAKey);
-
- // Display the inventory object (including its key, i.e., the airline code)
- std::cout << " Inventory: " << lBAInv << std::endl;
-
- // Exit program
- return 0;
-}
-
-/*!
- * \endcode
- */
Deleted: trunk/stdair/doc/tutorial/src/invobject.ref
===================================================================
--- trunk/stdair/doc/tutorial/src/invobject.ref 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/doc/tutorial/src/invobject.ref 2010-11-14 16:39:38 UTC (rev 366)
@@ -1 +0,0 @@
- Inventory: BA
Deleted: trunk/stdair/doc/tutorial/src/makefile.tutorial
===================================================================
--- trunk/stdair/doc/tutorial/src/makefile.tutorial 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/doc/tutorial/src/makefile.tutorial 2010-11-14 16:39:38 UTC (rev 366)
@@ -1,336 +0,0 @@
-# Makefile inspired from the makefiles generated by the GNU Autotools (autoconf
-# automake, configure, libtool)
-LIBDIR=`test -d '/usr/lib64' && echo '/usr/lib64' || echo '/usr/lib'`
-ARCHI=`test -d '/usr/lib64' && echo 'x86_64' || echo 'x86'`
-
-#
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-build_triplet = $(ARCHI)-unknown-linux-gnu
-host_triplet = $(ARCHI)-unknown-linux-gnu
-DIST_COMMON = $(srcdir)/makefile.tutorial
-bin_PROGRAMS = rootobject$(EXEEXT) invobject$(EXEEXT) rootinvobject$(EXEEXT) completeex$(EXEEXT)
-subdir = tutorial/src
-PROGRAMS = $(bin_PROGRAMS)
-am_rootobject_OBJECTS = rootobject-rootobject.$(OBJEXT)
-rootobject_OBJECTS = $(am_rootobject_OBJECTS)
-rootobject_DEPENDENCIES =
-rootobject_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(rootobject_CXXFLAGS) $(CXXFLAGS) \
- $(rootobject_LDFLAGS) $(LDFLAGS) -o $@
-am_invobject_OBJECTS = invobject-invobject.$(OBJEXT)
-invobject_OBJECTS = $(am_invobject_OBJECTS)
-invobject_DEPENDENCIES =
-invobject_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(invobject_CXXFLAGS) \
- $(CXXFLAGS) $(invobject_LDFLAGS) $(LDFLAGS) -o $@
-am_rootinvobject_OBJECTS = rootinvobject-rootinvobject.$(OBJEXT)
-rootinvobject_OBJECTS = $(am_rootinvobject_OBJECTS)
-rootinvobject_DEPENDENCIES =
-rootinvobject_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(rootinvobject_CXXFLAGS) \
- $(CXXFLAGS) $(rootinvobject_LDFLAGS) $(LDFLAGS) -o $@
-am_completeex_OBJECTS = completeex-completeex.$(OBJEXT)
-completeex_OBJECTS = $(am_completeex_OBJECTS)
-completeex_DEPENDENCIES =
-completeex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(completeex_CXXFLAGS) $(CXXFLAGS) \
- $(completeex_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(builddir)/src
-depcomp = $(SHELL) $(top_builddir)/config/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(rootobject_SOURCES) $(invobject_SOURCES) $(rootinvobject_SOURCES) \
- $(completeex_SOURCES)
-AWK = gawk
-BOOST_ASIO_LIB = -lboost_system -lboost_thread-mt -lboost_date_time -lboost_regex -lboost_serialization
-BOOST_CFLAGS = -pthread -I/usr/include
-BOOST_DATE_TIME_LIB = -lboost_date_time
-BOOST_FILESYSTEM_LIB = -lboost_filesystem
-BOOST_IOSTREAMS_LIB = -lboost_iostreams
-BOOST_LIBS = -L$(LIBDIR)
-BOOST_MPI_LIB = -lboost_mpi -lboost_serialization $(BOOST_LIBS)/openmpi/lib -lmpi_cxx -lmpi
-BOOST_MPI_PYTHON_LIB = -lboost_mpi_python -lboost_serialization -lboost_python $(BOOST_LIBS) -lpython2.6 -lpthread -ldl -lutil -lm -lboost_mpi -lboost_serialization $(BOOST_LIBS)/openmpi/lib -lmpi_cxx -lmpi $(BOOST_LIBS)/openmpi/lib -lmpi_cxx -lmpi
-BOOST_PROGRAM_OPTIONS_LIB = -lboost_program_options
-BOOST_PYTHON_LIB = -lboost_python $(BOOST_LIBS) -lpython2.6 -lpthread -ldl -lutil -lm
-BOOST_REGEX_LIB = -lboost_regex
-BOOST_SERIALIZATION_LIB = -lboost_serialization
-BOOST_SIGNALS_LIB = -lboost_signals
-BOOST_SYSTEM_LIB = -lboost_system
-BOOST_THREAD_LIB = -lboost_thread-mt
-BOOST_UNIT_TEST_FRAMEWORK_LIB = -lboost_unit_test_framework
-BOOST_VERSION = 1_41
-BOOST_WSERIALIZATION_LIB = -lboost_wserialization
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS =
-CPPUNIT_CFLAGS =
-CPPUNIT_CONFIG = /usr/bin/cppunit-config
-CPPUNIT_LIBS = -lcppunit -ldl
-CPPUNIT_VERSION = 1.12.1
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -Wall
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DSYMUTIL =
-DUMPBIN =
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = /bin/grep -E
-EXEEXT =
-EXTRACC_CFLAGS = -I/home/dan/dev/deliveries/extracc-0.5.0/include
-EXTRACC_EXTRACPPUNIT_INCLUDE = include /home/dan/dev/deliveries/extracc-0.5.0/share/extracc/extracppunit/Makefile.common
-EXTRACC_LIBS = -L/home/dan/dev/deliveries/extracc-0.5.0/lib -lextracppunit
-EXTRACC_VERSION = 0.5.0
-FGREP = /bin/grep -F
-GENERIC_LIBRARY_VERSION = 99:99:99
-GREP = /bin/grep
-LD = /usr/bin/ld -m elf_$(ARCHI)
-LDFLAGS =
-LIBOBJS =
-LIBS =
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO =
-LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/dan/dev/sim/airinvsvn/trunk/airinv/config/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT =
-OBJDUMP = objdump
-OBJEXT = o
-OPENMPI_CFLAGS = -I/usr/include/openmpi-$(ARCHI) -I/usr/include/openmpi-$(ARCHI)/openmpi -I/usr/include/openmpi-$(ARCHI)/64 -m64
-OPENMPI_LIBS = -L$(LIBDIR)/openmpi/lib -lmpi_cxx -lmpi
-OPENMPI_VERSION = 1.4.1
-OTOOL =
-OTOOL64 =
-PACKAGE = airinv
-PACKAGE_BUGREPORT = den...@us...
-PACKAGE_NAME = AIRINV
-PACKAGE_STRING = AIRINV 99.99.99
-PACKAGE_TARNAME = airinv
-PACKAGE_URL =
-PACKAGE_VERSION = 99.99.99
-PATH_SEPARATOR = :
-PERL = /usr/bin/perl
-PYTHON = /usr/bin/python
-PYTHON_ADD_LIBS = -lpthread -ldl -lutil -lm
-PYTHON_CFLAGS = -I/usr/include/python2.6
-PYTHON_LIBS = -L$(LIBDIR) -lpython2.6
-PYTHON_VERSION = 2.6.4
-RANLIB = ranlib
-SED = /bin/sed
-SET_MAKE =
-SHELL = /bin/sh
-STDAIR_CFLAGS = -pthread -I/usr/include -I../../..
-STDAIR_LIBS = -L$(LIBDIR) -lboost_date_time -L../../../stdair/.libs -lstdair
-STDAIR_VERSION = 0.8.0
-STRIP = strip
-VERSION = 99.99.99
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN =
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = $(ARCHI)-unknown-linux-gnu
-build_alias =
-build_cpu = $(ARCHI)
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-exec_prefix = ${prefix}
-gs_ok = yes
-host = $(ARCHI)-unknown-linux-gnu
-host_alias =
-host_cpu = $(ARCHI)
-host_os = linux-gnu
-host_vendor = unknown
-includedir = ${prefix}/include
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-lt_ECHO = echo
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias =
-top_build_prefix = ../../..
-top_builddir = ../../..
-top_srcdir = ../../..
-AM_CPPFLAGS = -I$(top_srcdir)
-
-#
-rootobject_SOURCES = rootobject.cpp
-rootobject_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
-rootobject_LDADD =
-rootobject_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(STDAIR_LIBS)
-
-invobject_SOURCES = invobject.cpp
-invobject_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
-invobject_LDADD =
-invobject_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(STDAIR_LIBS)
-
-rootinvobject_SOURCES = rootinvobject.cpp
-rootinvobject_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
-rootinvobject_LDADD =
-rootinvobject_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(STDAIR_LIBS)
-
-completeex_SOURCES = completeex.cpp
-completeex_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
-completeex_LDADD =
-completeex_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(STDAIR_LIBS)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
-
-rootobject$(EXEEXT): $(rootobject_OBJECTS) $(rootobject_DEPENDENCIES)
- @rm -f rootobject$(EXEEXT)
- $(rootobject_LINK) $(rootobject_OBJECTS) $(rootobject_LDADD) $(LIBS)
-invobject$(EXEEXT): $(invobject_OBJECTS) $(invobject_DEPENDENCIES)
- @rm -f invobject$(EXEEXT)
- $(invobject_LINK) $(invobject_OBJECTS) $(invobject_LDADD) $(LIBS)
-rootinvobject$(EXEEXT): $(rootinvobject_OBJECTS) $(rootinvobject_DEPENDENCIES)
- @rm -f rootinvobject$(EXEEXT)
- $(rootinvobject_LINK) $(rootinvobject_OBJECTS) $(rootinvobject_LDADD) $(LIBS)
-completeex$(EXEEXT): $(completeex_OBJECTS) $(completeex_DEPENDENCIES)
- @rm -f completeex$(EXEEXT)
- $(completeex_LINK) $(completeex_OBJECTS) $(completeex_LDADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-.cpp.o:
- source='$<' object='$@' libtool=no \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(CXXCOMPILE) -c -o $@ $<
-# $(CXXCOMPILE) -MT $@ -MD -MP -MF -c -o $@ $<
-
-.cpp.obj:
- source='$<' object='$@' libtool=no \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-# $(CXXCOMPILE) -MT $@ -MD -MP -MF -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
- source='$<' object='$@' libtool=yes \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(LTCXXCOMPILE) -c -o $@ $<
-# $(LTCXXCOMPILE) -MT $@ -MD -MP -MF -c -o $@ $<
-
-rootobject-rootobject.o: rootobject.cpp
- source='rootobject.cpp' object='rootobject-rootobject.o' libtool=no \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rootobject_CXXFLAGS) $(CXXFLAGS) -c -o rootobject-rootobject.o `test -f 'rootobject.cpp' || echo '$(srcdir)/'`rootobject.cpp
-# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rootobject_CXXFLAGS) $(CXXFLAGS) -MT rootobject-rootobject.o -MD -MP -MF -c -o rootobject-rootobject.o `test -f 'rootobject.cpp' || echo '$(srcdir)/'`rootobject.cpp
-
-rootobject-rootobject.obj: rootobject.cpp
- source='rootobject.cpp' object='rootobject-rootobject.obj' libtool=no \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rootobject_CXXFLAGS) $(CXXFLAGS) -c -o rootobject-rootobject.obj `if test -f 'rootobject.cpp'; then $(CYGPATH_W) 'rootobject.cpp'; else $(CYGPATH_W) 'rootobject.cpp'; fi`
-# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rootobject_CXXFLAGS) $(CXXFLAGS) -MT rootobject-rootobject.obj -MD -MP -MF -c -o rootobject-rootobject.obj `if test -f 'rootobject.cpp'; then $(CYGPATH_W) 'rootobject.cpp'; else $(CYGPATH_W) 'rootobject.cpp'; fi`
-
-invobject-invobject.o: invobject.cpp
- source='invobject.cpp' object='invobject-invobject.o' libtool=no \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(invobject_CXXFLAGS) $(CXXFLAGS) -c -o invobject-invobject.o `test -f 'invobject.cpp' || echo '$(srcdir)/'`invobject.cpp
-# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(invobject_CXXFLAGS) $(CXXFLAGS) -MT invobject-invobject.o -MD -MP -MF -c -o invobject-invobject.o `test -f 'invobject.cpp' || echo '$(srcdir)/'`invobject.cpp
-
-invobject-invobject.obj: invobject.cpp
- source='invobject.cpp' object='invobject-invobject.obj' libtool=no \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(invobject_CXXFLAGS) $(CXXFLAGS) -c -o invobject-invobject.obj `if test -f 'invobject.cpp'; then $(CYGPATH_W) 'invobject.cpp'; else $(CYGPATH_W) '$(srcdir)/invobject.cpp'; fi`
-# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(invobject_CXXFLAGS) $(CXXFLAGS) -MT invobject-invobject.obj -MD -MP -MF -c -o invobject-invobject.obj `if test -f 'invobject.cpp'; then $(CYGPATH_W) 'invobject.cpp'; else $(CYGPATH_W) '$(srcdir)/invobject.cpp'; fi`
-
-rootinvobject-rootinvobject.o: rootinvobject.cpp
- source='rootinvobject.cpp' object='rootinvobject-rootinvobject.o' libtool=no \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rootinvobject_CXXFLAGS) $(CXXFLAGS) -c -o rootinvobject-rootinvobject.o `test -f 'rootinvobject.cpp' || echo '$(srcdir)/'`rootinvobject.cpp
-# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rootinvobject_CXXFLAGS) $(CXXFLAGS) -MT rootinvobject-rootinvobject.o -MD -MP -MF -c -o rootinvobject-rootinvobject.o `test -f 'rootinvobject.cpp' || echo '$(srcdir)/'`rootinvobject.cpp
-
-rootinvobject-rootinvobject.obj: rootinvobject.cpp
- source='rootinvobject.cpp' object='rootinvobject-rootinvobject.obj' libtool=no \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rootinvobject_CXXFLAGS) $(CXXFLAGS) -c -o rootinvobject-rootinvobject.obj `if test -f 'rootinvobject.cpp'; then $(CYGPATH_W) 'rootinvobject.cpp'; else $(CYGPATH_W) '$(srcdir)/rootinvobject.cpp'; fi`
-# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rootinvobject_CXXFLAGS) $(CXXFLAGS) -MT rootinvobject-rootinvobject.obj -MD -MP -MF -c -o rootinvobject-rootinvobject.obj `if test -f 'rootinvobject.cpp'; then $(CYGPATH_W) 'rootinvobject.cpp'; else $(CYGPATH_W) '$(srcdir)/rootinvobject.cpp'; fi`
-
-completeex-completeex.o: completeex.cpp
- source='completeex.cpp' object='completeex-completeex.o' libtool=no \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(completeex_CXXFLAGS) $(CXXFLAGS) -c -o completeex-completeex.o `test -f 'completeex.cpp' || echo '$(srcdir)/'`completeex.cpp
-# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(completeex_CXXFLAGS) $(CXXFLAGS) -MT completeex-completeex.o -MD -MP -MF -c -o completeex-completeex.o `test -f 'completeex.cpp' || echo '$(srcdir)/'`completeex.cpp
-
-completeex-completeex.obj: completeex.cpp
- source='completeex.cpp' object='completeex-completeex.obj' libtool=no \
- DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(completeex_CXXFLAGS) $(CXXFLAGS) -c -o completeex-completeex.obj `if test -f 'completeex.cpp'; then $(CYGPATH_W) 'completeex.cpp'; else $(CYGPATH_W) 'completeex.cpp'; fi`
-# $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(completeex_CXXFLAGS) $(CXXFLAGS) -MT completeex-completeex.obj -MD -MP -MF -c -o completeex-completeex.obj `if test -f 'completeex.cpp'; then $(CYGPATH_W) 'completeex.cpp'; else $(CYGPATH_W) 'completeex.cpp'; fi`
-
-mostlyclean-deps:
- -rm -f $(DEPDIR)/*.Po
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-all-am: Makefile $(PROGRAMS)
-
-mostlyclean-generic:
-
-clean-generic:
-
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool mostlyclean-deps
-
-.MAKE:
-
-.PHONY: all all-am clean clean-binPROGRAMS \
- clean-generic clean-libtool mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-# DO NOT DELETE
Deleted: trunk/stdair/doc/tutorial/src/rootinvobject.cpp
===================================================================
--- trunk/stdair/doc/tutorial/src/rootinvobject.cpp 2010-11-07 21:47:26 UTC (rev 365)
+++ trunk/stdair/doc/tutorial/src/rootinvobject.cpp 2010-11-14 16:39:38 UTC (rev 366)
@@ -1,50 +0,0 @@
-/*!
- * \page tut_rootinvobject_cpp Tutorial for the BOM Root and Inventory Objects Creation
- * \code
- */
-// STL
-#include <cassert>
-// StdAir
-#include <stdair/bom/BomRoot.hpp>
-#include <stdair/bom/Inventory.hpp>
-#include <stdair/factory/FacBomManager.hpp>
-
-// /////////////////////// M A I N ///////////////////////////
-int main() {
-
- // Create the root of the Bom tree (i.e., a BomRoot object)
- stdair::BomRoot& lBomRoot =
- stdair::FacBom<stdair::BomRoot>::instance().create();
-
- // Create an Inventory for the Airline BA
- const stdair::InventoryKey lBAKey ("BA");
- stdair::Inventory& lBAInv =
- stdair::FacBom<stdair::...
[truncated message content] |
|
From: <den...@us...> - 2010-12-02 22:17:27
|
Revision: 368
http://stdair.svn.sourceforge.net/stdair/?rev=368&view=rev
Author: denis_arnaud
Date: 2010-12-02 22:17:18 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
[API] First step towards a more granular API.
Modified Paths:
--------------
trunk/stdair/stdair/basic/BasConst.cpp
trunk/stdair/stdair/basic/BasConst_BookingClass.hpp
trunk/stdair/stdair/basic/BasConst_General.hpp
trunk/stdair/stdair/basic/BasConst_Inventory.hpp
trunk/stdair/stdair/basic/BasConst_Period_BOM.hpp
trunk/stdair/stdair/basic/BasConst_Request.hpp
trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp
trunk/stdair/stdair/basic/BasConst_Yield.hpp
trunk/stdair/stdair/basic/BasDBParams.hpp
trunk/stdair/stdair/basic/BasLogParams.hpp
trunk/stdair/stdair/basic/PassengerType.cpp
trunk/stdair/stdair/bom/AirlineFeature.cpp
trunk/stdair/stdair/bom/AirlineFeatureKey.cpp
trunk/stdair/stdair/bom/AirlineFeatureKey.hpp
trunk/stdair/stdair/bom/AirlineFeatureTypes.hpp
trunk/stdair/stdair/bom/AirlineStruct.cpp
trunk/stdair/stdair/bom/AirlineStruct.hpp
trunk/stdair/stdair/bom/BomAbstract.hpp
trunk/stdair/stdair/bom/BomHolder.hpp
trunk/stdair/stdair/bom/BomHolderKey.cpp
trunk/stdair/stdair/bom/BomManager.cpp
trunk/stdair/stdair/bom/BomManager.hpp
trunk/stdair/stdair/bom/BomRootKey.cpp
trunk/stdair/stdair/bom/BookingClassKey.cpp
trunk/stdair/stdair/bom/BookingClassKey.hpp
trunk/stdair/stdair/bom/BookingClassTypes.hpp
trunk/stdair/stdair/bom/BookingRequestStruct.cpp
trunk/stdair/stdair/bom/BookingRequestStruct.hpp
trunk/stdair/stdair/bom/Bucket.cpp
trunk/stdair/stdair/bom/Bucket.hpp
trunk/stdair/stdair/bom/BucketKey.cpp
trunk/stdair/stdair/bom/BucketKey.hpp
trunk/stdair/stdair/bom/BucketTypes.hpp
trunk/stdair/stdair/bom/EventQueue.cpp
trunk/stdair/stdair/bom/EventQueue.hpp
trunk/stdair/stdair/bom/EventStruct.cpp
trunk/stdair/stdair/bom/EventStruct.hpp
trunk/stdair/stdair/bom/EventTypes.hpp
trunk/stdair/stdair/bom/FareFamilyKey.cpp
trunk/stdair/stdair/bom/FareFamilyKey.hpp
trunk/stdair/stdair/bom/FareFamilyTypes.hpp
trunk/stdair/stdair/bom/FlightDate.cpp
trunk/stdair/stdair/bom/FlightDateKey.cpp
trunk/stdair/stdair/bom/FlightDateKey.hpp
trunk/stdair/stdair/bom/FlightDateTypes.hpp
trunk/stdair/stdair/bom/FlightPeriodTypes.hpp
trunk/stdair/stdair/bom/Inventory.cpp
trunk/stdair/stdair/bom/InventoryKey.cpp
trunk/stdair/stdair/bom/InventoryKey.hpp
trunk/stdair/stdair/bom/InventoryTypes.hpp
trunk/stdair/stdair/bom/KeyAbstract.hpp
trunk/stdair/stdair/bom/LegCabinKey.cpp
trunk/stdair/stdair/bom/LegCabinKey.hpp
trunk/stdair/stdair/bom/LegCabinTypes.hpp
trunk/stdair/stdair/bom/LegDateKey.cpp
trunk/stdair/stdair/bom/LegDateKey.hpp
trunk/stdair/stdair/bom/LegDateTypes.hpp
trunk/stdair/stdair/bom/OptimizerStruct.cpp
trunk/stdair/stdair/bom/OptimizerStruct.hpp
trunk/stdair/stdair/bom/PeriodStruct.cpp
trunk/stdair/stdair/bom/PeriodStruct.hpp
trunk/stdair/stdair/bom/SegmentCabinKey.cpp
trunk/stdair/stdair/bom/SegmentCabinKey.hpp
trunk/stdair/stdair/bom/SegmentCabinTypes.hpp
trunk/stdair/stdair/bom/SegmentDateKey.cpp
trunk/stdair/stdair/bom/SegmentDateKey.hpp
trunk/stdair/stdair/bom/SegmentDateTypes.hpp
trunk/stdair/stdair/bom/SegmentPeriodKey.cpp
trunk/stdair/stdair/bom/SegmentPeriodKey.hpp
trunk/stdair/stdair/bom/SegmentPeriodTypes.hpp
trunk/stdair/stdair/bom/TravelSolutionStruct.cpp
trunk/stdair/stdair/bom/TravelSolutionStruct.hpp
trunk/stdair/stdair/bom/YieldStore.cpp
trunk/stdair/stdair/bom/YieldStoreKey.cpp
trunk/stdair/stdair/bom/YieldStoreKey.hpp
trunk/stdair/stdair/bom/YieldStoreTypes.hpp
trunk/stdair/stdair/bom/sources.mk
trunk/stdair/stdair/command/CmdBomManager.hpp
trunk/stdair/stdair/command/DBManagerForAirlines.cpp
trunk/stdair/stdair/command/DBManagerForAirlines.hpp
trunk/stdair/stdair/dbadaptor/DbaAirline.cpp
trunk/stdair/stdair/factory/FacBom.hpp
trunk/stdair/stdair/factory/FacBomManager.cpp
trunk/stdair/stdair/service/DBSessionManager.cpp
trunk/stdair/stdair/service/DBSessionManager.hpp
trunk/stdair/stdair/service/FacSupervisor.hpp
trunk/stdair/stdair/service/Logger.cpp
trunk/stdair/stdair/service/Logger.hpp
trunk/stdair/stdair/service/STDAIR_Service.cpp
trunk/stdair/stdair/sources.mk
trunk/stdair/test/archi_static_cast/MP2BomRoot.cpp
trunk/stdair/test/archi_static_cast/MP2Inventory.cpp
trunk/stdair/test/archi_static_cast/archi_static_cast.cpp
trunk/stdair/test/architecture/MPInventory.cpp
trunk/stdair/test/architecture/architecture.cpp
trunk/stdair/test/stdair/StdairTestLib.cpp
Added Paths:
-----------
trunk/stdair/stdair/bom/key_types.hpp
trunk/stdair/stdair/stdair.hpp
trunk/stdair/stdair/stdair_db.hpp
trunk/stdair/stdair/stdair_exceptions.hpp
trunk/stdair/stdair/stdair_log.hpp
trunk/stdair/stdair/stdair_service.hpp
trunk/stdair/stdair/stdair_types.hpp
Removed Paths:
-------------
trunk/stdair/stdair/STDAIR_Service.hpp
trunk/stdair/stdair/STDAIR_Types.hpp
Deleted: trunk/stdair/stdair/STDAIR_Service.hpp
===================================================================
--- trunk/stdair/stdair/STDAIR_Service.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/STDAIR_Service.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,125 +0,0 @@
-/**
- * @brief Handle on the StdAir library context
- * @author Anh Quan Nguyen <qua...@us...>
- * @date 20/01/2010
- * @detail StdAir aims at providing a clean API, and the corresponding
- * C++ implementation, for the basis of Airline IT Business Object
- * Model (BOM), that is, to be used by several other Open Source
- * projects, such as RMOL and OpenTREP<br>
- * Install the StdAir library for Airline IT Standard C++ fundaments.
- */
-#ifndef __STDAIR_SVC_STDAIR_SERVICE_HPP
-#define __STDAIR_SVC_STDAIR_SERVICE_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// Boost
-#include <boost/shared_ptr.hpp>
-// StdAir
-#include <stdair/basic/BasLogParams.hpp>
-#include <stdair/basic/BasDBParams.hpp>
-
-namespace stdair {
-
- /// Forward declarations
- class BomRoot;
-
- /**
- * @brief Interface for the STDAIR Services
- */
- class STDAIR_Service {
- public:
- // ////////// Constructors and destructors //////////
- /**
- * @brief Default constructor.
- */
- STDAIR_Service ();
-
- /**
- * @brief Constructor.
- * <br>The init() method is called; see the corresponding
- * documentation for more details.
- * <br>Moreover, a reference on an output stream is given, so
- * that log outputs can be directed onto that stream.
- * @param[in] const BasLogParams& Parameters for the output log stream.
- */
- STDAIR_Service (const BasLogParams&);
-
- /**
- * @brief Constructor.
- * <br>The init() method is called; see the corresponding
- * documentation for more details.
- * <br>A reference on an output stream is given, so
- * that log outputs can be directed onto that stream.
- * <br>Moreover, database connection parameters are given, so
- * that database requests can use the corresponding access.
- * @param[in] const BasLogParams& Parameters for the output log stream.
- * @param[in] const BasDBParams& Parameters for the database session.
- */
- STDAIR_Service (const BasLogParams&, const BasDBParams&);
-
- /**
- * @brief Destructor.
- */
- ~STDAIR_Service();
-
- // ///////////////// Getters ///////////////////
- /**
- * @brief Get a reference on the BomRoot object.
- * <br>If the service context has not been initialised, that
- * method throws an exception (failing assertion).
- * @param[out] BomRoot& Reference on the BomRoot.
- */
- BomRoot& getBomRoot () const {
- return _bomRoot;
- }
-
- private:
- // /////// Construction and Destruction helper methods ///////
- /**
- * @brief Default copy constructor.
- * @param[in] const STDAIR_Service& Reference on the STDAIR_Service handler
- * to be copied.
- */
- STDAIR_Service (const STDAIR_Service&);
-
- /**
- * @brief Initialise the log.
- * @param[in] const BasLogParams& Parameters for the output log stream.
- */
- void logInit (const BasLogParams&);
-
- /**
- * @brief Initialise the database session.
- * @param[in] const BasDBParams& Parameters for the database session.
- */
- void dbInit (const BasDBParams&);
-
- /**
- * @brief Initialise.
- * <br>The static instance of the log service (Logger object) is created.
- * <br>The static instance of the database session manager
- * (DBSessionManager object) is created.
- * <br>The static instance of the FacSupervisor object, itself referencing
- * all the other objects (factories and BOM), is created.
- * <br>As those three objects are static, there is no need to store them
- * in any service context. However, some lock mechanism may be needed
- * in order to secure the access to the corresponding resources.
- */
- void init ();
-
- /**
- * @brief Finalise.
- */
- void finalise ();
-
- private:
- // /////////////// Attributes ///////////////
- /**
- * @brief Root of the BOM tree.
- */
- BomRoot& _bomRoot;
- };
-}
-#endif // __STDAIR_SVC_STDAIR_SERVICE_HPP
Deleted: trunk/stdair/stdair/STDAIR_Types.hpp
===================================================================
--- trunk/stdair/stdair/STDAIR_Types.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/STDAIR_Types.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,670 +0,0 @@
-#ifndef __STDAIR_STDAIR_TYPES_HPP
-#define __STDAIR_STDAIR_TYPES_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// STL
-#include <string>
-#include <vector>
-#include <list>
-#include <map>
-// Boost Random
-#include <boost/random/linear_congruential.hpp>
-#include <boost/random/uniform_real.hpp>
-#include <boost/random/variate_generator.hpp>
-// Boost (Extended STL)
-#include <boost/date_time/gregorian/gregorian.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/tuple/tuple.hpp>
-#include <boost/shared_ptr.hpp>
-
-// Forward declarations
-namespace soci {
- class session;
- class statement;
-}
-
-namespace stdair {
- // Forward declarations
- class STDAIR_Service;
-
- // ////////////////////////////////////////////////////////////////////
- //
- // Exceptions
- //
- // ////////////////////////////////////////////////////////////////////
- // ////////////////////////////////////////////////////////////////////
- class RootException : public std::exception {
- public:
- /** Constructors. */
- RootException (const std::string& iWhat) : _what (iWhat) {}
- RootException () : _what ("No more details") {}
- /** Destructor. */
- virtual ~RootException() throw() {}
- /** Give the details of the exception. */
- const char* what() const throw() { return _what.c_str(); }
- protected:
- /** Details for the exception. */
- std::string _what;
- };
- // ////////////////////////////////////////////////////////////////////
- class FileNotFoundException : public RootException {
- public:
- /** Constructor. */
- FileNotFoundException (const std::string& iWhat) : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class NonInitialisedLogServiceException : public RootException {
- public:
- /** Constructor. */
- NonInitialisedLogServiceException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class NonInitialisedDBSessionManagerException : public RootException {
- public:
- /** Constructor. */
- NonInitialisedDBSessionManagerException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class NonInitialisedServiceException : public RootException {
- public:
- /** Constructor. */
- NonInitialisedServiceException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class NonInitialisedContainerException : public RootException {
- public:
- /** Constructor. */
- NonInitialisedContainerException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class NonInitialisedRelationShipException : public RootException {
- public:
- /** Constructor. */
- NonInitialisedRelationShipException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class MemoryAllocationException : public RootException {
- public:
- /** Constructor. */
- MemoryAllocationException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class ObjectLinkingException : public RootException {
- public:
- /** Constructor. */
- ObjectLinkingException (const std::string& iWhat) : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class ParserException : public RootException {
- public:
- /** Constructor. */
- ParserException (const std::string& iWhat) : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class DocumentNotFoundException : public RootException {
- public:
- /** Constructor. */
- DocumentNotFoundException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class CodeConversionException : public ParserException {
- public:
- /** Constructor. */
- CodeConversionException (const std::string& iWhat)
- : ParserException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class CodeDuplicationException : public ParserException {
- public:
- /** Constructor. */
- CodeDuplicationException (const std::string& iWhat)
- : ParserException(iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class ObjectCreationgDuplicationException : public ParserException {
- public:
- /** Constructor. */
- ObjectCreationgDuplicationException (const std::string& iWhat)
- : ParserException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class ObjectNotFoundException : public RootException {
- public:
- /** Constructor. */
- ObjectNotFoundException (const std::string& iWhat) : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class SQLDatabaseException : public RootException {
- public:
- /** Constructor. */
- SQLDatabaseException (const std::string& iWhat) : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class SQLDatabaseConnectionImpossibleException : public SQLDatabaseException {
- public:
- /** Constructor. */
- SQLDatabaseConnectionImpossibleException (const std::string& iWhat)
- : SQLDatabaseException (iWhat) {}
- };
-
- // /////////////// Log /////////////
- /** Level of logs. */
- namespace LOG {
- typedef enum {
- CRITICAL = 0,
- ERROR,
- NOTIFICATION,
- WARNING,
- DEBUG,
- VERBOSE,
- LAST_VALUE
- } EN_LogLevel;
-
- static const std::string _logLevels[LAST_VALUE] =
- {"C", "E", "N", "W", "D", "V"};
- }
-
- // //////// Type definitions /////////
- /** Database session handler. */
- typedef soci::session DBSession_T;
-
- /** Database request statement handler. */
- typedef soci::statement DBRequestStatement_T;
-
- /** Define the type for network ID. */
- typedef std::string NetworkID_T;
-
- /** Define the Airline Code type (2-letter-code, e.g., BA). */
- typedef std::string AirlineCode_T;
-
- /** Define a list of airline code. */
- typedef std::vector<AirlineCode_T> AirlineCodeList_T;
-
- /** Location code (3-letter-code, e.g., LON). */
- typedef std::string LocationCode_T;
-
- /** Define the Airport Code type (3-letter-code, e.g., LHR). */
- typedef LocationCode_T AirportCode_T;
-
- /** Define the type for flight numbers. */
- typedef unsigned short FlightNumber_T;
-
- /** Define the file address type (e.g. "a_directory/a_filename")*/
- typedef std::string FileAddress_T;
-
- /** Define the replication number. */
- typedef unsigned int ReplicationNumber_T;
-
- /** Define the seed type of an Exponential function. */
- typedef unsigned long int ExponentialSeed_T;
-
- /** Define the seed type of an Uniform function. */
- typedef unsigned long int UniformSeed_T;
-
- /** Define the Request status for booking (1-letter-code, e.g.,
- B: booked, C: cancelled, R: Rejected). */
- typedef std::string RequestStatus_T;
-
- /** Define the type for durations (e.g., elapsed in-flight time). */
- typedef boost::posix_time::time_duration Duration_T;
-
- /** Define the type for date (e.g., departure date of a flight). */
- typedef boost::gregorian::date Date_T;
-
- /** Time */
- typedef boost::posix_time::time_duration Time_T;
-
- /** Define an accurate time (date+time). */
- typedef boost::posix_time::ptime DateTime_T;
-
- /** Define a distance (kilometers). */
- typedef long int Distance_T;
-
- /** Define the Period (e.g., period during which flights depart). */
- typedef boost::gregorian::date_period DatePeriod_T;
-
- /** Define the Day-Of-the-Week as a string. */
- typedef std::string DOW_String_T;
-
- /** Define the Date Offset (e.g., -1 ). */
- typedef boost::gregorian::date_duration DateOffset_T;
-
- /** Define a duration in number of days. */
- typedef unsigned int DayDuration_T;
-
- /** Define the Saturday stay status of a travel. */
- typedef bool SaturdayStay_T;
-
- /** Define the availability option allowing the ticket change. */
- typedef bool ChangeFees_T;
-
- /** Define the refundable availability of a tickets. */
- typedef bool NonRefundable_T;
-
- /** Define the average ratio (between 0 and 100) of demand with
- a saturday stay status equal to TRUE. */
- typedef unsigned int SaturdayStayRatio_T;
-
- /** Define the average ratio of demand with change fee
- availability. */
- typedef unsigned int ChangeFeesRatio_T;
-
- /** Define the average ratio of demand with non-refundable
- availability. */
- typedef unsigned int NonRefundableRatio_T;
-
- /** Define the passenger characteristics, leisure or business
- for instance (1-letter-code, e.g., L or B). */
- typedef std::string PassengerType_T;
-
- /** Define the identifier of a distribution pattern (e.g., 1). */
- typedef std::string DistributionPatternId_T;
-
- /** Define the identifier of a cancellation rate curve (e.g., C1). */
- typedef std::string CancellationRateCurveId_T;
-
- /** Define the identifier of an airline preference set list (e.g., AP1). */
- typedef std::string AirlinePreferenceId_T;
-
- /** Define a percentage value (between 0 and 100%). */
- typedef double Percentage_T;
-
- /** Define a cancellation & and no-show rate pair. */
- typedef std::pair<Percentage_T, Percentage_T> CancellationNoShowRatePair_T;
-
- /** Define the identifier of a demand characteristics pattern
- (e.g. Ch12); for a customer choice model */
- typedef std::string CharacteristicsPatternId_T;
-
- /** Define characteristics component index (e.g. W for WTP) */
- typedef std::string CharacteristicsIndex_T;
-
- /** Define the cabin code (class of service, e.g., first, business,
- economy). */
- typedef std::string CabinCode_T;
-
- /** Define a price value (e.g., 1000.0 Euros). */
- typedef double PriceValue_T;
-
- /** Define a price currency (e.g., EUR for Euros). */
- typedef std::string PriceCurrency_T;
-
- /** Define a Willingness-To-Pay (WTP) (e.g., 1000.0 Euros). */
- typedef double WTP_T;
-
- /** Define the number of seats (it can be non integer, because the
- overbooking can be applied at booking class or PNR level). */
- typedef double NbOfSeats_T;
-
- /** Define the number of seats required by a demand. */
- // typedef unsigned short NbOfSeats_T;
-
- /** Number of passengers (in a group) for a booking. */
- typedef unsigned short PartySize_T;
-
- /** Define a mean value (e.g., 20.2). */
- typedef double MeanValue_T;
-
- /** Define a standard deviation value (e.g., 1.5). */
- typedef double StdDevValue_T;
-
- /** Define the cabin capacity (resource, e.g., 200 seats).
- <br>The capacity is expressed as a double to cope with overbooking. */
- typedef double CabinCapacity_T;
-
- /** Define the number of seat which could not be used for the booking. */
- typedef double BlockSpace_T;
-
- /** Define the code of the fare family (e.g., 1, 2, 3, etc.). */
- typedef std::string FamilyCode_T;
-
- /** Define the booking class code (product segment class, e.g., H,
- B, K, etc.). */
- typedef std::string ClassCode_T;
-
- /** Define a list of class code. */
- typedef std::vector<ClassCode_T> ClassCodeList_T;
-
- /** Define the sub-class code (e.g., 0, 1, 2, etc.). The subclass is
- a sub-structure for the booking class, allowing to have specific
- rules for some criteria like POS. */
- typedef unsigned short SubclassCode_T;
-
- /** Define the flight path code (code made by a suite of flight numbers). */
- typedef std::string FlightPathCode_T;
-
- /** Define an availability. */
- typedef double Availability_T;
-
- /** Define an availability. */
- typedef bool AvailabilityStatus_T;
-
- /** Define a list of availabilities. */
- typedef std::vector<Availability_T> BucketAvailabilities_T;
-
- /** Define a identity number. */
- typedef unsigned long Identity_T;
-
- /** Define a map between a BookingID and a TravelSolutionID. */
- typedef std::map<Identity_T, Identity_T> BookingTSIDMap_T;
-
- /** Define a number of requests. */
- typedef double NbOfRequests_T;
-
- /** Define a number of bookings. */
- typedef NbOfRequests_T NbOfBookings_T;
-
- /** Define a number of cancellations (travellers). */
- typedef NbOfRequests_T NbOfCancellations_T;
-
- /** Define a number of no-shows. */
- typedef NbOfRequests_T NbOfNoShows_T;
-
- /** Define a number of fare rules. */
- typedef double NbOfFareRules_T;
-
- /** Define a number of yields. */
- typedef double NbOfYields_T;
-
- /** Define a number of InventoryControlRules. */
- typedef double NbOfInventoryControlRules_T;
-
- /** Define a number of flight dates. */
- typedef double NbOfFlightDates_T;
-
- /** Define the commited space of a cabin. */
- typedef double CommitedSpace_T;
-
- /** Define the unsold protection (UPR). */
- typedef double UPR_T;
-
- /** Define availibility of booking limit. */
- typedef bool CensorshipFlag_T;
-
- /** Define the list of censorship flags (une list per booking
- class, one censorship flag per DCP). */
- typedef std::vector<bool> CensorshipFlagList_T;
-
- /** Define the value of the booking limit. */
- typedef double BookingLimit_T;
-
- /** Define the value of the authorization level. */
- typedef double AuthorizationLevel_T;
-
- /** Define the value of the adjustment for cabin capacity. */
- typedef double CapacityAdjustment_T;
-
- /** Define the rate of overbooking */
- typedef double OverbookingRate_T;
-
- /** Define the bookingRatio (for instance OnD bookings
- over whole class bookings). */
- typedef double BookingRatio_T;
-
- /** Define the list of class codes as a string. */
- typedef std::string ClassList_String_T;
-
- /** Define a number of segment-dates (in a path). */
- typedef unsigned short NbOfSegments_T;
-
- /** Define a number of airlines (in a path). */
- typedef unsigned short NbOfAirlines_T;
-
- /** Define the fare of a travel solution. */
- typedef double Fare_T;
-
- /** Define the yield of a virtual class. */
- typedef double Yield_T;
-
- /** Define the Bid-Price. */
- typedef double BidPrice_T;
-
- /** Define a Bid-Price Vector. */
- typedef std::vector<BidPrice_T> BidPriceVector_T;
-
- /** Define the current index of a Bid-Price Vector (for a given LegCabin). */
- typedef unsigned int SeatIndex_T;
-
- /** Define a number of travel solutions
- (in a travel solution block). */
- typedef unsigned short NbOfTravelSolutions_T;
-
- /** Define a indicator of demand to class matching. */
- typedef double MatchingIndicator_T;
-
- /** Define an amount of revenue. */
- typedef double Revenue_T;
-
- /** Define the name of an event. */
- typedef std::string EventName_T;
-
- /** Define the name of an database connection. */
- typedef std::string DBConnectionName_T;
-
- /** Define a number of events. */
- typedef double NbOfEvents_T;
-
- /** Frequency of the Data Collection Point description (daily, monthly or
- detailed). */
- typedef std::string DCPModeFrequency_T;
-
- /** Mode of the Data Collection Point description (Forecaster only,
- Optimizer only or both of them). */
- typedef std::string DCPMode_T;
-
- /** Mode of the forecaster. */
- typedef std::string ForecasterMode_T;
-
- /** Limit of similar flight-dates used in the forecaster. */
- typedef short HistoricalDataLimit_T;
-
- /** Mode of the forecaster. */
- typedef std::string OptimizerMode_T;
-
- /** Mode of the forecaster. */
- typedef std::string DicoOptimizerMode_T;
-
- /** Mode of inventory control. */
- typedef std::string ControlMode_T;
-
- /** Define the name of a multiplier. */
- typedef double Multiplier_T;
-
- /** Define the name of a WTP-component of characteristics pattern. */
- typedef boost::tuples::tuple<double, double> CharacteristicsWTP_tuple_T;
-
- /** Define the name of sell-up probability flag for RMS optimizer. */
- typedef bool SellupFlagForOptimizer_T;
-
- /** Define the name of sell-up probability for RMS optimizer. */
- typedef double SellupProbabilityForOptimizer_T;
-
- /** Define the name of sell-up probability vector for RMS optimizer. */
- typedef std::vector<SellupProbabilityForOptimizer_T>
- SellupProbabilityVector_T;
-
- /** Define the demand for a policy. */
- typedef NbOfBookings_T PolicyDemand_T;
-
- /** Define the total revenue of an unconstrained policy. */
- typedef double PolicyRevenue_T;
-
- /** Define the total revenue of an unconstrained policy. */
- typedef double PolicyRevenue_T;
-
- // ///////////// Technical ////////////////
- /** File or directory name.
- <br>It may contain paths, relative or absolute (e.g., /foo/bar
- or C:\foo\bar). */
- typedef std::string Filename_T;
-
- /** Pointer on the STDAIR Service handler. */
- typedef boost::shared_ptr<STDAIR_Service> STDAIR_ServicePtr_T;
-
- // //////////////////////////////////////////////////////////////////////
- // Random generation
- /** Seed for the random generation, so that it can be reproductible. */
- typedef unsigned long int RandomSeed_T;
-
- /** Random number generator. */
- typedef boost::minstd_rand BaseGenerator_T;
-
- /** Uniform random generator. */
- typedef boost::variate_generator<stdair::BaseGenerator_T&,
- boost::uniform_real<> > UniformGenerator_T;
-
- // //////////////////////////////////////////////////////////////////////
- // Probability
- /** Probability */
- typedef float Probability_T;
-
- // //////////////////////////////////////////////////////////////////////
- // Date / Time
- /** Time duration in (integer) number of seconds */
- typedef long int IntDuration_T;
-
- /** Time duration in (long long integer) number of milliseconds */
- typedef long long int LongDuration_T;
-
- /** Duration in (float) number of time units */
- typedef float FloatDuration_T;
-
- // //////////////////////////////////////////////////////////////////////
- // Basic types
- /** Event type */
- typedef std::string EventType_T;
-
- /** Count */
- typedef int Count_T;
-
- /** City code */
- typedef LocationCode_T CityCode_T;
-
- /** Trip type */
- typedef std::string TripType_T;
-
- /** Monetary value */
- typedef double MonetaryValue_T;
-
- /** Real number */
- typedef double RealNumber_T;
-
- /** Type definition for the hashed key of the DemandStreamKey object. */
- typedef std::string DemandStreamKeyStr_T;
-
- /** Type of booking channel (D=direct, I=indirect, N=oNline, F=oFfline). */
- typedef std::string ChannelLabel_T;
-
- /** Type of trip type (RO=outbound of round-trip, RI=inbound of round-trip,
- OW=one way). */
- typedef std::string TripType_T;
-
- /** Type of frequent flyer (P=Platinum, G=Gold, S=Silver, M=Member, N=None). */
- typedef std::string FrequentFlyer_T;
-
- /** Key of a STL map. */
- typedef std::string MapKey_T;
-
- /** List of keys. */
- typedef std::vector<std::string> KeyList_T;
-
- /** Map between the cabin codes and the booking class codes within
- each cabin. */
- typedef std::map<CabinCode_T, ClassList_String_T> CabinBookingClassMap_T;
-
-}
-
-#define CATCH_ALL_EXCEPTIONS \
- catch (const stdair::FileNotFoundException& ex) { \
- std::cerr << "FileNotFoundException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::NonInitialisedLogServiceException& ex) { \
- std::cerr << "NonInitialisedLogServiceException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::NonInitialisedDBSessionManagerException& ex) { \
- std::cerr << "NonInitialisedDBSessionManagerException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::NonInitialisedServiceException& ex) { \
- std::cerr << "NonInitialisedServiceException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::NonInitialisedContainerException& ex) { \
- std::cerr << "NonInitialisedContainerException" \
- << ex.what() <<std::endl; \
- return -1; \
- \
- } catch (const stdair::NonInitialisedRelationShipException& ex) { \
- std::cerr << "NonInitialisedRelationShipException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::MemoryAllocationException& ex) { \
- std::cerr << "MemoryAllocationException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::ObjectLinkingException& ex) { \
- std::cerr << "ObjectLinkingException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::CodeConversionException& ex) { \
- std::cerr << "CodeConversionException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::CodeDuplicationException& ex) { \
- std::cerr << "CodeDuplicationException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::ObjectCreationgDuplicationException& ex) { \
- std::cerr << "ObjectCreationgDuplicationException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::ObjectNotFoundException& ex) { \
- std::cerr << "ObjectNotFoundException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::DocumentNotFoundException& ex) { \
- std::cerr << "DocumentNotFoundException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::SQLDatabaseConnectionImpossibleException& ex) {\
- std::cerr << "SQLDatabaseConnectionImpossibleException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::SQLDatabaseException& ex) { \
- std::cerr << "SQLDatabaseException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::ParserException& ex) { \
- std::cerr << "ParserException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::RootException& ex) { \
- std::cerr << "RootException" << ex.what() <<std::endl; \
- return -1; \
- \
- } catch (const std::exception& stde) { \
- std::cerr << "Standard exception: " << stde.what() << std::endl; \
- return -1; \
- \
- } catch (...) { \
- return -1; \
- }
-
-#endif // __STDAIR_STDAIR_TYPES_HPP
Modified: trunk/stdair/stdair/basic/BasConst.cpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -3,8 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <string>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
#include <stdair/basic/BasConst_General.hpp>
#include <stdair/basic/BasConst_Request.hpp>
#include <stdair/basic/BasConst_Inventory.hpp>
Modified: trunk/stdair/stdair/basic/BasConst_BookingClass.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_BookingClass.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_BookingClass.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,8 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_General.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_General.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_General.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_Inventory.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_Inventory.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_Inventory.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,8 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_Period_BOM.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_Period_BOM.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_Period_BOM.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,8 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_Request.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_Request.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_Request.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,8 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// LATUS Common
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_Yield.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_Yield.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_Yield.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,8 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasDBParams.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasDBParams.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasDBParams.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,7 +8,7 @@
#include <iosfwd>
#include <string>
// Stdair
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_db.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasLogParams.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasLogParams.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasLogParams.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,7 +8,7 @@
#include <iosfwd>
#include <string>
// Stdair
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_log.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/PassengerType.cpp
===================================================================
--- trunk/stdair/stdair/basic/PassengerType.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/PassengerType.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -5,9 +5,7 @@
#include <cassert>
#include <sstream>
// StdAir
-#include <stdair/service/Logger.hpp>
-// Stdair
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_exceptions.hpp>
#include <stdair/basic/PassengerType.hpp>
namespace stdair {
@@ -53,7 +51,8 @@
}
// //////////////////////////////////////////////////////////////////////
- std::string PassengerType::getTypeLabelAsString(const EN_PassengerType& iType){
+ std::string PassengerType::
+ getTypeLabelAsString (const EN_PassengerType& iType) {
std::ostringstream oStr;
oStr << _typeLabels[iType];
return oStr.str();
Modified: trunk/stdair/stdair/bom/AirlineFeature.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeature.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineFeature.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,14 +4,13 @@
// STL
#include <cassert>
// STDAIR
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/AirlineFeature.hpp>
namespace stdair {
// ////////////////////////////////////////////////////////////////////
- AirlineFeature::
- AirlineFeature (const Key_T& iKey)
- : _key (iKey) {
+ AirlineFeature::AirlineFeature (const Key_T& iKey) : _key (iKey) {
}
// ////////////////////////////////////////////////////////////////////
Modified: trunk/stdair/stdair/bom/AirlineFeatureKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeatureKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineFeatureKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/AirlineFeatureKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineFeatureKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeatureKey.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineFeatureKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,7 +4,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineFeatureTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeatureTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineFeatureTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,8 +8,8 @@
// STL
#include <map>
#include <list>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineStruct.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -7,6 +7,7 @@
#include <ostream>
#include <sstream>
// StdAir
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/AirlineStruct.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineStruct.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -9,7 +9,6 @@
#include <string>
#include <vector>
// StdAir
-#include <stdair/STDAIR_Types.hpp>
#include <stdair/basic/StructAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BomAbstract.hpp
===================================================================
--- trunk/stdair/stdair/bom/BomAbstract.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomAbstract.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -14,8 +14,6 @@
#include <string>
#include <map>
#include <typeinfo>
-// StdAir
-#include <stdair/STDAIR_Types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BomHolder.hpp
===================================================================
--- trunk/stdair/stdair/bom/BomHolder.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomHolder.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -9,10 +9,12 @@
#include <list>
#include <map>
// StdAir
+#include <stdair/bom/key_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BomHolderKey.hpp>
namespace stdair {
+
/** Class representing the holders of BOM. */
template <typename BOM>
class BomHolder : public stdair::BomAbstract {
Modified: trunk/stdair/stdair/bom/BomHolderKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BomHolderKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomHolderKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// STL
+#include <ostream>
+#include <sstream>
+// StdAir
#include <stdair/bom/BomHolderKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BomManager.cpp
===================================================================
--- trunk/stdair/stdair/bom/BomManager.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomManager.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -3,9 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-#include <ostream>
// StdAir
-#include <stdair/STDAIR_Types.hpp>
#include <stdair/basic/BasConst_BomManager.hpp>
#include <stdair/bom/BomManager.hpp>
Modified: trunk/stdair/stdair/bom/BomManager.hpp
===================================================================
--- trunk/stdair/stdair/bom/BomManager.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomManager.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -6,8 +6,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <iosfwd>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_exceptions.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BomHolder.hpp>
#include <stdair/service/Logger.hpp>
Modified: trunk/stdair/stdair/bom/BomRootKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BomRootKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomRootKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// STL
+#include <ostream>
+#include <sstream>
+// StdAir
#include <stdair/bom/BomRootKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingClassKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/BookingClassKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingClassKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,10 +4,11 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
+
/** Key of booking-class. */
struct BookingClassKey : public KeyAbstract {
Modified: trunk/stdair/stdair/bom/BookingClassTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BookingClassTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,8 +8,8 @@
// STL
#include <map>
#include <list>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingRequestStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingRequestStruct.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BookingRequestStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -7,6 +7,7 @@
#include <ostream>
#include <sstream>
// StdAir
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/BookingRequestStruct.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingRequestStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingRequestStruct.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BookingRequestStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,7 +8,6 @@
#include <iosfwd>
#include <string>
// StdAir
-#include <stdair/STDAIR_Types.hpp>
#include <stdair/basic/StructAbstract.hpp>
#include <stdair/bom/BookingRequestTypes.hpp>
Modified: trunk/stdair/stdair/bom/Bucket.cpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/Bucket.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,6 +4,7 @@
// STL
#include <cassert>
// STDAIR
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/Bucket.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/Bucket.hpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/Bucket.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -65,7 +65,6 @@
stdair::CabinCapacity_T _availability;
stdair::NbOfSeats_T _nbOfSeats;
stdair::SeatIndex_T _seatIndex;
-
};
}
Modified: trunk/stdair/stdair/bom/BucketKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BucketKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BucketKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/BucketKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BucketKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BucketKey.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BucketKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,6 +8,7 @@
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
+
/** Key of booking-class. */
struct BucketKey : public KeyAbstract {
Modified: trunk/stdair/stdair/bom/BucketTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/BucketTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BucketTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,11 +8,12 @@
// STL
#include <map>
#include <list>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/bom/key_types.hpp>
namespace stdair {
- // Forward declarations.
+
+ // Forward declarations
class Bucket;
/** Define the Inventory list. */
Modified: trunk/stdair/stdair/bom/EventQueue.cpp
===================================================================
--- trunk/stdair/stdair/bom/EventQueue.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/EventQueue.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -2,6 +2,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STDAIR
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/EventStruct.hpp>
#include <stdair/bom/EventQueue.hpp>
Modified: trunk/stdair/stdair/bom/EventQueue.hpp
===================================================================
--- trunk/stdair/stdair/bom/EventQueue.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/EventQueue.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -7,7 +7,6 @@
// STL
#include <iosfwd>
// StdAir
-#include <stdair/STDAIR_Types.hpp>
#include <stdair/basic/StructAbstract.hpp>
#include <stdair/bom/EventTypes.hpp>
Modified: trunk/stdair/stdair/bom/EventStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/EventStruct.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/EventStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -2,6 +2,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STDAIR
+#include <stdair/stdair_types.hpp>
#include <stdair/basic/BasConst_General.hpp>
#include <stdair/bom/BookingRequestStruct.hpp>
#include <stdair/bom/EventStruct.hpp>
Modified: trunk/stdair/stdair/bom/EventStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/EventStruct.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/EventStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -5,7 +5,6 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STDAIR
-#include <stdair/STDAIR_Types.hpp>
#include <stdair/bom/BookingRequestTypes.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/EventTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/EventTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/EventTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,7 +8,7 @@
// STL
#include <map>
// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FareFamilyKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/FareFamilyKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FareFamilyKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/FareFamilyKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FareFamilyKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/FareFamilyKey.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FareFamilyKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,10 +4,11 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
+
/** Key of fare family. */
struct FareFamilyKey : public KeyAbstract {
Modified: trunk/stdair/stdair/bom/FareFamilyTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/FareFamilyTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FareFamilyTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,8 +8,8 @@
// STL
#include <map>
#include <list>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDate.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,6 +4,7 @@
// STL
#include <cassert>
// STDAIR
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/FlightDate.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/FlightDateKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,7 +4,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDateTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FlightDateTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -9,7 +9,7 @@
#include <map>
#include <list>
// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightPeriodTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightPeriodTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FlightPeriodTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,8 +8,8 @@
// STL
#include <map>
#include <list>
-// STDAIR
-#include <stdair/S...
[truncated message content] |
|
From: <den...@us...> - 2010-12-02 23:41:42
|
Revision: 369
http://stdair.svn.sourceforge.net/stdair/?rev=369&view=rev
Author: denis_arnaud
Date: 2010-12-02 23:41:34 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
[API] First step towards a more granular API.
Modified Paths:
--------------
trunk/stdair/stdair/basic/BasConst_BookingClass.hpp
trunk/stdair/stdair/bom/AirlineFeature.cpp
trunk/stdair/stdair/bom/AirlineFeature.hpp
trunk/stdair/stdair/bom/AirlineFeatureKey.cpp
trunk/stdair/stdair/bom/AirlineFeatureKey.hpp
trunk/stdair/stdair/bom/AirlineStruct.cpp
trunk/stdair/stdair/bom/AirlineStruct.hpp
trunk/stdair/stdair/bom/BookingClassKey.cpp
trunk/stdair/stdair/bom/BookingClassKey.hpp
trunk/stdair/stdair/bom/BookingRequestStruct.cpp
trunk/stdair/stdair/bom/BookingRequestStruct.hpp
trunk/stdair/stdair/bom/Bucket.cpp
trunk/stdair/stdair/bom/Bucket.hpp
trunk/stdair/stdair/bom/BucketKey.cpp
trunk/stdair/stdair/bom/EventQueue.cpp
trunk/stdair/stdair/bom/EventQueue.hpp
trunk/stdair/stdair/bom/EventStruct.cpp
trunk/stdair/stdair/bom/EventStruct.hpp
trunk/stdair/stdair/bom/EventTypes.hpp
trunk/stdair/stdair/bom/FareFamilyKey.cpp
trunk/stdair/stdair/bom/FareFamilyKey.hpp
trunk/stdair/stdair/bom/FlightDate.cpp
trunk/stdair/stdair/bom/FlightDate.hpp
trunk/stdair/stdair/bom/FlightDateKey.cpp
trunk/stdair/stdair/bom/FlightDateKey.hpp
trunk/stdair/stdair/bom/Inventory.cpp
trunk/stdair/stdair/bom/Inventory.hpp
trunk/stdair/stdair/bom/InventoryKey.cpp
trunk/stdair/stdair/bom/InventoryKey.hpp
trunk/stdair/stdair/bom/LegCabinKey.cpp
trunk/stdair/stdair/bom/LegCabinKey.hpp
trunk/stdair/stdair/bom/LegDateKey.cpp
trunk/stdair/stdair/bom/LegDateKey.hpp
trunk/stdair/stdair/bom/SegmentCabinKey.cpp
trunk/stdair/stdair/bom/SegmentCabinKey.hpp
trunk/stdair/stdair/bom/SegmentDate.cpp
trunk/stdair/stdair/bom/SegmentDate.hpp
trunk/stdair/stdair/bom/SegmentDateKey.cpp
trunk/stdair/stdair/bom/SegmentDateKey.hpp
trunk/stdair/stdair/bom/SegmentPeriodKey.cpp
trunk/stdair/stdair/bom/SegmentPeriodKey.hpp
trunk/stdair/stdair/bom/YieldStore.cpp
trunk/stdair/stdair/bom/YieldStore.hpp
trunk/stdair/stdair/bom/YieldStoreKey.cpp
trunk/stdair/stdair/bom/YieldStoreKey.hpp
trunk/stdair/stdair/command/DBManagerForAirlines.cpp
trunk/stdair/stdair/dbadaptor/DbaAirline.cpp
trunk/stdair/stdair/sources.mk
trunk/stdair/stdair/stdair_types.hpp
trunk/stdair/test/archi_static_cast/MP2Inventory.cpp
trunk/stdair/test/archi_static_cast/archi_static_cast.cpp
trunk/stdair/test/architecture/MPInventory.cpp
trunk/stdair/test/architecture/architecture.cpp
trunk/stdair/test/stdair/StdairTestLib.cpp
Added Paths:
-----------
trunk/stdair/stdair/stdair_basic_types.hpp
trunk/stdair/stdair/stdair_date_time_types.hpp
trunk/stdair/stdair/stdair_demand_types.hpp
trunk/stdair/stdair/stdair_fare_types.hpp
trunk/stdair/stdair/stdair_inventory_types.hpp
Modified: trunk/stdair/stdair/basic/BasConst_BookingClass.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_BookingClass.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/basic/BasConst_BookingClass.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,7 +5,10 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_demand_types.hpp>
+#include <stdair/stdair_fare_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineFeature.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeature.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineFeature.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,7 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
+// StdAir
#include <stdair/stdair_types.hpp>
#include <stdair/bom/AirlineFeature.hpp>
Modified: trunk/stdair/stdair/bom/AirlineFeature.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeature.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineFeature.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/AirlineFeatureKey.hpp>
#include <stdair/bom/AirlineFeatureTypes.hpp>
Modified: trunk/stdair/stdair/bom/AirlineFeatureKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeatureKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineFeatureKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/AirlineFeatureKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineFeatureKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeatureKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineFeatureKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineStruct.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -7,7 +7,6 @@
#include <ostream>
#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/AirlineStruct.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineStruct.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/basic/StructAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingClassKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -2,7 +2,6 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/BookingClassKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingClassKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingRequestStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingRequestStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/BookingRequestStruct.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -7,7 +7,6 @@
#include <ostream>
#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/BookingRequestStruct.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingRequestStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingRequestStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/BookingRequestStruct.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -8,6 +8,8 @@
#include <iosfwd>
#include <string>
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_demand_types.hpp>
#include <stdair/basic/StructAbstract.hpp>
#include <stdair/bom/BookingRequestTypes.hpp>
Modified: trunk/stdair/stdair/bom/Bucket.cpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/Bucket.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,8 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/Bucket.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/Bucket.hpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/Bucket.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STDAIR
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BucketKey.hpp>
#include <stdair/bom/BucketTypes.hpp>
Modified: trunk/stdair/stdair/bom/BucketKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BucketKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/BucketKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/BucketKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/EventQueue.cpp
===================================================================
--- trunk/stdair/stdair/bom/EventQueue.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/EventQueue.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/EventStruct.hpp>
#include <stdair/bom/EventQueue.hpp>
Modified: trunk/stdair/stdair/bom/EventQueue.hpp
===================================================================
--- trunk/stdair/stdair/bom/EventQueue.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/EventQueue.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -7,6 +7,7 @@
// STL
#include <iosfwd>
// StdAir
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/basic/StructAbstract.hpp>
#include <stdair/bom/EventTypes.hpp>
Modified: trunk/stdair/stdair/bom/EventStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/EventStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/EventStruct.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/basic/BasConst_General.hpp>
#include <stdair/bom/BookingRequestStruct.hpp>
#include <stdair/bom/EventStruct.hpp>
Modified: trunk/stdair/stdair/bom/EventStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/EventStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/EventStruct.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_date_time_types.hpp>
+#include <stdair/stdair_demand_types.hpp>
#include <stdair/bom/BookingRequestTypes.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/EventTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/EventTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/EventTypes.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -8,6 +8,7 @@
// STL
#include <map>
// STDAIR
+#include <stdair/stdair_date_time_types.hpp>
#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FareFamilyKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/FareFamilyKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FareFamilyKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/FareFamilyKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FareFamilyKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/FareFamilyKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FareFamilyKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDate.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,8 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/FlightDate.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDate.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FlightDate.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/FlightDateKey.hpp>
#include <stdair/bom/FlightDateTypes.hpp>
Modified: trunk/stdair/stdair/bom/FlightDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -2,14 +2,13 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/FlightDateKey.hpp>
namespace stdair {
// ////////////////////////////////////////////////////////////////////
FlightDateKey::FlightDateKey (const FlightNumber_T& iFlightNumber,
- const Date_T& iFlightDate)
+ const Date_T& iFlightDate)
: _flightNumber (iFlightNumber), _flightDate (iFlightDate) {
}
Modified: trunk/stdair/stdair/bom/FlightDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,9 +5,11 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
+
/** Key of flight-date. */
struct FlightDateKey : public KeyAbstract {
Modified: trunk/stdair/stdair/bom/Inventory.cpp
===================================================================
--- trunk/stdair/stdair/bom/Inventory.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/Inventory.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,8 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/Inventory.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/Inventory.hpp
===================================================================
--- trunk/stdair/stdair/bom/Inventory.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/Inventory.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/InventoryKey.hpp>
#include <stdair/bom/InventoryTypes.hpp>
Modified: trunk/stdair/stdair/bom/InventoryKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/InventoryKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/InventoryKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/InventoryKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/InventoryKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/InventoryKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/InventoryKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegCabinKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/LegCabinKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/LegCabinKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegCabinKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/LegCabinKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/LegDateKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/LegDateKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/LegDateKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,8 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentCabinKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabinKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentCabinKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/SegmentCabinKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentCabinKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabinKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentCabinKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentDate.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDate.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentDate.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,6 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
+#include <sstream>
// STDAIR
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/bom/SegmentDate.hpp>
Modified: trunk/stdair/stdair/bom/SegmentDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDate.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentDate.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/SegmentDateKey.hpp>
#include <stdair/bom/SegmentDateTypes.hpp>
Modified: trunk/stdair/stdair/bom/SegmentDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentDateKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/SegmentDateKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentDateKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,8 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentPeriodKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentPeriodKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentPeriodKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/SegmentPeriodKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentPeriodKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentPeriodKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentPeriodKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/YieldStore.cpp
===================================================================
--- trunk/stdair/stdair/bom/YieldStore.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/YieldStore.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,8 +3,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+#include <sstream>
+// StdAir
#include <stdair/bom/YieldStore.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/YieldStore.hpp
===================================================================
--- trunk/stdair/stdair/bom/YieldStore.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/YieldStore.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// STL
+#include <string>
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/YieldStoreKey.hpp>
#include <stdair/bom/YieldStoreTypes.hpp>
Modified: trunk/stdair/stdair/bom/YieldStoreKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/YieldStoreKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/YieldStoreKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -2,7 +2,6 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/YieldStoreKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/YieldStoreKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/YieldStoreKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/YieldStoreKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/command/DBManagerForAirlines.cpp
===================================================================
--- trunk/stdair/stdair/command/DBManagerForAirlines.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/command/DBManagerForAirlines.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -12,7 +12,7 @@
#include <mysql/soci-mysql.h>
#endif // SOCI_HEADERS_BURIED
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/AirlineStruct.hpp>
#include <stdair/dbadaptor/DbaAirline.hpp>
#include <stdair/command/DBManagerForAirlines.hpp>
Modified: trunk/stdair/stdair/dbadaptor/DbaAirline.cpp
===================================================================
--- trunk/stdair/stdair/dbadaptor/DbaAirline.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/dbadaptor/DbaAirline.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,7 +5,7 @@
#include <exception>
#include <string>
// Stdair
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/AirlineStruct.hpp>
#include <stdair/dbadaptor/DbaAirline.hpp>
#include <stdair/service/Logger.hpp>
Modified: trunk/stdair/stdair/sources.mk
===================================================================
--- trunk/stdair/stdair/sources.mk 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/sources.mk 2010-12-02 23:41:34 UTC (rev 369)
@@ -2,6 +2,11 @@
$(top_srcdir)/stdair/stdair_exceptions.hpp \
$(top_srcdir)/stdair/stdair_log.hpp \
$(top_srcdir)/stdair/stdair_db.hpp \
+ $(top_srcdir)/stdair/stdair_basic_types.hpp \
+ $(top_srcdir)/stdair/stdair_date_time_types.hpp \
+ $(top_srcdir)/stdair/stdair_inventory_types.hpp \
+ $(top_srcdir)/stdair/stdair_demand_types.hpp \
+ $(top_srcdir)/stdair/stdair_fare_types.hpp \
$(top_srcdir)/stdair/stdair_types.hpp \
$(top_srcdir)/stdair/stdair_service.hpp \
$(top_srcdir)/stdair/stdair.hpp
Copied: trunk/stdair/stdair/stdair_basic_types.hpp (from rev 368, trunk/stdair/stdair/stdair_types.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_basic_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_basic_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -0,0 +1,75 @@
+#ifndef __STDAIR_STDAIR_BASIC_TYPES_HPP
+#define __STDAIR_STDAIR_BASIC_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+
+namespace stdair {
+
+ // //////////////////////////////////////////////////////////////////////
+ // Basic types
+ /** Event type */
+ typedef std::string EventType_T;
+
+ /** Count */
+ typedef int Count_T;
+
+ /** Location code (3-letter-code, e.g., LON). */
+ typedef std::string LocationCode_T;
+
+ /** Define a distance (kilometers). */
+ typedef long int Distance_T;
+
+ /** Define the Airport Code type (3-letter-code, e.g., LHR). */
+ typedef LocationCode_T AirportCode_T;
+
+ /** City code */
+ typedef LocationCode_T CityCode_T;
+
+ /** Define a identity number. */
+ typedef unsigned long Identity_T;
+
+ /** Trip type */
+ typedef std::string TripType_T;
+
+ /** Monetary value */
+ typedef double MonetaryValue_T;
+
+ /** Real number */
+ typedef double RealNumber_T;
+
+ /** Define a percentage value (between 0 and 100%). */
+ typedef double Percentage_T;
+
+ /** Define a price value (e.g., 1000.0 Euros). */
+ typedef double PriceValue_T;
+
+ /** Define a price currency (e.g., EUR for Euros). */
+ typedef std::string PriceCurrency_T;
+
+ /** Define an amount of revenue. */
+ typedef double Revenue_T;
+
+ /** Define the name of a multiplier. */
+ typedef double Multiplier_T;
+
+ /** Define the rate of overbooking */
+ typedef double OverbookingRate_T;
+
+ /** Define the number of seats (it can be non integer, because the
+ overbooking can be applied at booking class or PNR level). */
+ typedef double NbOfSeats_T;
+
+ /** Define the number of seats required by a demand. */
+ // typedef unsigned short NbOfSeats_T;
+
+ // //////////////////////////////////////////////////////////////////////
+ // Probability
+ /** Probability */
+ typedef float Probability_T;
+
+}
+#endif // __STDAIR_STDAIR_BASIC_TYPES_HPP
Copied: trunk/stdair/stdair/stdair_date_time_types.hpp (from rev 368, trunk/stdair/stdair/stdair_types.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_date_time_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_date_time_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -0,0 +1,66 @@
+#ifndef __STDAIR_STDAIR_DATE_TIME_TYPES_HPP
+#define __STDAIR_STDAIR_DATE_TIME_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+#include <vector>
+#include <map>
+// Boost Random
+#include <boost/random/linear_congruential.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/variate_generator.hpp>
+// Boost (Extended STL)
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/tuple/tuple.hpp>
+// StdAir
+#include <stdair/stdair_exceptions.hpp>
+#include <stdair/stdair_log.hpp>
+#include <stdair/stdair_db.hpp>
+#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_service.hpp>
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** Define the type for durations (e.g., elapsed in-flight time). */
+ typedef boost::posix_time::time_duration Duration_T;
+
+ /** Define the type for date (e.g., departure date of a flight). */
+ typedef boost::gregorian::date Date_T;
+
+ /** Time */
+ typedef boost::posix_time::time_duration Time_T;
+
+ /** Define an accurate time (date+time). */
+ typedef boost::posix_time::ptime DateTime_T;
+
+ /** Define the Period (e.g., period during which flights depart). */
+ typedef boost::gregorian::date_period DatePeriod_T;
+
+ /** Define the Day-Of-the-Week as a string. */
+ typedef std::string DOW_String_T;
+
+ /** Define the Date Offset (e.g., -1 ). */
+ typedef boost::gregorian::date_duration DateOffset_T;
+
+ /** Define a duration in number of days. */
+ typedef unsigned int DayDuration_T;
+
+ /** Define the Saturday stay status of a travel. */
+ typedef bool SaturdayStay_T;
+
+ /** Time duration in (integer) number of seconds */
+ typedef long int IntDuration_T;
+
+ /** Time duration in (long long integer) number of milliseconds */
+ typedef long long int LongDuration_T;
+
+ /** Duration in (float) number of time units */
+ typedef float FloatDuration_T;
+
+}
+#endif // __STDAIR_STDAIR_DATE_TIME_TYPES_HPP
Copied: trunk/stdair/stdair/stdair_demand_types.hpp (from rev 368, trunk/stdair/stdair/stdair_types.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_demand_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_demand_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -0,0 +1,109 @@
+#ifndef __STDAIR_STDAIR_DEMAND_TYPES_HPP
+#define __STDAIR_STDAIR_DEMAND_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+#include <vector>
+#include <map>
+// Boost Random
+#include <boost/random/linear_congruential.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/variate_generator.hpp>
+// Boost (Extended STL)
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/tuple/tuple.hpp>
+// StdAir
+#include <stdair/stdair_basic_types.hpp>
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** Define the availability option allowing the ticket change. */
+ typedef bool ChangeFees_T;
+
+ /** Define the refundable availability of a tickets. */
+ typedef bool NonRefundable_T;
+
+ /** Define the average ratio (between 0 and 100) of demand with
+ a saturday stay status equal to TRUE. */
+ typedef unsigned int SaturdayStayRatio_T;
+
+ /** Define the average ratio of demand with change fee
+ availability. */
+ typedef unsigned int ChangeFeesRatio_T;
+
+ /** Define the average ratio of demand with non-refundable
+ availability. */
+ typedef unsigned int NonRefundableRatio_T;
+
+ /** Define the passenger characteristics, leisure or business
+ for instance (1-letter-code, e.g., L or B). */
+ typedef std::string PassengerType_T;
+
+ /** Define the identifier of a distribution pattern (e.g., 1). */
+ typedef std::string DistributionPatternId_T;
+
+ /** Define the identifier of a cancellation rate curve (e.g., C1). */
+ typedef std::string CancellationRateCurveId_T;
+
+ /** Define the identifier of an airline preference set list (e.g., AP1). */
+ typedef std::string AirlinePreferenceId_T;
+
+ /** Define a cancellation & and no-show rate pair. */
+ typedef std::pair<Percentage_T, Percentage_T> CancellationNoShowRatePair_T;
+
+ /** Define the identifier of a demand characteristics pattern
+ (e.g. Ch12); for a customer choice model */
+ typedef std::string CharacteristicsPatternId_T;
+
+ /** Define characteristics component index (e.g. W for WTP) */
+ typedef std::string CharacteristicsIndex_T;
+
+ /** Define a Willingness-To-Pay (WTP) (e.g., 1000.0 Euros). */
+ typedef double WTP_T;
+
+ /** Number of passengers (in a group) for a booking. */
+ typedef unsigned short PartySize_T;
+
+ /** Define a number of requests. */
+ typedef double NbOfRequests_T;
+
+ /** Define a number of bookings. */
+ typedef NbOfRequests_T NbOfBookings_T;
+
+ /** Define a number of cancellations (travellers). */
+ typedef NbOfRequests_T NbOfCancellations_T;
+
+ /** Define a number of no-shows. */
+ typedef NbOfRequests_T NbOfNoShows_T;
+
+ /** Define a number of travel solutions
+ (in a travel solution block). */
+ typedef unsigned short NbOfTravelSolutions_T;
+
+ /** Define the name of an event. */
+ typedef std::string EventName_T;
+
+ /** Define a number of events. */
+ typedef double NbOfEvents_T;
+
+ // //////////////////////////////////////////////////////////////////////
+ /** Type definition for the hashed key of the DemandStreamKey object. */
+ typedef std::string DemandStreamKeyStr_T;
+
+ /** Type of booking channel (D=direct, I=indirect, N=oNline, F=oFfline). */
+ typedef std::string ChannelLabel_T;
+
+ /** Type of trip type (RO=outbound of round-trip, RI=inbound of round-trip,
+ OW=one way). */
+ typedef std::string TripType_T;
+
+ /** Type of frequent flyer (P=Platinum, G=Gold, S=Silver, M=Member, N=None).*/
+ typedef std::string FrequentFlyer_T;
+
+}
+#endif // __STDAIR_STDAIR_DEMAND_TYPES_HPP
Copied: trunk/stdair/stdair/stdair_fare_types.hpp (from rev 368, trunk/stdair/stdair/stdair_types.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_fare_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_fare_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -0,0 +1,18 @@
+#ifndef __STDAIR_STDAIR_FARE_TYPES_HPP
+#define __STDAIR_STDAIR_FARE_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** Define a number of fare rules. */
+ typedef double NbOfFareRules_T;
+
+ /** Define the fare of a travel solution. */
+ typedef double Fare_T;
+
+}
+#endif // __STDAIR_STDAIR_FARE_TYPES_HPP
Copied: trunk/stdair/stdair/stdair_inventory_types.hpp (from rev 368, trunk/stdair/stdair/stdair_types.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_inventory_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_inventory_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -0,0 +1,126 @@
+#ifndef __STDAIR_STDAIR_INVENTORY_TYPES_HPP
+#define __STDAIR_STDAIR_INVENTORY_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+#include <vector>
+#include <map>
+// StdAir
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_date_time_types.hpp>
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** Define the Airline Code type (2-letter-code, e.g., BA). */
+ typedef std::string AirlineCode_T;
+
+ /** Define a list of airline code. */
+ typedef std::vector<AirlineCode_T> AirlineCodeList_T;
+
+ /** Define the type for flight numbers. */
+ typedef unsigned short FlightNumber_T;
+
+ /** Define the cabin code (class of service, e.g., first, business,
+ economy). */
+ typedef std::string CabinCode_T;
+
+ /** Define the code of the fare family (e.g., 1, 2, 3, etc.). */
+ typedef std::string FamilyCode_T;
+
+ /** Define the booking class code (product segment class, e.g., H,
+ B, K, etc.). */
+ typedef std::string ClassCode_T;
+
+ /** Define a list of class code. */
+ typedef std::vector<ClassCode_T> ClassCodeList_T;
+
+ /** Define the sub-class code (e.g., 0, 1, 2, etc.). The subclass is
+ a sub-structure for the booking class, allowing to have specific
+ rules for some criteria like POS. */
+ typedef unsigned short SubclassCode_T;
+
+ /** Define the flight path code (code made by a suite of flight numbers). */
+ typedef std::string FlightPathCode_T;
+
+ /** Define the list of class codes as a string. */
+ typedef std::string ClassList_String_T;
+
+ /** Define a number of segment-dates (in a path). */
+ typedef unsigned short NbOfSegments_T;
+
+ /** Define a number of airlines (in a path). */
+ typedef unsigned short NbOfAirlines_T;
+
+ /** Map between the cabin codes and the booking class codes within
+ each cabin. */
+ typedef std::map<CabinCode_T, ClassList_String_T> CabinBookingClassMap_T;
+
+ /** Define the cabin capacity (resource, e.g., 200 seats).
+ <br>The capacity is expressed as a double to cope with overbooking. */
+ typedef double CabinCapacity_T;
+
+ /** Define a number of flight dates. */
+ typedef double NbOfFlightDates_T;
+
+ /** Define the commited space of a cabin. */
+ typedef double CommitedSpace_T;
+
+ /** Define the unsold protection (UPR). */
+ typedef double UPR_T;
+
+ /** Define the value of the booking limit. */
+ typedef double BookingLimit_T;
+
+ /** Define the value of the authorization level. */
+ typedef double AuthorizationLevel_T;
+
+ /** Define the value of the adjustment for cabin capacity. */
+ typedef double CapacityAdjustment_T;
+
+ /** Define the number of seat which could not be used for the booking. */
+ typedef double BlockSpace_T;
+
+ /** Define an availability. */
+ typedef double Availability_T;
+
+ /** Define an availability. */
+ typedef bool AvailabilityStatus_T;
+
+ /** Define a list of availabilities. */
+ typedef std::vector<Availability_T> BucketAvailabilities_T;
+
+ /** Define a number of yields. */
+ typedef double NbOfYields_T;
+
+ /** Define a number of InventoryControlRules. */
+ typedef double NbOfInventoryControlRules_T;
+
+ /** Define availibility of booking limit. */
+ typedef bool CensorshipFlag_T;
+
+ /** Define the list of censorship flags (une list per booking
+ class, one censorship flag per DCP). */
+ typedef std::vector<bool> CensorshipFlagList_T;
+
+ /** Define the bookingRatio (for instance OnD bookings
+ over whole class bookings). */
+ typedef double BookingRatio_T;
+
+ /** Define the yield of a virtual class. */
+ typedef double Yield_T;
+
+ /** Define the Bid-Price. */
+ typedef double BidPrice_T;
+
+ /** Define a Bid-Price Vector. */
+ typedef std::vector<BidPrice_T> BidPriceVector_T;
+
+ /** Define the current index of a Bid-Price Vector (for a given LegCabin). */
+ typedef unsigned int SeatIndex_T;
+
+}
+#endif // __STDAIR_STDAIR_INVENTORY_TYPES_HPP
Modified: trunk/stdair/stdair/stdair_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_types.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/stdair_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -20,6 +20,11 @@
#include <stdair/stdair_exceptions.hpp>
#include <stdair/stdair_log.hpp>
#include <stdair/stdair_db.hpp>
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_demand_types.hpp>
+#include <stdair/stdair_fare_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_date_time_types.hpp>
#include <stdair/stdair_service.hpp>
namespace stdair {
@@ -28,21 +33,6 @@
/** Define the type for network ID. */
typedef std::string NetworkID_T;
- /** Define the Airline Code type (2-letter-code, e.g., BA). */
- typedef std::string AirlineCode_T;
-
- /** Define a list of airline code. */
- typedef std::vector<AirlineCode_T> AirlineCodeList_T;
-
- /** Location code (3-letter-code, e.g., LON). */
- typedef std::string LocationCode_T;
-
- /** Define the Airport Code type (3-letter-code, e.g., LHR). */
- typedef LocationCode_T AirportCode_T;
-
- /** Define the type for flight numbers. */
- typedef unsigned short FlightNumber_T;
-
/** Define the file address type (e.g. "a_directory/a_filename")*/
typedef std::string FileAddress_T;
@@ -59,242 +49,18 @@
B: booked, C: cancelled, R: Rejected). */
typedef std::string RequestStatus_T;
- /** Define the type for durations (e.g., elapsed in-flight time). */
- typedef boost::posix_time::time_duration Duration_T;
-
- /** Define the type for date (e.g., departure date of a flight). */
- typedef boost::gregorian::date Date_T;
-
- /** Time */
- typedef boost::posix_time::time_duration Time_T;
-
- /** Define an accurate time (date+time). */
- typedef boost::posix_time::ptime DateTime_T;
-
- /** Define a distance (kilometers). */
- typedef long int Distance_T;
-
- /** Define the Period (e.g., period during which flights depart). */
- typedef boost::gregorian::date_period DatePeriod_T;
-
- /** Define the Day-Of-the-Week as a string. */
- typedef std::string DOW_String_T;
-
- /** Define the Date Offset (e.g., -1 ). */
- typedef boost::gregorian::date_duration DateOffset_T;
-
- /** Define a duration in number of days. */
- typedef unsigned int DayDuration_T;
-
- /** Define the Saturday stay status of a travel. */
- typedef bool SaturdayStay_T;
-
- /** Define the availability option allowing the ticket change. */
- typedef bool ChangeFees_T;
-
- /** Define the refundable availability of a tickets. */
- typedef bool NonRefundable_T;
-
- /** Define the average ratio (between 0 and 100) of demand with
- a saturday stay status equal to TRUE. */
- typedef unsigned int SaturdayStayRatio_T;
-
- /** Define the average ratio of demand with change fee
- availability. */
- typedef unsigned int ChangeFeesRatio_T;
-
- /** Define the average ratio of demand with non-refundable
- availability. */
- typedef unsigned int NonRefundableRatio_T;
-
- /** Define the passenger characteristics, leisure or business
- for instance (1-letter-code, e.g., L or B). */
- typedef std::string PassengerType_T;
-
- /** Define the identifier of a distribution pattern (e.g., 1). */
- typedef std::string DistributionPatternId_T;
-
- /** Define the identifier of a cancellation rate curve (e.g., C1). */
- typedef std::string CancellationRateCurveId_T;
-
- /** Define the identifier of an airline preference set list (e.g., AP1). */
- typedef std::string AirlinePreferenceId_T;
-
- /** Define a percentage value (between 0 and 100%). */
- typedef double Percentage_T;
-
- /** Define a cancellation & and no-show rate pair. */
- typedef std::pair<Percentage_T, Percentage_T> CancellationNoShowRatePair_T;
-
- /** Define the identifier of a demand characteristics pattern
- (e.g. Ch12); for a customer choice model */
- typedef std::string CharacteristicsPatternId_T;
-
- /** Define characteristics component index (e.g. W for WTP) */
- typedef std::string CharacteristicsIndex_T;
-
- /** Define the cabin code (class of service, e.g., first, business,
- economy). */
- typedef std::string CabinCode_T;
-
- /** Define a price value (e.g., 1000.0 Euros). */
- typedef double PriceValue_T;
-
- /** Define a price currency (e.g., EUR for Euros). */
- typedef std::string PriceCurrency_T;
-
- /** Define a Willingness-To-Pay (WTP) (e.g., 1000.0 Euros). */
- typedef double WTP_T;
-
- /** Define the number of seats (it can be non integer, because the
- overbooking can be applied at booking class or PNR level). */
- typedef double NbOfSeats_T;
-
- /** Define the number of seats required by a demand. */
- // typedef unsigned short NbOfSeats_T;
-
- /** Number of passengers (in a group) for a booking. */
- typedef unsigned short PartySize_T;
-
/** Define a mean value (e.g., 20.2). */
typedef double MeanValue_T;
/** Define a standard deviation value (e.g., 1.5). */
typedef double StdDevValue_T;
- /** Define the cabin capacity (resource, e.g., 200 seats).
- <br>The capacity is expressed as a double to cope with overbooking. */
- typedef double CabinCapacity_T;
-
- /** Define the number of seat which could not be used for the booking. */
- typedef double BlockSpace_T;
-
- /** Define the code of the fare family (e.g., 1, 2, 3, etc.). */
- typedef std::string FamilyCode_T;
-
- /** Define the booking class code (product segment class, e.g., H,
- B, K, etc.). */
- typedef std::string ClassCode_T;
-
- /** Define a list of class code. */
- typedef std::vector<ClassCode_T> ClassCodeList_T;
-
- /** Define the sub-class code (e.g., 0, 1, 2, etc.). The subclass is
- a sub-structure for the booking class, allowing to have specific
- rules for some criteria like POS. */
- typedef unsigned short SubclassCode_T;
-
- /** Define the flight path code (code made by a suite of flight numbers). */
- typedef std::string FlightPathCode_T;
-
- /** Define an availability. */
- typedef double Availability_T;
-
- /** Define an availability. */
- typedef bool AvailabilityStatus_T;
-
- /** Define a list of availabilities. */
- typedef std::vector<Availability_T> BucketAvailabilities_T;
-
- /** Define a identity number. */
- typedef unsigned long Identity_T;
-
/** Define a map between a BookingID and a TravelSolutionID. */
typedef std::map<Identity_T, Identity_T> BookingTSIDMap_T;
- /** Define a number of requests. */
- typedef double NbOfRequests_T;
-
- /** Define a number of bookings. */
- typedef NbOfRequests_T NbOfBookings_T;
-
- /** Define a number of cancellations (travellers). */
- typedef NbOfRequests_T NbOfCancellations_T;
-
- /** Define a number of no-shows. */
- typedef NbOfRequests_T NbOfNoShows_T;
-
- /** Define a number of fare rules. */
- typedef double NbOfFareRules_T;
-
- /** Define a number of yields. */
- typedef double NbOfYields_T;
-
- /** Define a number of InventoryControlRules. */
- typedef double NbOfInventoryControlRules_T;
-
- /** Define a number of flight dates. */
- typedef double NbOfFlightDates_T;
-
- /** Define the commited space of a cabin. */
- typedef double CommitedSpace_T;
-
- /** Define the unsold protection (UPR). */
- typedef double UPR_T;
-
- /** Define availibility of booking limit. */
- typedef bool CensorshipFlag_T;
-
- /** Define the list of censorship flags (une list per booking
- class, one censorship flag per DCP). */
- typedef std::vector<bool> CensorshipFlagList_T;
-
- /** Define the value of the booking limit. */
- typedef double BookingLimit_T;
-
- /** Define the value of the authorization level. */
- typedef double AuthorizationLevel_T;
-
- /** Define the value of the adjustment for cabin capacity. */
- typedef double CapacityAdjustment_T;
-
- /** Define the rate of overbooking */
- typedef double OverbookingRate_T;
-
- /** Define the bookingRatio (for instance OnD bookings
- over whole class bookings). */
- typedef double BookingRatio_T;
-
- /** Define the list of class codes as a string. */
- typedef std::string ClassList_String_T;
-
- /** Define a number of segment-dates (in a path). */
- typedef unsigned short NbOfSegments_T;
-
- /** Define a number of airlines (in a path). */
- typedef unsigned short NbOfAirlines_T;
-
- /** Define the fare of a travel solution. */
- typedef double Fare_T;
-
- /** Define the yield of a virtual class. */
- typedef double Yield_T;
-
- /** Define the Bid-Price. */
- typedef double BidPrice_T;
-
- /** Define a Bid-Price Vector. */
- typedef std::vector<BidPrice_T> BidPriceVector_T;
-
- /** Define the current index of a Bid-Price Vector (for a given LegCabin). */
- typedef unsigned int SeatIndex_T;
-
- /** Define a number of travel solutions
- (in a travel solution block). */
- typedef unsigned short NbOfTravelSolutions_T;
-
/** Define a indicator of demand to class matching. */
typedef double MatchingIndicator_T;
- /** Define an amount of revenue. */
- typedef double Revenue_T;
-
- /** Define the name of an event. */
- typedef std::string EventName_T;
-
- /** Define a number of events. */
- typedef double NbOfEvents_T;
-
/** Frequency of the Data Collection Point description (daily, monthly or
detailed). */
typedef std::string DCPModeFrequency_T;
@@ -367,36 +133,6 @@
typedef float Probability_T;
// //////////////////////////////////////////////////////////////////////
- // Date / Time
- /** Time duration in (integer) number of seconds */
- typedef long int IntDuration_T;
-
- /** Time duration in (long long integer) number of milliseconds */
- typedef long long int LongDuration_T;
-
- /** Duration in (float) number of time units */
- typedef float FloatDuration_T;
-
- // //////////////////////////////////////////////////////////////////////
- // Basic types
- /** Event type */
- typedef std::string EventType_T;
-
- /** Count */
- typedef int Count_T;
-
- /** City code */
- typedef LocationCode_T CityCode_T;
-
- /** Trip type */
- typedef std::string TripType_T;
-
- /** Monetary value */
- typedef double MonetaryValue_T;
-
- /** Real number */
- typedef double RealNumber_T;
-
/** Type definition for the hashed key of the DemandStreamKey object. */
typedef std::string DemandStreamKeyStr_T;
@@ -410,9 +146,5 @@
/** Type of frequent flyer (P=Platinum, G=Gold, S=Silver, M=Member, N=None). */
typedef std::string FrequentFlyer_T;
- /** Map between the cabin codes and the booking class codes within
- each cabin. */
- typedef std::map<CabinCode_T, ClassList_String_T> CabinBookingClassMap_T;
-
}
#endif // __STDAIR_STDAIR_TYPES_HPP
Modified: trunk/stdair/test/archi_static_cast/MP2Inventory.cpp
===================================================================
--- trunk/stdair/test/archi_static_cast/MP2Inventory.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/test/archi_static_cast/MP2Inventory.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,7 @@
// STL
#include <cassert>
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
// Local
#include <test/archi_static_cast/MP2Inventory.hpp>
Modified: trunk/stdair/test/archi_static_cast/archi_static_cast.cpp
===================================================================
--- trunk/stdair/test/archi_static_cast/archi_static_cast.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/test/archi_static_cast/archi_static_cast.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,7 @@
#include <string>
#include <list>
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
// Local
#include <test/archi_static_cast/MP2BomRoot.hpp>
#include <test/archi_static_cast/MP2Inventory.hpp>
Modified: trunk/stdair/test/architecture/MPInventory.cpp
===================================================================
--- trunk/stdair/test/architecture/MPInventory.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/test/architecture/MPInventory.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -8,7 +8,7 @@
// STL
#include <cassert>
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
// Local
#include <test/architecture/MPInventory.hpp>
Modified: trunk/stdair/test/architecture/architecture.cpp
===================================================================
--- trunk/stdair/test/architecture/architecture.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/test/architecture/architecture.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -7,11 +7,11 @@
#include <iostream>
#include <string>
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomRoot.hpp>
#include <stdair/bom/BomManager.hpp>
#include <stdair/factory/FacBom.hpp>
#include <stdair/factory/FacBomManager.hpp>
-#include <stdair/stdair_types.hpp>
// Local
//#include <test/architecture/MPBomRoot.hpp>
#include <test/architecture/MPInventory.hpp>
Modified: trunk/stdair/test/stdair/StdairTestLib.cpp
===================================================================
--- trunk/stdair/test/stdair/StdairTestLib.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/test/stdair/StdairTestLib.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -12,7 +12,7 @@
#include <boost/mpl/assert.hpp>
#include <boost/type_traits/is_same.hpp>
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/stdair.hpp>
#include <stdair/service/Logger.hpp>
#include <test/stdair/StdairTestLib.hpp>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-02 23:45:15
|
Revision: 372
http://stdair.svn.sourceforge.net/stdair/?rev=372&view=rev
Author: denis_arnaud
Date: 2010-12-02 23:45:04 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
[Release] Back to working version (99.99.99).
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/stdair.spec
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2010-12-02 23:43:47 UTC (rev 371)
+++ trunk/stdair/configure.ac 2010-12-02 23:45:04 UTC (rev 372)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
-AC_INIT([STDAIR],[0.9.0],[den...@us...],[stdair])
+AC_INIT([STDAIR],[99.99.99],[den...@us...],[stdair])
AC_CONFIG_HEADER([stdair/config.h])
AC_CONFIG_SRCDIR([stdair/bom/BomRoot.hpp])
AC_CONFIG_AUX_DIR([config])
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# Shared library versioning
-GENERIC_LIBRARY_VERSION="0:9:0"
+GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-12-02 23:43:47 UTC (rev 371)
+++ trunk/stdair/stdair.spec 2010-12-02 23:45:04 UTC (rev 372)
@@ -2,7 +2,7 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 0.9.0
+Version: 99.99.99
Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
@@ -111,6 +111,9 @@
%changelog
+* Fri Dec 03 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
+- Upstream update
+
* Fri Dec 03 2010 Son Nguyen Kim <ngu...@gm...> 0.9.0-1
- Upstream update
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 15:20:58
|
Revision: 386
http://stdair.svn.sourceforge.net/stdair/?rev=386&view=rev
Author: denis_arnaud
Date: 2010-12-03 15:20:52 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
trunk/stdair/batches/stdair.cpp
trunk/stdair/stdair/service/STDAIR_Service.cpp
trunk/stdair/stdair/sources.mk
trunk/stdair/test/stdair/StdairTestLib.cpp
Added Paths:
-----------
trunk/stdair/stdair/STDAIR_Service.hpp
Removed Paths:
-------------
trunk/stdair/stdair/stdair.hpp
Modified: trunk/stdair/batches/stdair.cpp
===================================================================
--- trunk/stdair/batches/stdair.cpp 2010-12-03 15:20:46 UTC (rev 385)
+++ trunk/stdair/batches/stdair.cpp 2010-12-03 15:20:52 UTC (rev 386)
@@ -15,8 +15,8 @@
#include <boost/tokenizer.hpp>
#include <boost/lexical_cast.hpp>
// StdAir
+#include <stdair/config/stdair-paths.hpp>
#include <stdair/stdair_types.hpp>
-#include <stdair/stdair.hpp>
#include <stdair/bom/BomManager.hpp>
#include <stdair/bom/BomRoot.hpp>
#include <stdair/bom/Inventory.hpp>
@@ -37,7 +37,7 @@
#include <stdair/bom/BookingClassTypes.hpp>
#include <stdair/factory/FacBomManager.hpp>
#include <stdair/service/Logger.hpp>
-#include <stdair/config/stdair-paths.hpp>
+#include <stdair/STDAIR_Service.hpp>
// //////// Constants //////
/** Default name and location for the log file. */
Copied: trunk/stdair/stdair/STDAIR_Service.hpp (from rev 378, trunk/stdair/stdair/stdair.hpp)
===================================================================
--- trunk/stdair/stdair/STDAIR_Service.hpp (rev 0)
+++ trunk/stdair/stdair/STDAIR_Service.hpp 2010-12-03 15:20:52 UTC (rev 386)
@@ -0,0 +1,123 @@
+/**
+ * @brief Handle on the StdAir library context
+ * @author Anh Quan Nguyen <qua...@us...>
+ * @date 20/01/2010
+ * @detail StdAir aims at providing a clean API, and the corresponding
+ * C++ implementation, for the basis of Airline IT Business Object
+ * Model (BOM), that is, to be used by several other Open Source
+ * projects, such as RMOL and OpenTREP<br>
+ * Install the StdAir library for Airline IT Standard C++ fundaments.
+ */
+#ifndef __STDAIR_STDAIR_HPP
+#define __STDAIR_STDAIR_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// StdAir
+#include <stdair/basic/BasLogParams.hpp>
+#include <stdair/basic/BasDBParams.hpp>
+
+namespace stdair {
+
+ /// Forward declarations
+ class BomRoot;
+
+ /**
+ * @brief Interface for the STDAIR Services
+ */
+ class STDAIR_Service {
+ public:
+ // ////////// Constructors and destructors //////////
+ /**
+ * @brief Default constructor.
+ */
+ STDAIR_Service ();
+
+ /**
+ * @brief Constructor.
+ * <br>The init() method is called; see the corresponding
+ * documentation for more details.
+ * <br>Moreover, a reference on an output stream is given, so
+ * that log outputs can be directed onto that stream.
+ * @param[in] const BasLogParams& Parameters for the output log stream.
+ */
+ STDAIR_Service (const BasLogParams&);
+
+ /**
+ * @brief Constructor.
+ * <br>The init() method is called; see the corresponding
+ * documentation for more details.
+ * <br>A reference on an output stream is given, so
+ * that log outputs can be directed onto that stream.
+ * <br>Moreover, database connection parameters are given, so
+ * that database requests can use the corresponding access.
+ * @param[in] const BasLogParams& Parameters for the output log stream.
+ * @param[in] const BasDBParams& Parameters for the database session.
+ */
+ STDAIR_Service (const BasLogParams&, const BasDBParams&);
+
+ /**
+ * @brief Destructor.
+ */
+ ~STDAIR_Service();
+
+ // ///////////////// Getters ///////////////////
+ /**
+ * @brief Get a reference on the BomRoot object.
+ * <br>If the service context has not been initialised, that
+ * method throws an exception (failing assertion).
+ * @param[out] BomRoot& Reference on the BomRoot.
+ */
+ BomRoot& getBomRoot () const {
+ return _bomRoot;
+ }
+
+ private:
+ // /////// Construction and Destruction helper methods ///////
+ /**
+ * @brief Default copy constructor.
+ * @param[in] const STDAIR_Service& Reference on the STDAIR_Service handler
+ * to be copied.
+ */
+ STDAIR_Service (const STDAIR_Service&);
+
+ /**
+ * @brief Initialise the log.
+ * @param[in] const BasLogParams& Parameters for the output log stream.
+ */
+ void logInit (const BasLogParams&);
+
+ /**
+ * @brief Initialise the database session.
+ * @param[in] const BasDBParams& Parameters for the database session.
+ */
+ void dbInit (const BasDBParams&);
+
+ /**
+ * @brief Initialise.
+ * <br>The static instance of the log service (Logger object) is created.
+ * <br>The static instance of the database session manager
+ * (DBSessionManager object) is created.
+ * <br>The static instance of the FacSupervisor object, itself referencing
+ * all the other objects (factories and BOM), is created.
+ * <br>As those three objects are static, there is no need to store them
+ * in any service context. However, some lock mechanism may be needed
+ * in order to secure the access to the corresponding resources.
+ */
+ void init ();
+
+ /**
+ * @brief Finalise.
+ */
+ void finalise ();
+
+ private:
+ // /////////////// Attributes ///////////////
+ /**
+ * @brief Root of the BOM tree.
+ */
+ BomRoot& _bomRoot;
+ };
+}
+#endif // __STDAIR_STDAIR_HPP
Modified: trunk/stdair/stdair/service/STDAIR_Service.cpp
===================================================================
--- trunk/stdair/stdair/service/STDAIR_Service.cpp 2010-12-03 15:20:46 UTC (rev 385)
+++ trunk/stdair/stdair/service/STDAIR_Service.cpp 2010-12-03 15:20:52 UTC (rev 386)
@@ -15,7 +15,7 @@
#include <stdair/service/FacSupervisor.hpp>
#include <stdair/service/Logger.hpp>
#include <stdair/service/DBSessionManager.hpp>
-#include <stdair/stdair.hpp>
+#include <stdair/STDAIR_Service.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/sources.mk
===================================================================
--- trunk/stdair/stdair/sources.mk 2010-12-03 15:20:46 UTC (rev 385)
+++ trunk/stdair/stdair/sources.mk 2010-12-03 15:20:52 UTC (rev 386)
@@ -11,6 +11,6 @@
$(top_srcdir)/stdair/stdair_fare_types.hpp \
$(top_srcdir)/stdair/stdair_types.hpp \
$(top_srcdir)/stdair/stdair_service.hpp \
- $(top_srcdir)/stdair/stdair.hpp
+ $(top_srcdir)/stdair/STDAIR_Service.hpp
stdair_service_cc_sources =
Deleted: trunk/stdair/stdair/stdair.hpp
===================================================================
--- trunk/stdair/stdair/stdair.hpp 2010-12-03 15:20:46 UTC (rev 385)
+++ trunk/stdair/stdair/stdair.hpp 2010-12-03 15:20:52 UTC (rev 386)
@@ -1,123 +0,0 @@
-/**
- * @brief Handle on the StdAir library context
- * @author Anh Quan Nguyen <qua...@us...>
- * @date 20/01/2010
- * @detail StdAir aims at providing a clean API, and the corresponding
- * C++ implementation, for the basis of Airline IT Business Object
- * Model (BOM), that is, to be used by several other Open Source
- * projects, such as RMOL and OpenTREP<br>
- * Install the StdAir library for Airline IT Standard C++ fundaments.
- */
-#ifndef __STDAIR_STDAIR_HPP
-#define __STDAIR_STDAIR_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// StdAir
-#include <stdair/basic/BasLogParams.hpp>
-#include <stdair/basic/BasDBParams.hpp>
-
-namespace stdair {
-
- /// Forward declarations
- class BomRoot;
-
- /**
- * @brief Interface for the STDAIR Services
- */
- class STDAIR_Service {
- public:
- // ////////// Constructors and destructors //////////
- /**
- * @brief Default constructor.
- */
- STDAIR_Service ();
-
- /**
- * @brief Constructor.
- * <br>The init() method is called; see the corresponding
- * documentation for more details.
- * <br>Moreover, a reference on an output stream is given, so
- * that log outputs can be directed onto that stream.
- * @param[in] const BasLogParams& Parameters for the output log stream.
- */
- STDAIR_Service (const BasLogParams&);
-
- /**
- * @brief Constructor.
- * <br>The init() method is called; see the corresponding
- * documentation for more details.
- * <br>A reference on an output stream is given, so
- * that log outputs can be directed onto that stream.
- * <br>Moreover, database connection parameters are given, so
- * that database requests can use the corresponding access.
- * @param[in] const BasLogParams& Parameters for the output log stream.
- * @param[in] const BasDBParams& Parameters for the database session.
- */
- STDAIR_Service (const BasLogParams&, const BasDBParams&);
-
- /**
- * @brief Destructor.
- */
- ~STDAIR_Service();
-
- // ///////////////// Getters ///////////////////
- /**
- * @brief Get a reference on the BomRoot object.
- * <br>If the service context has not been initialised, that
- * method throws an exception (failing assertion).
- * @param[out] BomRoot& Reference on the BomRoot.
- */
- BomRoot& getBomRoot () const {
- return _bomRoot;
- }
-
- private:
- // /////// Construction and Destruction helper methods ///////
- /**
- * @brief Default copy constructor.
- * @param[in] const STDAIR_Service& Reference on the STDAIR_Service handler
- * to be copied.
- */
- STDAIR_Service (const STDAIR_Service&);
-
- /**
- * @brief Initialise the log.
- * @param[in] const BasLogParams& Parameters for the output log stream.
- */
- void logInit (const BasLogParams&);
-
- /**
- * @brief Initialise the database session.
- * @param[in] const BasDBParams& Parameters for the database session.
- */
- void dbInit (const BasDBParams&);
-
- /**
- * @brief Initialise.
- * <br>The static instance of the log service (Logger object) is created.
- * <br>The static instance of the database session manager
- * (DBSessionManager object) is created.
- * <br>The static instance of the FacSupervisor object, itself referencing
- * all the other objects (factories and BOM), is created.
- * <br>As those three objects are static, there is no need to store them
- * in any service context. However, some lock mechanism may be needed
- * in order to secure the access to the corresponding resources.
- */
- void init ();
-
- /**
- * @brief Finalise.
- */
- void finalise ();
-
- private:
- // /////////////// Attributes ///////////////
- /**
- * @brief Root of the BOM tree.
- */
- BomRoot& _bomRoot;
- };
-}
-#endif // __STDAIR_STDAIR_HPP
Modified: trunk/stdair/test/stdair/StdairTestLib.cpp
===================================================================
--- trunk/stdair/test/stdair/StdairTestLib.cpp 2010-12-03 15:20:46 UTC (rev 385)
+++ trunk/stdair/test/stdair/StdairTestLib.cpp 2010-12-03 15:20:52 UTC (rev 386)
@@ -13,8 +13,8 @@
#include <boost/type_traits/is_same.hpp>
// StdAir
#include <stdair/stdair_inventory_types.hpp>
-#include <stdair/stdair.hpp>
#include <stdair/service/Logger.hpp>
+#include <stdair/STDAIR_Service.hpp>
#include <test/stdair/StdairTestLib.hpp>
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-12-29 13:51:40
|
Revision: 72
http://stdair.svn.sourceforge.net/stdair/?rev=72&view=rev
Author: denis_arnaud
Date: 2009-12-29 13:51:34 +0000 (Tue, 29 Dec 2009)
Log Message:
-----------
[Test] Re-worked the Boost.MPL tests.
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/test/Makefile.am
trunk/stdair/test/mpl/Makefile.am
trunk/stdair/test/stdair/Makefile.am
Added Paths:
-----------
trunk/stdair/test/mpl/contrib/
trunk/stdair/test/mpl/contrib/Makefile.am
trunk/stdair/test/mpl/mpl_book_ch_01.cpp
trunk/stdair/test/stdair/mpled_bom.cpp
Removed Paths:
-------------
trunk/stdair/test/com/
trunk/stdair/test/mpl/book/Makefile.am
trunk/stdair/test/mpl/book/ch_01.cpp
trunk/stdair/test/mpl/book/contrib/
trunk/stdair/test/mpl/mpl.cpp
trunk/stdair/test/mpl/test_mpl.sh
Property Changed:
----------------
trunk/stdair/test/mpl/
trunk/stdair/test/mpl/book/
trunk/stdair/test/stdair/
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2009-12-29 10:48:15 UTC (rev 71)
+++ trunk/stdair/configure.ac 2009-12-29 13:51:34 UTC (rev 72)
@@ -204,7 +204,7 @@
test/Makefile
test/inheritance/Makefile
test/mpl/Makefile
- test/mpl/book/Makefile
+ test/mpl/contrib/Makefile
test/stdair/Makefile
)
AC_OUTPUT
Modified: trunk/stdair/test/Makefile.am
===================================================================
--- trunk/stdair/test/Makefile.am 2009-12-29 10:48:15 UTC (rev 71)
+++ trunk/stdair/test/Makefile.am 2009-12-29 13:51:34 UTC (rev 72)
@@ -4,7 +4,7 @@
MAINTAINERCLEANFILES = Makefile.in
##
-SUBDIRS = com inheritance mpl
+SUBDIRS = inheritance mpl stdair
EXTRA_DIST =
##
Property changes on: trunk/stdair/test/mpl
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile.in
Makefile
mpl
+ .deps
.libs
Makefile.in
Makefile
mpl_book_ch_??
Modified: trunk/stdair/test/mpl/Makefile.am
===================================================================
--- trunk/stdair/test/mpl/Makefile.am 2009-12-29 10:48:15 UTC (rev 71)
+++ trunk/stdair/test/mpl/Makefile.am 2009-12-29 13:51:34 UTC (rev 72)
@@ -3,12 +3,15 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = book
+#
+SUBDIRS = contrib
-check_PROGRAMS = mpl
+EXTRA_DIST =
-mpl_SOURCES = mpl.cpp
-mpl_CXXFLAGS = $(BOOST_CFLAGS)
-mpl_LDADD = $(BOOST_LIB)
+#
+check_PROGRAMS = mpl_book_ch_01
-EXTRA_DIST = test_mpl.sh
+#
+mpl_book_ch_01_SOURCES = mpl_book_ch_01.cpp
+mpl_book_ch_01_CXXFLAGS = $(BOOST_CFLAGS)
+mpl_book_ch_01_LDADD = $(BOOST_LIBS)
Property changes on: trunk/stdair/test/mpl/book
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile.in
Makefile
ch??
+ .deps
.libs
Makefile.in
Makefile
Deleted: trunk/stdair/test/mpl/book/Makefile.am
===================================================================
--- trunk/stdair/test/mpl/book/Makefile.am 2009-12-29 10:48:15 UTC (rev 71)
+++ trunk/stdair/test/mpl/book/Makefile.am 2009-12-29 13:51:34 UTC (rev 72)
@@ -1,12 +0,0 @@
-## command sub-directory
-include $(top_srcdir)/Makefile.common
-
-MAINTAINERCLEANFILES = Makefile.in
-
-check_PROGRAMS = ch01
-
-ch01_SOURCES = ch_01.cpp
-ch01_CXXFLAGS = $(BOOST_CFLAGS)
-ch01_LDADD = $(BOOST_LIB)
-
-EXTRA_DIST =
Deleted: trunk/stdair/test/mpl/book/ch_01.cpp
===================================================================
--- trunk/stdair/test/mpl/book/ch_01.cpp 2009-12-29 10:48:15 UTC (rev 71)
+++ trunk/stdair/test/mpl/book/ch_01.cpp 2009-12-29 13:51:34 UTC (rev 72)
@@ -1,13 +0,0 @@
-// STL
-#include <iostream>
-// Book on Boost MPL
-#include "contrib/binary.hpp"
-
-// ///////////// M A I N //////////////
-int main (int argc, char* argv[]) {
-
- const long l42 = binary<101010>::value;
- std::cout << "The 101010 binary number is equal to: " << l42 << std::endl;
-
- return 0;
-}
Property changes on: trunk/stdair/test/mpl/contrib
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
Copied: trunk/stdair/test/mpl/contrib/Makefile.am (from rev 70, trunk/stdair/test/mpl/book/Makefile.am)
===================================================================
--- trunk/stdair/test/mpl/contrib/Makefile.am (rev 0)
+++ trunk/stdair/test/mpl/contrib/Makefile.am 2009-12-29 13:51:34 UTC (rev 72)
@@ -0,0 +1,8 @@
+## test/boost/mpl/contrib sub-directory
+include $(top_srcdir)/Makefile.common
+
+MAINTAINERCLEANFILES = Makefile.in
+
+check_PROGRAMS =
+
+EXTRA_DIST = binary.hpp
Deleted: trunk/stdair/test/mpl/mpl.cpp
===================================================================
--- trunk/stdair/test/mpl/mpl.cpp 2009-12-29 10:48:15 UTC (rev 71)
+++ trunk/stdair/test/mpl/mpl.cpp 2009-12-29 13:51:34 UTC (rev 72)
@@ -1,82 +0,0 @@
-// STL
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-// MPL
-#include <boost/mpl/push_back.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/at.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_same.hpp>
-
-// //////////////////////////////////////////////////////////////////
-namespace STDAIR {
-
- /** BookingClass */
- struct BookingClass {
- std::string _classCode;
- /** Constructor. */
- BookingClass (const std::string& iClassCode)
- : _classCode (iClassCode) {
- }
-
- /** Display .*/
- std::string toString() const {
- std::ostringstream oStr;
- oStr << _classCode;
- return oStr.str();
- }
- };
-
- /** Cabin */
- struct Cabin {
- BookingClass _bookingClass;
- Cabin (const BookingClass& iBkgClass)
- : _bookingClass (iBkgClass) {
- }
-
- /** Display .*/
- std::string toString() const {
- std::ostringstream oStr;
- oStr << _bookingClass._classCode;
- return oStr.str();
- }
-
- /** Child type. */
- typedef BookingClass child;
- };
-
-}
-
-// /////////// M A I N ////////////////
-int main (int argc, char* argv[]) {
-
- typedef boost::mpl::vector<STDAIR::BookingClass> MPL_BookingClass;
- typedef boost::mpl::push_back<MPL_BookingClass, STDAIR::Cabin>::type types;
-
- const STDAIR::BookingClass lA ("A");
- const STDAIR::Cabin lCabin (lA);
-
- // lCabin::type
- if (boost::is_same<STDAIR::BookingClass, STDAIR::Cabin::child>::value) {
- std::cout << "The type of the child of a Cabin is a BookingClass"
- << std::endl;
-
- } else {
- std::cout << "The type of " << lCabin.toString() << " is unknown"
- << std::endl;
- }
-
- if (boost::is_same<boost::mpl::at_c<types, 1>::type, STDAIR::Cabin>::value) {
- std::cout << "The 2nd type is STDAIR::Cabin" << std::endl;
-
- } else {
- std::cout << "Problem!" << std::endl;
- }
-
- BOOST_MPL_ASSERT ((boost::is_same<boost::mpl::at_c<types, 1>::type,
- STDAIR::Cabin>));
-
- return 0;
-}
Copied: trunk/stdair/test/mpl/mpl_book_ch_01.cpp (from rev 70, trunk/stdair/test/mpl/book/ch_01.cpp)
===================================================================
--- trunk/stdair/test/mpl/mpl_book_ch_01.cpp (rev 0)
+++ trunk/stdair/test/mpl/mpl_book_ch_01.cpp 2009-12-29 13:51:34 UTC (rev 72)
@@ -0,0 +1,13 @@
+// STL
+#include <iostream>
+// Book on Boost MPL
+#include "contrib/binary.hpp"
+
+// ///////////// M A I N //////////////
+int main (int argc, char* argv[]) {
+
+ const long l42 = binary<101010>::value;
+ std::cout << "The 101010 binary number is equal to: " << l42 << std::endl;
+
+ return 0;
+}
Deleted: trunk/stdair/test/mpl/test_mpl.sh
===================================================================
--- trunk/stdair/test/mpl/test_mpl.sh 2009-12-29 10:48:15 UTC (rev 71)
+++ trunk/stdair/test/mpl/test_mpl.sh 2009-12-29 13:51:34 UTC (rev 72)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-INSTALL_DIR=`grep "^prefix =" ../Makefile | cut -d"=" -d" " -f3`
-TST_PROG=./mpl
-LATUS_API_VERSION=`grep "^LATUS_API_VERSION =" ../Makefile | cut -d"=" -d" " -f3`
-LATUS_LIBRARY_NAME=`grep "^LATUS_LIBRARY_NAME =" ../Makefile | cut -d"=" -d" " -f3`
-LATUS_LIB=lib${LATUS_LIBRARY_NAME}-${LATUS_API_VERSION}.so
-
-if [ ! -x ${TST_PROG} ];
-then
- echo "The sample program does not seem to have been compiled. Try 'make check' first."
- exit -1
-fi
-
-if [ "$1" = "-h" -o "$1" = "-H" -o "$1" = "--h" -o "$1" = "--help" ];
-then
- echo "Usage: $0 [<String to be parsed>]"
- echo " The list to be parsed should contain floating point numbers"
- echo " separated by commas, and should not contain spaces."
- echo " Example: 10.2,5.4"
- echo "The program parses a line and fills a flight-period structure."
- exit 0
-fi
-
-${TST_PROG} $1
Property changes on: trunk/stdair/test/stdair
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile.in
Makefile
StandardAirlineITTestSuite
StandardAirlineITTestSuite.log
StandardAirlineITTestSuite_results.xml
+ .deps
.libs
Makefile.in
Makefile
mpled_bom
StandardAirlineITTestSuite
StandardAirlineITTestSuite.log
StandardAirlineITTestSuite_results.xml
Modified: trunk/stdair/test/stdair/Makefile.am
===================================================================
--- trunk/stdair/test/stdair/Makefile.am 2009-12-29 10:48:15 UTC (rev 71)
+++ trunk/stdair/test/stdair/Makefile.am 2009-12-29 13:51:34 UTC (rev 72)
@@ -9,10 +9,16 @@
EXTRA_DIST =
##
-check_PROGRAMS = StandardAirlineITTestSuite
+check_PROGRAMS = mpled_bom StandardAirlineITTestSuite
TESTS = $(check_PROGRAMS)
XFAIL_TESTS = #IndexBuildingTestSuite
+#
+mpled_bom_SOURCES = mpled_bom.cpp
+mpled_bom_CXXFLAGS = $(BOOST_CFLAGS)
+mpled_bom_LDADD = $(BOOST_LIB)
+
+#
StandardAirlineITTestSuite_SOURCES = StandardAirlineITTestSuite.hpp \
StandardAirlineITTestSuite.cpp
StandardAirlineITTestSuite_CXXFLAGS= $(BOOST_CFLAGS) $(CPPUNIT_CFLAGS)
Copied: trunk/stdair/test/stdair/mpled_bom.cpp (from rev 70, trunk/stdair/test/mpl/mpl.cpp)
===================================================================
--- trunk/stdair/test/stdair/mpled_bom.cpp (rev 0)
+++ trunk/stdair/test/stdair/mpled_bom.cpp 2009-12-29 13:51:34 UTC (rev 72)
@@ -0,0 +1,82 @@
+// STL
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
+// MPL
+#include <boost/mpl/push_back.hpp>
+#include <boost/mpl/vector.hpp>
+#include <boost/mpl/at.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/is_same.hpp>
+
+// //////////////////////////////////////////////////////////////////
+namespace STDAIR {
+
+ /** BookingClass */
+ struct BookingClass {
+ std::string _classCode;
+ /** Constructor. */
+ BookingClass (const std::string& iClassCode)
+ : _classCode (iClassCode) {
+ }
+
+ /** Display .*/
+ std::string toString() const {
+ std::ostringstream oStr;
+ oStr << _classCode;
+ return oStr.str();
+ }
+ };
+
+ /** Cabin */
+ struct Cabin {
+ BookingClass _bookingClass;
+ Cabin (const BookingClass& iBkgClass)
+ : _bookingClass (iBkgClass) {
+ }
+
+ /** Display .*/
+ std::string toString() const {
+ std::ostringstream oStr;
+ oStr << _bookingClass._classCode;
+ return oStr.str();
+ }
+
+ /** Child type. */
+ typedef BookingClass child;
+ };
+
+}
+
+// /////////// M A I N ////////////////
+int main (int argc, char* argv[]) {
+
+ typedef boost::mpl::vector<STDAIR::BookingClass> MPL_BookingClass;
+ typedef boost::mpl::push_back<MPL_BookingClass, STDAIR::Cabin>::type types;
+
+ const STDAIR::BookingClass lA ("A");
+ const STDAIR::Cabin lCabin (lA);
+
+ // lCabin::type
+ if (boost::is_same<STDAIR::BookingClass, STDAIR::Cabin::child>::value) {
+ std::cout << "The type of the child of a Cabin is a BookingClass"
+ << std::endl;
+
+ } else {
+ std::cout << "The type of " << lCabin.toString() << " is unknown"
+ << std::endl;
+ }
+
+ if (boost::is_same<boost::mpl::at_c<types, 1>::type, STDAIR::Cabin>::value) {
+ std::cout << "The 2nd type is STDAIR::Cabin" << std::endl;
+
+ } else {
+ std::cout << "Problem!" << std::endl;
+ }
+
+ BOOST_MPL_ASSERT ((boost::is_same<boost::mpl::at_c<types, 1>::type,
+ STDAIR::Cabin>));
+
+ return 0;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-24 16:56:10
|
Revision: 228
http://stdair.svn.sourceforge.net/stdair/?rev=228&view=rev
Author: denis_arnaud
Date: 2010-07-24 16:56:03 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
[Doc] Updated the tool for document generation (in order to produce PDF documents).
Modified Paths:
--------------
trunk/stdair/Makefile.am
trunk/stdair/doc/Makefile.am
trunk/stdair/doc/doxygen_html.cfg.in
Modified: trunk/stdair/Makefile.am
===================================================================
--- trunk/stdair/Makefile.am 2010-07-24 15:45:56 UTC (rev 227)
+++ trunk/stdair/Makefile.am 2010-07-24 16:56:03 UTC (rev 228)
@@ -44,18 +44,24 @@
dist-html:
$(MAKE) -C doc dist-html
+dist-tex:
+ $(MAKE) -C doc dist-tex
-snapshot: snapshot-src snapshot-html
+snapshot: snapshot-src snapshot-html snapshot-tex
+
snapshot-src:
$(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
snapshot-html:
$(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-doc-`date +"%Y%m%d"`
-upload: upload-src upload-html
+snapshot-tex:
+ $(MAKE) -C doc dist-tex tex_tarname=@PACKAGE_TARNAME@-tex-`date +"%Y%m%d"`
+upload: upload-src upload-html upload-tex
+
upload-src: dist
@UPLOAD_COMMAND@ @PACKAGE_TARNAME@-@VERSION@.tar.gz \
@PACKAGE_TARNAME@-@VERSION@.tar.bz2
@@ -64,3 +70,6 @@
@UPLOAD_COMMAND@ @PACKAGE_TARNAME@-doc-@VERSION@.tar.gz \
@PACKAGE_TARNAME@-doc-@VERSION@.tar.bz2
+upload-tex: dist-tex
+ @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-tex-@VERSION@.tar.gz \
+ @PACKAGE_TARNAME@-tex-@VERSION@.tar.bz2
Modified: trunk/stdair/doc/Makefile.am
===================================================================
--- trunk/stdair/doc/Makefile.am 2010-07-24 15:45:56 UTC (rev 227)
+++ trunk/stdair/doc/Makefile.am 2010-07-24 16:56:03 UTC (rev 228)
@@ -15,6 +15,7 @@
docdir = @docdir@
html_tarname = @PACKAGE_TARNAME@-doc-@PACKAGE_VERSION@
+tex_tarname = @PACKAGE_TARNAME@-tex-@PACKAGE_VERSION@
noinst_DATA = sourceforge/howto_release_stdair.html.in
EXTRA_DIST = $(noinst_DATA)
@@ -49,6 +50,14 @@
bzip2 -9 -c > $(top_builddir)/$(html_tarname).tar.bz2
rm -rf $(top_builddir)/$(html_tarname)
+dist-tex: html-local
+ cp -a $(top_builddir)/doc/latex $(top_builddir)/$(tex_tarname)
+ tar chof - $(top_builddir)/$(tex_tarname) | \
+ gzip --best -c > $(top_builddir)/$(tex_tarname).tar.gz
+ tar chof - $(top_builddir)/$(tex_tarname) | \
+ bzip2 -9 -c > $(top_builddir)/$(tex_tarname).tar.bz2
+ rm -rf $(top_builddir)/$(tex_tarname)
+
install-data-local: html-local
$(mkinstalldirs) $(DESTDIR)$(docdir)
if test -d html; then \
@@ -57,6 +66,13 @@
$(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/html; \
done \
fi
+ $(mkinstalldirs) $(DESTDIR)$(docdir)
+ if test -d latex; then \
+ $(mkinstalldirs) $(DESTDIR)$(docdir)/latex; \
+ for f in latex/*; do \
+ $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/latex; \
+ done \
+ fi
uninstall-local:
rm -rf $(DESTDIR)$(docdir)
Modified: trunk/stdair/doc/doxygen_html.cfg.in
===================================================================
--- trunk/stdair/doc/doxygen_html.cfg.in 2010-07-24 15:45:56 UTC (rev 227)
+++ trunk/stdair/doc/doxygen_html.cfg.in 2010-07-24 16:56:03 UTC (rev 228)
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.2
+# Doxyfile 1.6.2-20100208
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project
@@ -14,190 +14,215 @@
# Project related configuration options
#---------------------------------------------------------------------------
-# This tag specifies the encoding used for all characters in the config file that
-# follow. The default is UTF-8 which is also the encoding used for all text before
-# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into
-# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
-# possible encodings.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
PROJECT_NAME = @PACKAGE_NAME@
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = @PACKAGE_VERSION@
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY =
+OUTPUT_DIRECTORY =
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
# otherwise cause performance problems for the file system.
CREATE_SUBDIRS = NO
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,
-# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,
-# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,
-# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
OUTPUT_LANGUAGE = English
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
# Set to NO to disable this.
BRIEF_MEMBER_DESC = YES
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
# brief descriptions will be completely suppressed.
REPEAT_BRIEF = YES
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
-ABBREVIATE_BRIEF =
+ABBREVIATE_BRIEF =
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
# description.
ALWAYS_DETAILED_SEC = NO
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
# operators of the base classes will not be shown.
INLINE_INHERITED_MEMB = YES
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
# to NO the shortest path that makes the file name unique will be used.
FULL_PATH_NAMES = YES
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
# path to strip.
STRIP_FROM_PATH = @top_srcdir@/
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
# are normally passed to the compiler using the -I flag.
STRIP_FROM_INC_PATH = @top_srcdir@/
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = NO
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like the Qt-style comments (thus requiring an
-# explicit @brief command for a brief description.
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
JAVADOC_AUTOBRIEF = NO
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
# description. Set this tag to YES if you prefer the old behaviour instead.
MULTILINE_CPP_IS_BRIEF = NO
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP = YES
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
# re-implements.
INHERIT_DOCS = YES
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
# be part of the file/class/namespace that contains it.
SEPARATE_MEMBER_PAGES = NO
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
TAB_SIZE = 8
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
# You can put \n's in the value part of an alias to insert newlines.
-ALIASES =
+ALIASES =
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
# of all members will be omitted, etc.
OPTIMIZE_OUTPUT_FOR_C = NO
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
OPTIMIZE_OUTPUT_JAVA = NO
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
-# include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
BUILTIN_STL_SUPPORT = YES
@@ -207,248 +232,335 @@
CPP_CLI_SUPPORT = NO
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
# all members of a group must be documented explicitly.
DISTRIBUTE_GROUP_DOC = YES
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
# the \nosubgrouping command.
SUBGROUPING = YES
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE = 0
+
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = YES
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
EXTRACT_PRIVATE = NO
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
EXTRACT_STATIC = YES
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
# If set to NO only classes defined in header files are included.
EXTRACT_LOCAL_CLASSES = YES
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
# If set to NO (the default) only methods in the interface are included.
EXTRACT_LOCAL_METHODS = NO
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
# This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_MEMBERS = NO
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
# overviews. This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_CLASSES = YES
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
# documentation.
HIDE_FRIEND_COMPOUNDS = NO
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
# function's detailed documentation block.
HIDE_IN_BODY_DOCS = YES
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
# Set it to YES to include the internal documentation.
INTERNAL_DOCS = YES
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
# and Mac users are advised to set this option to NO.
CASE_SENSE_NAMES = YES
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
# documentation. If set to YES the scope will be hidden.
HIDE_SCOPE_NAMES = NO
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
# of that file.
SHOW_INCLUDE_FILES = YES
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
INLINE_INFO = YES
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
# declaration order.
SORT_MEMBER_DOCS = NO
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
# declaration order.
SORT_BRIEF_DOCS = NO
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
+# Note: This option applies only to the class list, not to the
# alphabetical list.
SORT_BY_SCOPE_NAME = NO
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
GENERATE_TODOLIST = YES
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
# commands in the documentation.
GENERATE_TESTLIST = YES
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
# commands in the documentation.
GENERATE_BUGLIST = YES
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
# \deprecated commands in the documentation.
GENERATE_DEPRECATEDLIST= YES
-# The ENABLED_SECTIONS tag can be used to enable conditional
+# The ENABLED_SECTIONS tag can be used to enable conditional
# documentation sections, marked by \if sectionname ... \endif.
-ENABLED_SECTIONS =
+ENABLED_SECTIONS =
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
MAX_INITIALIZER_LINES = 30
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
# list will mention the files that were used to generate the documentation.
SHOW_USED_FILES = YES
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
# in the documentation. The default is NO.
SHOW_DIRECTORIES = YES
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from the
-# version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
# is used as the file version. See the manual for examples.
-FILE_VERSION_FILTER =
+FILE_VERSION_FILTER =
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
+# of the layout file.
+
+LAYOUT_FILE =
+
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
-# The QUIET tag can be used to turn on/off the messages that are generated
+# The QUIET tag can be used to turn on/off the messages that are generated
# by doxygen. Possible values are YES and NO. If left blank NO is used.
QUIET = NO
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
# NO is used.
WARNINGS = YES
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
# automatically be disabled.
WARN_IF_UNDOCUMENTED = YES
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
# don't exist or using markup commands wrongly.
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
# documentation.
WARN_NO_PARAMDOC = NO
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
# be obtained via FILE_VERSION_FILTER)
WARN_FORMAT = "$file:$line: $text"
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
# to stderr.
WARN_LOGFILE = doxygen_html.log
@@ -457,9 +569,9 @@
# configuration options related to the input files
#---------------------------------------------------------------------------
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
INPUT = @top_srcdir@/@PACKAGE@ \
@@ -467,108 +579,113 @@
@top_builddir@/doc/local \
@top_srcdir@/doc/tutorial
-# This tag can be used to specify the character encoding of the source files that
-# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
-# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.
-# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
INPUT_ENCODING = UTF-8
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
FILE_PATTERNS = *.hpp \
*.cpp \
*.doc
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
# If left blank NO is used.
RECURSIVE = YES
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = @top_builddir@/@PACKAGE@/config.h \
@top_srcdir@/@PACKAGE@/config_msvc.h
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
# from the input.
EXCLUDE_SYMLINKS = NO
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
-EXCLUDE_PATTERNS =
+EXCLUDE_PATTERNS =
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the output.
-# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,
-# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
-EXCLUDE_SYMBOLS =
+EXCLUDE_SYMBOLS =
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
# the \include command).
EXAMPLE_PATH = @top_srcdir@/doc/tutorial/src \
@top_srcdir@/test
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
# blank all files are included.
EXAMPLE_PATTERNS = *.hpp \
*.cpp \
*.ref
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
# Possible values are YES and NO. If left blank NO is used.
EXAMPLE_RECURSIVE = NO
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
# the \image command).
IMAGE_PATH = @top_srcdir@/doc/images
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
# ignored.
-INPUT_FILTER =
+INPUT_FILTER =
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
# is applied to all files.
-FILTER_PATTERNS =
+FILTER_PATTERNS =
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
# files to browse (i.e. when SOURCE_BROWSER is set to YES).
FILTER_SOURCE_FILES = NO
@@ -577,32 +694,32 @@
# configuration options related to source browsing
#---------------------------------------------------------------------------
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
# VERBATIM_HEADERS is set to NO.
SOURCE_BROWSER = YES
-# Setting the INLINE_SOURCES tag to YES will include the body
+# Setting the INLINE_SOURCES tag to YES will include the body
# of functions and classes directly in the documentation.
INLINE_SOURCES = NO
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
# fragments. Normal C and C++ comments will always remain visible.
STRIP_CODE_COMMENTS = YES
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
# functions referencing it will be listed.
REFERENCED_BY_RELATION = YES
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
# called/used by that function will be listed.
REFERENCES_RELATION = YES
@@ -610,20 +727,21 @@
# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code. Otherwise they will link to the documentstion.
+# link to the source code.
+# Otherwise they will link to the documentation.
REFERENCES_LINK_SOURCE = YES
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
# will need version 4.8.6 or higher.
USE_HTAGS = NO
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
# which an include is specified. Set to NO to disable this.
VERBATIM_HEADERS = YES
@@ -632,279 +750,429 @@
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
# contains a lot of classes, structs, unions or interfaces.
ALPHABETICAL_INDEX = YES
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
# in which this list will be split (can be a number in the range [1..20])
COLS_IN_ALPHA_INDEX = 4
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
# should be ignored while generating the index headers.
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
# generate HTML output.
GENERATE_HTML = YES
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
HTML_OUTPUT = html
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
# doxygen will generate files with .html extension.
HTML_FILE_EXTENSION = .html
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
# standard header.
HTML_HEADER = @top_srcdir@/doc/local/@PACKAGE@_header.html
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
HTML_FOOTER = @top_srcdir@/doc/local/@PACKAGE@_footer.html
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
+# If the HTML_TIMESTAMP tag is set to YES then the generated HTML
+# documentation will contain the timesstamp.
+
+HTML_TIMESTAMP = NO
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
# stylesheet in the HTML output directory as well, or it will be erased!
-HTML_STYLESHEET =
+HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = NO
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
# NO a bullet list will be used.
HTML_ALIGN_MEMBERS = YES
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML...
[truncated message content] |
|
From: <den...@us...> - 2010-08-02 13:58:53
|
Revision: 255
http://stdair.svn.sourceforge.net/stdair/?rev=255&view=rev
Author: denis_arnaud
Date: 2010-08-02 13:58:47 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
[Man] Added Doxygen configuration to generate man pages.
Modified Paths:
--------------
trunk/stdair/Makefile.am
trunk/stdair/man/Makefile.am
Modified: trunk/stdair/Makefile.am
===================================================================
--- trunk/stdair/Makefile.am 2010-08-02 13:44:03 UTC (rev 254)
+++ trunk/stdair/Makefile.am 2010-08-02 13:58:47 UTC (rev 255)
@@ -21,11 +21,16 @@
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
config-h.in sic/stamp-h.in autogen.sh bootstrap
-#EXTRA_DIST = @PACKAGE@.spec @PACKAGE@.m4 @PACKAGE@.pc Makefile.common
+# Note 1: the RPM specification file (@PACKAGE@.spec) must not be distributed
+# with the rest of the source code. The tar-ball will be used by the packaging
+# process, from an external RPM specification file: duplicating it in the
+# tar-ball may only confuse things.
+# Note 2: Both @PACKAGE@.m4 and @PACKAGE@.pc must not be distributed, as they
+# will be generated by the configure script.
EXTRA_DIST =
# Build in these directories:
-SUBDIRS = stdair @PACKAGE@ man $(HTML_DOC_DIR) extracppunit $(TEST_DIR)
+SUBDIRS = stdair man $(HTML_DOC_DIR) extracppunit $(TEST_DIR)
# Configuration helpers
Modified: trunk/stdair/man/Makefile.am
===================================================================
--- trunk/stdair/man/Makefile.am 2010-08-02 13:44:03 UTC (rev 254)
+++ trunk/stdair/man/Makefile.am 2010-08-02 13:58:47 UTC (rev 255)
@@ -11,6 +11,8 @@
EXTRA_DIST = $(man_MANS) $(MAN_SRC)
#
+all-local: man-local
+
man-local: doxygen_man.cfg $(MAN_SRC)
doxygen $<; \
mv -f man3/* . && rmdir man3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-08-28 21:33:38
|
Revision: 288
http://stdair.svn.sourceforge.net/stdair/?rev=288&view=rev
Author: denis_arnaud
Date: 2010-08-28 21:33:32 +0000 (Sat, 28 Aug 2010)
Log Message:
-----------
[Packaging] Fixed RPM packaging issues.
Modified Paths:
--------------
trunk/stdair/stdair.spec
trunk/stdair/test/Makefile.am
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-08-28 21:31:51 UTC (rev 287)
+++ trunk/stdair/stdair.spec 2010-08-28 21:33:32 UTC (rev 288)
@@ -68,7 +68,7 @@
%install
# On Fedora, the BuildRoot is automatically cleaned. Which is not the case for
# RedHat. See: https://fedoraproject.org/wiki/Packaging/Guidelines#BuildRoot_tag
-%if %{?rhel:rm -rf $RPM_BUILD_ROOT}
+%{?rhel:rm -rf $RPM_BUILD_ROOT}
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
Modified: trunk/stdair/test/Makefile.am
===================================================================
--- trunk/stdair/test/Makefile.am 2010-08-28 21:31:51 UTC (rev 287)
+++ trunk/stdair/test/Makefile.am 2010-08-28 21:33:32 UTC (rev 288)
@@ -4,7 +4,7 @@
MAINTAINERCLEANFILES = Makefile.in
##
-SUBDIRS = samples inheritance mpl stdair
+SUBDIRS = samples inheritance mpl architecture stdair
EXTRA_DIST =
##
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-16 08:02:28
|
Revision: 333
http://stdair.svn.sourceforge.net/stdair/?rev=333&view=rev
Author: denis_arnaud
Date: 2010-09-16 08:02:19 +0000 (Thu, 16 Sep 2010)
Log Message:
-----------
[Release] Back to working version (99.99.99).
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/stdair.spec
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2010-09-16 08:00:27 UTC (rev 332)
+++ trunk/stdair/configure.ac 2010-09-16 08:02:19 UTC (rev 333)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
-AC_INIT([STDAIR],[0.5.0],[den...@us...],[stdair])
+AC_INIT([STDAIR],[99.99.99],[den...@us...],[stdair])
AC_CONFIG_HEADER([stdair/config.h])
AC_CONFIG_SRCDIR([stdair/bom/BomRoot.hpp])
AC_CONFIG_AUX_DIR([config])
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# Shared library versioning
-GENERIC_LIBRARY_VERSION="0:5:0"
+GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-09-16 08:00:27 UTC (rev 332)
+++ trunk/stdair/stdair.spec 2010-09-16 08:02:19 UTC (rev 333)
@@ -2,7 +2,7 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 0.5.0
+Version: 99.99.99
Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
@@ -111,9 +111,12 @@
%changelog
-* Sun Aug 30 2010 Son Nguyen Kim <ngu...@gm...> 0.5.0-1
+* Sun Sep 19 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
- Upstream update
+* Thu Sep 16 2010 Son Nguyen Kim <ngu...@gm...> 0.5.0-1
+- Upstream update
+
* Fri Sep 03 2010 Son Nguyen Kim <ngu...@gm...> 0.4.0-1
- Replace extracc external ref to dependency
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-10-14 11:14:17
|
Revision: 345
http://stdair.svn.sourceforge.net/stdair/?rev=345&view=rev
Author: denis_arnaud
Date: 2010-10-14 11:14:11 +0000 (Thu, 14 Oct 2010)
Log Message:
-----------
[Release] Back to working version (99.99.99).
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/stdair.spec
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2010-10-14 11:13:10 UTC (rev 344)
+++ trunk/stdair/configure.ac 2010-10-14 11:14:11 UTC (rev 345)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
-AC_INIT([STDAIR],[0.6.0],[den...@us...],[stdair])
+AC_INIT([STDAIR],[99.99.99],[den...@us...],[stdair])
AC_CONFIG_HEADER([stdair/config.h])
AC_CONFIG_SRCDIR([stdair/bom/BomRoot.hpp])
AC_CONFIG_AUX_DIR([config])
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# Shared library versioning
-GENERIC_LIBRARY_VERSION="0:6:0"
+GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-10-14 11:13:10 UTC (rev 344)
+++ trunk/stdair/stdair.spec 2010-10-14 11:14:11 UTC (rev 345)
@@ -2,7 +2,7 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 0.6.0
+Version: 99.99.99
Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-10-14 17:16:50
|
Revision: 349
http://stdair.svn.sourceforge.net/stdair/?rev=349&view=rev
Author: denis_arnaud
Date: 2010-10-14 17:16:42 +0000 (Thu, 14 Oct 2010)
Log Message:
-----------
[Release 0.7.0] Release of version 0.7.0.
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/stdair.spec
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2010-10-14 16:40:17 UTC (rev 348)
+++ trunk/stdair/configure.ac 2010-10-14 17:16:42 UTC (rev 349)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
-AC_INIT([STDAIR],[99.99.99],[den...@us...],[stdair])
+AC_INIT([STDAIR],[0.7.0],[den...@us...],[stdair])
AC_CONFIG_HEADER([stdair/config.h])
AC_CONFIG_SRCDIR([stdair/bom/BomRoot.hpp])
AC_CONFIG_AUX_DIR([config])
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# Shared library versioning
-GENERIC_LIBRARY_VERSION="99:99:99"
+GENERIC_LIBRARY_VERSION="0:7:0"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-10-14 16:40:17 UTC (rev 348)
+++ trunk/stdair/stdair.spec 2010-10-14 17:16:42 UTC (rev 349)
@@ -2,7 +2,7 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 99.99.99
+Version: 0.7.0
Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
@@ -111,7 +111,7 @@
%changelog
-* Thu Oct 21 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
+* Thu Oct 14 2010 Son Nguyen Kim <ngu...@gm...> 0.7.0-1
- Upstream update
* Thu Oct 14 2010 Son Nguyen Kim <ngu...@gm...> 0.6.0-1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-02 23:43:57
|
Revision: 371
http://stdair.svn.sourceforge.net/stdair/?rev=371&view=rev
Author: denis_arnaud
Date: 2010-12-02 23:43:47 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
[Release 0.9.0] Release of version 0.9.0.
Modified Paths:
--------------
trunk/stdair/configure.ac
trunk/stdair/stdair.spec
Modified: trunk/stdair/configure.ac
===================================================================
--- trunk/stdair/configure.ac 2010-12-02 23:41:40 UTC (rev 370)
+++ trunk/stdair/configure.ac 2010-12-02 23:43:47 UTC (rev 371)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>])
-AC_INIT([STDAIR],[99.99.99],[den...@us...],[stdair])
+AC_INIT([STDAIR],[0.9.0],[den...@us...],[stdair])
AC_CONFIG_HEADER([stdair/config.h])
AC_CONFIG_SRCDIR([stdair/bom/BomRoot.hpp])
AC_CONFIG_AUX_DIR([config])
@@ -11,7 +11,7 @@
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
# Shared library versioning
-GENERIC_LIBRARY_VERSION="99:99:99"
+GENERIC_LIBRARY_VERSION="0:9:0"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec 2010-12-02 23:41:40 UTC (rev 370)
+++ trunk/stdair/stdair.spec 2010-12-02 23:43:47 UTC (rev 371)
@@ -2,7 +2,7 @@
%global mydocs __tmp_docdir
#
Name: stdair
-Version: 99.99.99
+Version: 0.9.0
Release: 1%{?dist}
Summary: C++ Standard Airline IT Object Library
@@ -111,7 +111,7 @@
%changelog
-* Sat Nov 06 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
+* Fri Dec 03 2010 Son Nguyen Kim <ngu...@gm...> 0.9.0-1
- Upstream update
* Sat Nov 06 2010 Son Nguyen Kim <ngu...@gm...> 0.8.0-1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X