Menu
▾
▴
stdair-svn — Subversion Commit Notification List
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
(51) |
Nov
(8) |
Dec
(13) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(32) |
Feb
(47) |
Mar
(6) |
Apr
(19) |
May
(7) |
Jun
(19) |
Jul
(39) |
Aug
(51) |
Sep
(39) |
Oct
(18) |
Nov
(10) |
Dec
(27) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <den...@us...> - 2011-07-03 16:39:51
|
Revision: 395
http://stdair.svn.sourceforge.net/stdair/?rev=395&view=rev
Author: denis_arnaud
Date: 2011-07-03 16:39:45 +0000 (Sun, 03 Jul 2011)
Log Message:
-----------
[Build] Updated the GNU Autotools scripts for the new autoconf version (2.68).
Modified Paths:
--------------
trunk/stdair/config/ax_boost_date_time.m4
trunk/stdair/config/ax_firebird.m4
trunk/stdair/config/ax_odbc.m4
trunk/stdair/config/ax_oracle_oci.m4
trunk/stdair/config/ax_sqlite3.m4
Modified: trunk/stdair/config/ax_boost_date_time.m4
===================================================================
--- trunk/stdair/config/ax_boost_date_time.m4 2011-07-03 16:23:06 UTC (rev 394)
+++ trunk/stdair/config/ax_boost_date_time.m4 2011-07-03 16:39:45 UTC (rev 395)
@@ -21,9 +21,9 @@
ax_cv_boost_date_time,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <boost/date_time/gregorian/gregorian_types.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/date_time/gregorian/gregorian_types.hpp>]],
[[using namespace boost::gregorian; date d(2002,Jan,10); return 0;]]),
- ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
+ ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)]
AC_LANG_RESTORE
])
if test "$ax_cv_boost_date_time" = yes; then
Modified: trunk/stdair/config/ax_firebird.m4
===================================================================
--- trunk/stdair/config/ax_firebird.m4 2011-07-03 16:23:06 UTC (rev 394)
+++ trunk/stdair/config/ax_firebird.m4 2011-07-03 16:39:45 UTC (rev 395)
@@ -110,8 +110,7 @@
AC_LANG_PUSH(C++)
AC_COMPILE_IFELSE(
- [
- AC_LANG_PROGRAM([[@%:@include <ibase.h>]],
+ [AC_LANG_PROGRAM([[@%:@include <ibase.h>]],
[[
#if (FB_API_VER >= $firebird_version_req_number)
// Everything is okay
@@ -119,8 +118,12 @@
# error Firebird version is too old
#endif
]]
+<<<<<<< HEAD
)
],
+=======
+ )],
+>>>>>>> trunk
[
AC_MSG_RESULT([yes])
success="yes"
Modified: trunk/stdair/config/ax_odbc.m4
===================================================================
--- trunk/stdair/config/ax_odbc.m4 2011-07-03 16:23:06 UTC (rev 394)
+++ trunk/stdair/config/ax_odbc.m4 2011-07-03 16:39:45 UTC (rev 395)
@@ -82,8 +82,7 @@
AC_LANG_PUSH(C++)
AC_COMPILE_IFELSE(
- [
- AC_LANG_PROGRAM([[@%:@include <sql.h>]],
+ [AC_LANG_PROGRAM([[@%:@include <sql.h>]],
[[
#if (ODBCVER >= $odbc_version_req)
// Everything is okay
@@ -91,8 +90,7 @@
# error ODBC version is too old
#endif
]]
- )
- ],
+ )],
[
AC_MSG_RESULT([yes])
success="yes"
Modified: trunk/stdair/config/ax_oracle_oci.m4
===================================================================
--- trunk/stdair/config/ax_oracle_oci.m4 2011-07-03 16:23:06 UTC (rev 394)
+++ trunk/stdair/config/ax_oracle_oci.m4 2011-07-03 16:39:45 UTC (rev 395)
@@ -163,8 +163,8 @@
AC_MSG_CHECKING([for Oracle OCI headers in $oracle_include_dir])
AC_LANG_PUSH(C++)
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[@%:@include <oci.h>]],
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[@%:@include <oci.h>]],
[[
#if defined(OCI_MAJOR_VERSION)
#if OCI_MAJOR_VERSION == 10 && OCI_MINOR_VERSION == 2
@@ -203,8 +203,8 @@
AC_MSG_CHECKING([for Oracle OCI libraries in $oracle_lib_dir])
AC_LANG_PUSH(C++)
- AC_LINK_IFELSE([
- AC_LANG_PROGRAM([[@%:@include <oci.h>]],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[@%:@include <oci.h>]],
[[
OCIEnv* envh = 0;
OCIEnvCreate(&envh, OCI_DEFAULT, 0, 0, 0, 0, 0, 0);
Modified: trunk/stdair/config/ax_sqlite3.m4
===================================================================
--- trunk/stdair/config/ax_sqlite3.m4 2011-07-03 16:23:06 UTC (rev 394)
+++ trunk/stdair/config/ax_sqlite3.m4 2011-07-03 16:39:45 UTC (rev 395)
@@ -95,8 +95,7 @@
AC_LANG_PUSH(C++)
AC_COMPILE_IFELSE(
- [
- AC_LANG_PROGRAM([[@%:@include <sqlite3.h>]],
+ [AC_LANG_PROGRAM([[@%:@include <sqlite3.h>]],
[[
#if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number)
// Everything is okay
@@ -104,8 +103,7 @@
# error SQLite version is too old
#endif
]]
- )
- ],
+ )],
[
AC_MSG_RESULT([yes])
success="yes"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2011-07-03 16:23:12
|
Revision: 394
http://stdair.svn.sourceforge.net/stdair/?rev=394&view=rev
Author: denis_arnaud
Date: 2011-07-03 16:23:06 +0000 (Sun, 03 Jul 2011)
Log Message:
-----------
[Build] The default Boost libraries are now the multi-threaded ones (instead of the single-threaded ones).
Modified Paths:
--------------
trunk/stdair/config/ax_boost.m4
Modified: trunk/stdair/config/ax_boost.m4
===================================================================
--- trunk/stdair/config/ax_boost.m4 2010-12-03 16:38:12 UTC (rev 393)
+++ trunk/stdair/config/ax_boost.m4 2011-07-03 16:23:06 UTC (rev 394)
@@ -263,20 +263,22 @@
ax_cv_boost_filesystem,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
[[using namespace boost::filesystem;
path my_path( "foo/bar/data.txt" );
- return 0;]]),
+ return 0;]])],
ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
AC_LANG_RESTORE
])
if test "$ax_cv_boost_filesystem" = "yes"; then
AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::FILESYSTEM library is available])
BN=boost_filesystem
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \
- $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_FILESYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes" break],
[link_filesystem="no"])
@@ -293,19 +295,22 @@
ax_cv_boost_system,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
[[using namespace boost::system;
error_code myErrorCode();
- return 0;]]),
+ return 0;]])],
ax_cv_boost_system=yes, ax_cv_boost_system=no)
AC_LANG_RESTORE
])
if test "$ax_cv_boost_system" = "yes"; then
AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::SYSTEM library is available])
BN=boost_system
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
- $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_SYSTEM_LIB="-l$ax_lib" AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes" break],
[link_system="no"])
@@ -322,20 +327,21 @@
ax_cv_boost_program_options,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/program_options.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/program_options.hpp>]],
[[boost::program_options::options_description generic("Generic options");
- return 0;]]),
+ return 0;]])],
ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no)
AC_LANG_RESTORE
])
if test "$ax_cv_boost_program_options" = yes; then
AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available])
BN=boost_program_options
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib" AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes" break],
[link_program_options="no"])
@@ -361,9 +367,9 @@
else
CXXFLAGS="-pthread $CXXFLAGS"
fi
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/thread/thread.hpp>]],
[[boost::thread_group thrds;
- return 0;]]),
+ return 0;]])],
ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_RESTORE
@@ -380,12 +386,12 @@
AC_SUBST(BOOST_CFLAGS)
AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::THREAD library is available])
BN=boost_thread
- for ax_lib in $BN $BN-mt $BN-$CC $BN-$CC-mt \
- $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_THREAD_LIB="-l$ax_lib" AC_SUBST(BOOST_THREAD_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -401,25 +407,27 @@
ax_cv_boost_iostreams,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/iostreams/filtering_stream.hpp>
- @%:@include <boost/range/iterator_range.hpp>
- ]],
- [[std::string input = "Hello World!";
- namespace io = boost::iostreams;
- io::filtering_istream in(boost::make_iterator_range(input));
- return 0;
- ]]),
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[@%:@include <boost/iostreams/filtering_stream.hpp>
+ @%:@include <boost/range/iterator_range.hpp>]],
+ [[std::string input = "Hello World!";
+ namespace io = boost::iostreams;
+ io::filtering_istream in (boost::make_iterator_range(input));
+ return 0;
+ ]])],
ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no)
AC_LANG_RESTORE
])
if test "x$ax_cv_boost_iostreams" = "xyes"; then
AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
BN=boost_iostreams
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_IOSTREAMS_LIB="-l$ax_lib" AC_SUBST(BOOST_IOSTREAMS_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -435,35 +443,38 @@
ax_cv_boost_serialization,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <fstream>
- @%:@include <boost/archive/text_oarchive.hpp>
- @%:@include <boost/archive/text_iarchive.hpp>
- ]],
- [[std::ofstream ofs("filename");
- boost::archive::text_oarchive oa(ofs);
- return 0;
- ]]),
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+ [[@%:@include <fstream>
+ @%:@include <boost/archive/text_oarchive.hpp>
+ @%:@include <boost/archive/text_iarchive.hpp>
+ ]],
+ [[std::ofstream ofs("filename");
+ boost::archive::text_oarchive oa(ofs);
+ return 0;
+ ]])],
ax_cv_boost_serialization=yes, ax_cv_boost_serialization=no)
AC_LANG_RESTORE
])
if test "x$ax_cv_boost_serialization" = "xyes"; then
AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available])
BN=boost_serialization
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_SERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_SERIALIZATION_LIB) link_thread="yes" break],
[link_thread="no"])
done
BN=boost_wserialization
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_WSERIALIZATION_LIB="-l$ax_lib" AC_SUBST(BOOST_WSERIALIZATION_LIB) link_thread="yes" break],
[link_thread="no"])
@@ -480,22 +491,23 @@
ax_cv_boost_signals,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/signal.hpp>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/signal.hpp>
]],
[[boost::signal<void ()> sig;
return 0;
- ]]),
+ ]])],
ax_cv_boost_signals=yes, ax_cv_boost_signals=no)
AC_LANG_RESTORE
])
if test "x$ax_cv_boost_signals" = "xyes"; then
AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals library is available])
BN=boost_signals
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_SIGNALS_LIB="-l$ax_lib" AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes" break],
[link_signals="no"])
done
@@ -511,22 +523,23 @@
ax_cv_boost_date_time,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/date_time/gregorian/gregorian_types.hpp>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/date_time/gregorian/gregorian_types.hpp>
]],
[[using namespace boost::gregorian; date d(2002,Jan,10);
return 0;
- ]]),
+ ]])],
ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
AC_LANG_RESTORE
])
if test "x$ax_cv_boost_date_time" = "xyes"; then
AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available])
BN=boost_date_time
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_DATE_TIME_LIB="-l$ax_lib" AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes" break],
[link_date_time="no"])
done
@@ -542,20 +555,21 @@
ax_cv_boost_regex,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/regex.hpp>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/regex.hpp>
]],
- [[boost::regex r(); return 0;]]),
+ [[boost::regex r(); return 0;]])],
ax_cv_boost_regex=yes, ax_cv_boost_regex=no)
AC_LANG_RESTORE
])
if test "x$ax_cv_boost_regex" = "xyes"; then
AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
BN=boost_regex
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt \
- $BN-mgw-mt-s $BN-mgw-s \
- $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_REGEX_LIB="-l$ax_lib" AC_SUBST(BOOST_REGEX_LIB) link_thread="yes" break],
[link_thread="no"])
done
@@ -572,14 +586,14 @@
ax_cv_boost_asio,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/asio.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/asio.hpp>]],
[[boost::asio::io_service io;
boost::system::error_code timer_result;
boost::asio::deadline_timer t(io);
t.cancel();
io.run_one();
return 0;
- ]]),
+ ]])],
ax_cv_boost_asio=yes, ax_cv_boost_asio=no)
AC_LANG_RESTORE
])
@@ -589,6 +603,7 @@
BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_DATE_TIME_LIB}"
BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_REGEX_LIB}"
BOOST_ASIO_LIB="${BOOST_ASIO_LIB} ${BOOST_SERIALIZATION_LIB}"
+ AC_SUBST(BOOST_ASIO_LIB)
fi
#
@@ -614,10 +629,10 @@
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/python.hpp>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/python.hpp>
char const* greet() { return "hello"; }
BOOST_PYTHON_MODULE(hello_ext) { boost::python::def("greet", greet);}
- ]]),
+ ]])],
ax_cv_boost_python=yes, ax_cv_boost_python=no)
AC_LANG_RESTORE
])
@@ -632,21 +647,22 @@
ax_cv_boost_mpi,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/mpi.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/mpi.hpp>]],
[[
return 0;
- ]]),
+ ]])],
ax_cv_boost_mpi=yes, ax_cv_boost_mpi=no)
AC_LANG_RESTORE
])
if test "x$ax_cv_boost_mpi" = "xyes"; then
AC_DEFINE(HAVE_BOOST_MPI,,[define if the Boost::Mpi library is available])
BN=boost_mpi
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \
- $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
-
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_MPI_LIB="-l$ax_lib" AC_SUBST(BOOST_MPI_LIB) link_mpi="yes" break],
[link_mpi="no"])
done
@@ -664,11 +680,11 @@
ax_cv_boost_mpi_python,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/mpi/python/serialize.hpp>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/mpi/python/serialize.hpp>
]],
[[
return 0;
- ]]),
+ ]])],
ax_cv_boost_mpi_python=yes, ax_cv_boost_mpi_python=no)
AC_LANG_RESTORE
])
@@ -676,10 +692,12 @@
AC_DEFINE(HAVE_BOOST_MPI_PYTHON,,[define if the Boost::Mpi_Python library is available])
BN=boost_mpi_python
# BN=boost_mpi_python-py25
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \
- $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
AC_CHECK_LIB($ax_lib, main, [BOOST_MPI_PYTHON_LIB="-l$ax_lib" AC_SUBST(BOOST_MPI_PYTHON_LIB) link_mpi_python="yes" break],
[link_mpi_python="no"])
done
@@ -706,9 +724,9 @@
ax_cv_boost_unit_test_framework,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include <boost/test/unit_test.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/test/unit_test.hpp>]],
[[using boost::unit_test::test_suite;
- test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]]),
+ test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]])],
ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no)
AC_LANG_RESTORE
])
@@ -716,10 +734,12 @@
AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_test_framework library is available])
BN=boost_unit_test_framework
saved_ldflags="${LDFLAGS}"
- for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
- lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s \
- lib$BN-$CC-s $BN-mgw $BN-mgw-mt $BN-mgw-mt-s \
- $BN-mgw-s $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
+ for ax_lib in \
+ $BN-mt $BN $BN-$CC-mt $BN-$CC \
+ $BN-$CC-mt-s $BN-$CC-s lib$BN-mt lib$BN \
+ lib$BN-$CC-mt lib$BN-$CC lib$BN-$CC-mt-s lib$BN-$CC-s \
+ $BN-mgw-mt $BN-mgw $BN-mgw-mt-s $BN-mgw-s \
+ $BN-$CC-mt-$BOOSTLIB_MDW_VERSION ; do
LDFLAGS="${LDFLAGS} -l$ax_lib"
AC_CACHE_CHECK(the name of the Boost::UnitTestFramework library,
ax_cv_boost_unit_test_framework,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 17:22:57
|
Revision: 387
http://stdair.svn.sourceforge.net/stdair/?rev=387&view=rev
Author: denis_arnaud
Date: 2010-12-03 15:33:52 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[Branch 0.9.0][API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.cpp
branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.hpp
branches/stdair/0.9.0/main/stdair/sources.mk
branches/stdair/0.9.0/main/stdair/stdair_date_time_types.hpp
branches/stdair/0.9.0/main/stdair/stdair_types.hpp
Added Paths:
-----------
branches/stdair/0.9.0/main/stdair/stdair_service_types.hpp
Removed Paths:
-------------
branches/stdair/0.9.0/main/stdair/stdair_service.hpp
Modified: branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.cpp 2010-12-03 15:20:52 UTC (rev 386)
+++ branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.cpp 2010-12-03 15:33:52 UTC (rev 387)
@@ -12,7 +12,8 @@
#include <mysql/soci-mysql.h>
#endif // SOCI_HEADERS_BURIED
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_exceptions.hpp>
#include <stdair/bom/AirlineStruct.hpp>
#include <stdair/dbadaptor/DbaAirline.hpp>
#include <stdair/command/DBManagerForAirlines.hpp>
Modified: branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.hpp 2010-12-03 15:20:52 UTC (rev 386)
+++ branches/stdair/0.9.0/main/stdair/command/DBManagerForAirlines.hpp 2010-12-03 15:33:52 UTC (rev 387)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_db.hpp>
#include <stdair/command/CmdAbstract.hpp>
namespace stdair {
Modified: branches/stdair/0.9.0/main/stdair/sources.mk
===================================================================
--- branches/stdair/0.9.0/main/stdair/sources.mk 2010-12-03 15:20:52 UTC (rev 386)
+++ branches/stdair/0.9.0/main/stdair/sources.mk 2010-12-03 15:33:52 UTC (rev 387)
@@ -9,8 +9,8 @@
$(top_srcdir)/stdair/stdair_rm_types.hpp \
$(top_srcdir)/stdair/stdair_demand_types.hpp \
$(top_srcdir)/stdair/stdair_fare_types.hpp \
+ $(top_srcdir)/stdair/stdair_service_types.hpp \
$(top_srcdir)/stdair/stdair_types.hpp \
- $(top_srcdir)/stdair/stdair_service.hpp \
$(top_srcdir)/stdair/STDAIR_Service.hpp
stdair_service_cc_sources =
Modified: branches/stdair/0.9.0/main/stdair/stdair_date_time_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_date_time_types.hpp 2010-12-03 15:20:52 UTC (rev 386)
+++ branches/stdair/0.9.0/main/stdair/stdair_date_time_types.hpp 2010-12-03 15:33:52 UTC (rev 387)
@@ -6,22 +6,9 @@
// //////////////////////////////////////////////////////////////////////
// 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 {
Deleted: branches/stdair/0.9.0/main/stdair/stdair_service.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_service.hpp 2010-12-03 15:20:52 UTC (rev 386)
+++ branches/stdair/0.9.0/main/stdair/stdair_service.hpp 2010-12-03 15:33:52 UTC (rev 387)
@@ -1,19 +0,0 @@
-#ifndef __STDAIR_STDAIR_SERVICE_HPP
-#define __STDAIR_STDAIR_SERVICE_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// Boost (Extended STL)
-#include <boost/shared_ptr.hpp>
-
-namespace stdair {
-
- // Forward declarations
- class STDAIR_Service;
-
- /** Pointer on the STDAIR Service handler. */
- typedef boost::shared_ptr<STDAIR_Service> STDAIR_ServicePtr_T;
-
-}
-#endif // __STDAIR_STDAIR_SERVICE_HPP
Copied: branches/stdair/0.9.0/main/stdair/stdair_service_types.hpp (from rev 376, branches/stdair/0.9.0/main/stdair/stdair_service.hpp)
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_service_types.hpp (rev 0)
+++ branches/stdair/0.9.0/main/stdair/stdair_service_types.hpp 2010-12-03 15:33:52 UTC (rev 387)
@@ -0,0 +1,19 @@
+#ifndef __STDAIR_STDAIR_SERVICE_HPP
+#define __STDAIR_STDAIR_SERVICE_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// Boost (Extended STL)
+#include <boost/shared_ptr.hpp>
+
+namespace stdair {
+
+ // Forward declarations
+ class STDAIR_Service;
+
+ /** Pointer on the STDAIR Service handler. */
+ typedef boost::shared_ptr<STDAIR_Service> STDAIR_ServicePtr_T;
+
+}
+#endif // __STDAIR_STDAIR_SERVICE_HPP
Modified: branches/stdair/0.9.0/main/stdair/stdair_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_types.hpp 2010-12-03 15:20:52 UTC (rev 386)
+++ branches/stdair/0.9.0/main/stdair/stdair_types.hpp 2010-12-03 15:33:52 UTC (rev 387)
@@ -15,6 +15,6 @@
#include <stdair/stdair_inventory_types.hpp>
#include <stdair/stdair_rm_types.hpp>
#include <stdair/stdair_date_time_types.hpp>
-#include <stdair/stdair_service.hpp>
+#include <stdair/stdair_service_types.hpp>
#endif // __STDAIR_STDAIR_TYPES_HPP
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 16:38:18
|
Revision: 393
http://stdair.svn.sourceforge.net/stdair/?rev=393&view=rev
Author: denis_arnaud
Date: 2010-12-03 16:38:12 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
trunk/stdair/stdair/STDAIR_Service.hpp
Modified: trunk/stdair/stdair/STDAIR_Service.hpp
===================================================================
--- trunk/stdair/stdair/STDAIR_Service.hpp 2010-12-03 16:37:46 UTC (rev 392)
+++ trunk/stdair/stdair/STDAIR_Service.hpp 2010-12-03 16:38:12 UTC (rev 393)
@@ -17,6 +17,7 @@
// StdAir
#include <stdair/basic/BasLogParams.hpp>
#include <stdair/basic/BasDBParams.hpp>
+#include <stdair/stdair_service_types.hpp>
namespace stdair {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 16:37:54
|
Revision: 392
http://stdair.svn.sourceforge.net/stdair/?rev=392&view=rev
Author: denis_arnaud
Date: 2010-12-03 16:37:46 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[Branch 0.9.0][API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
branches/stdair/0.9.0/main/stdair/STDAIR_Service.hpp
Modified: branches/stdair/0.9.0/main/stdair/STDAIR_Service.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/STDAIR_Service.hpp 2010-12-03 16:09:05 UTC (rev 391)
+++ branches/stdair/0.9.0/main/stdair/STDAIR_Service.hpp 2010-12-03 16:37:46 UTC (rev 392)
@@ -17,6 +17,7 @@
// StdAir
#include <stdair/basic/BasLogParams.hpp>
#include <stdair/basic/BasDBParams.hpp>
+#include <stdair/stdair_service_types.hpp>
namespace stdair {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 16:09:11
|
Revision: 391
http://stdair.svn.sourceforge.net/stdair/?rev=391&view=rev
Author: denis_arnaud
Date: 2010-12-03 16:09:05 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
trunk/stdair/stdair/basic/BasParserHelperTypes.hpp
Modified: trunk/stdair/stdair/basic/BasParserHelperTypes.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasParserHelperTypes.hpp 2010-12-03 16:08:57 UTC (rev 390)
+++ trunk/stdair/stdair/basic/BasParserHelperTypes.hpp 2010-12-03 16:09:05 UTC (rev 391)
@@ -7,11 +7,12 @@
// STL
#include <string>
#include <sstream>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_exceptions.hpp>
#include <stdair/service/Logger.hpp>
namespace stdair {
+
// ////////////////////////////////////////////////////////////////////
//
// Parser structure helper
@@ -22,12 +23,14 @@
struct date_time_element {
unsigned int _value;
- // Constructors.
+ // ////////// Constructors ///////////
+ /** Default constructor. */
date_time_element () { }
- date_time_element (const date_time_element& t)
- : _value (t._value) { }
+ /** Default copy constructor. */
+ date_time_element (const date_time_element& t) : _value (t._value) { }
+ /** Constructor. */
date_time_element (int i) : _value (i) { }
- // Checker.
+ /** Checker. */
void check () const {
if (_value < MIN || _value > MAX) {
std::ostringstream oMessage;
@@ -38,22 +41,29 @@
}
};
- /** Operator overload. */
+ /** Operator* overload. */
template <int MIN, int MAX>
- inline date_time_element<MIN, MAX> operator* (const date_time_element<MIN, MAX>& o1, const date_time_element<MIN, MAX>& o2) {
+ inline date_time_element<MIN,
+ MAX> operator*(const date_time_element<MIN, MAX>& o1,
+ const date_time_element<MIN, MAX>& o2){
return date_time_element<MIN, MAX> (o1._value * o2._value);
}
+
+ /** Operator+ overload. */
template <int MIN, int MAX>
- inline date_time_element<MIN, MAX> operator+ (const date_time_element<MIN, MAX>& o1, const date_time_element<MIN, MAX>& o2) {
+ inline date_time_element<MIN,
+ MAX> operator+(const date_time_element<MIN, MAX>& o1,
+ const date_time_element<MIN, MAX>& o2){
return date_time_element<MIN, MAX> (o1._value + o2._value);
}
- /** Type definitions for the date & time elements. */
+ /** Type definitions for the date and time elements. */
typedef date_time_element<0, 23> hour_t;
typedef date_time_element<0, 59> minute_t;
typedef date_time_element<0, 59> second_t;
typedef date_time_element<1900, 2100> year_t;
typedef date_time_element<1, 12> month_t;
typedef date_time_element<1, 31> day_t;
+
}
#endif // __STDAIR_BAS_BASCOMPARSERHELPERTYPES_HPP
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 16:09:03
|
Revision: 390
http://stdair.svn.sourceforge.net/stdair/?rev=390&view=rev
Author: denis_arnaud
Date: 2010-12-03 16:08:57 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[Branch 0.9.0][API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
branches/stdair/0.9.0/main/stdair/basic/BasParserHelperTypes.hpp
Modified: branches/stdair/0.9.0/main/stdair/basic/BasParserHelperTypes.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/basic/BasParserHelperTypes.hpp 2010-12-03 15:58:57 UTC (rev 389)
+++ branches/stdair/0.9.0/main/stdair/basic/BasParserHelperTypes.hpp 2010-12-03 16:08:57 UTC (rev 390)
@@ -7,11 +7,12 @@
// STL
#include <string>
#include <sstream>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_exceptions.hpp>
#include <stdair/service/Logger.hpp>
namespace stdair {
+
// ////////////////////////////////////////////////////////////////////
//
// Parser structure helper
@@ -22,12 +23,14 @@
struct date_time_element {
unsigned int _value;
- // Constructors.
+ // ////////// Constructors ///////////
+ /** Default constructor. */
date_time_element () { }
- date_time_element (const date_time_element& t)
- : _value (t._value) { }
+ /** Default copy constructor. */
+ date_time_element (const date_time_element& t) : _value (t._value) { }
+ /** Constructor. */
date_time_element (int i) : _value (i) { }
- // Checker.
+ /** Checker. */
void check () const {
if (_value < MIN || _value > MAX) {
std::ostringstream oMessage;
@@ -38,22 +41,29 @@
}
};
- /** Operator overload. */
+ /** Operator* overload. */
template <int MIN, int MAX>
- inline date_time_element<MIN, MAX> operator* (const date_time_element<MIN, MAX>& o1, const date_time_element<MIN, MAX>& o2) {
+ inline date_time_element<MIN,
+ MAX> operator*(const date_time_element<MIN, MAX>& o1,
+ const date_time_element<MIN, MAX>& o2){
return date_time_element<MIN, MAX> (o1._value * o2._value);
}
+
+ /** Operator+ overload. */
template <int MIN, int MAX>
- inline date_time_element<MIN, MAX> operator+ (const date_time_element<MIN, MAX>& o1, const date_time_element<MIN, MAX>& o2) {
+ inline date_time_element<MIN,
+ MAX> operator+(const date_time_element<MIN, MAX>& o1,
+ const date_time_element<MIN, MAX>& o2){
return date_time_element<MIN, MAX> (o1._value + o2._value);
}
- /** Type definitions for the date & time elements. */
+ /** Type definitions for the date and time elements. */
typedef date_time_element<0, 23> hour_t;
typedef date_time_element<0, 59> minute_t;
typedef date_time_element<0, 59> second_t;
typedef date_time_element<1900, 2100> year_t;
typedef date_time_element<1, 12> month_t;
typedef date_time_element<1, 31> day_t;
+
}
#endif // __STDAIR_BAS_BASCOMPARSERHELPERTYPES_HPP
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:59:03
|
Revision: 389
http://stdair.svn.sourceforge.net/stdair/?rev=389&view=rev
Author: denis_arnaud
Date: 2010-12-03 15:58:57 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
trunk/stdair/config/stdair.m4
Modified: trunk/stdair/config/stdair.m4
===================================================================
--- trunk/stdair/config/stdair.m4 2010-12-03 15:36:11 UTC (rev 388)
+++ trunk/stdair/config/stdair.m4 2010-12-03 15:58:57 UTC (rev 389)
@@ -83,7 +83,7 @@
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM([[
- #include <stdair/stdair.hpp>
+ #include <stdair/STDAIR_Service.hpp>
]],
[[int i=0;]]
)
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:36:17
|
Revision: 388
http://stdair.svn.sourceforge.net/stdair/?rev=388&view=rev
Author: denis_arnaud
Date: 2010-12-03 15:36:11 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
trunk/stdair/stdair/command/DBManagerForAirlines.cpp
trunk/stdair/stdair/command/DBManagerForAirlines.hpp
trunk/stdair/stdair/sources.mk
trunk/stdair/stdair/stdair_date_time_types.hpp
trunk/stdair/stdair/stdair_types.hpp
Added Paths:
-----------
trunk/stdair/stdair/stdair_service_types.hpp
Removed Paths:
-------------
trunk/stdair/stdair/stdair_service.hpp
Modified: trunk/stdair/stdair/command/DBManagerForAirlines.cpp
===================================================================
--- trunk/stdair/stdair/command/DBManagerForAirlines.cpp 2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/command/DBManagerForAirlines.cpp 2010-12-03 15:36:11 UTC (rev 388)
@@ -12,7 +12,8 @@
#include <mysql/soci-mysql.h>
#endif // SOCI_HEADERS_BURIED
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_exceptions.hpp>
#include <stdair/bom/AirlineStruct.hpp>
#include <stdair/dbadaptor/DbaAirline.hpp>
#include <stdair/command/DBManagerForAirlines.hpp>
Modified: trunk/stdair/stdair/command/DBManagerForAirlines.hpp
===================================================================
--- trunk/stdair/stdair/command/DBManagerForAirlines.hpp 2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/command/DBManagerForAirlines.hpp 2010-12-03 15:36:11 UTC (rev 388)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_db.hpp>
#include <stdair/command/CmdAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/sources.mk
===================================================================
--- trunk/stdair/stdair/sources.mk 2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/sources.mk 2010-12-03 15:36:11 UTC (rev 388)
@@ -9,8 +9,8 @@
$(top_srcdir)/stdair/stdair_rm_types.hpp \
$(top_srcdir)/stdair/stdair_demand_types.hpp \
$(top_srcdir)/stdair/stdair_fare_types.hpp \
+ $(top_srcdir)/stdair/stdair_service_types.hpp \
$(top_srcdir)/stdair/stdair_types.hpp \
- $(top_srcdir)/stdair/stdair_service.hpp \
$(top_srcdir)/stdair/STDAIR_Service.hpp
stdair_service_cc_sources =
Modified: trunk/stdair/stdair/stdair_date_time_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_date_time_types.hpp 2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/stdair_date_time_types.hpp 2010-12-03 15:36:11 UTC (rev 388)
@@ -6,22 +6,9 @@
// //////////////////////////////////////////////////////////////////////
// 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 {
Deleted: trunk/stdair/stdair/stdair_service.hpp
===================================================================
--- trunk/stdair/stdair/stdair_service.hpp 2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/stdair_service.hpp 2010-12-03 15:36:11 UTC (rev 388)
@@ -1,19 +0,0 @@
-#ifndef __STDAIR_STDAIR_SERVICE_HPP
-#define __STDAIR_STDAIR_SERVICE_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// Boost (Extended STL)
-#include <boost/shared_ptr.hpp>
-
-namespace stdair {
-
- // Forward declarations
- class STDAIR_Service;
-
- /** Pointer on the STDAIR Service handler. */
- typedef boost::shared_ptr<STDAIR_Service> STDAIR_ServicePtr_T;
-
-}
-#endif // __STDAIR_STDAIR_SERVICE_HPP
Copied: trunk/stdair/stdair/stdair_service_types.hpp (from rev 378, trunk/stdair/stdair/stdair_service.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_service_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_service_types.hpp 2010-12-03 15:36:11 UTC (rev 388)
@@ -0,0 +1,19 @@
+#ifndef __STDAIR_STDAIR_SERVICE_HPP
+#define __STDAIR_STDAIR_SERVICE_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// Boost (Extended STL)
+#include <boost/shared_ptr.hpp>
+
+namespace stdair {
+
+ // Forward declarations
+ class STDAIR_Service;
+
+ /** Pointer on the STDAIR Service handler. */
+ typedef boost::shared_ptr<STDAIR_Service> STDAIR_ServicePtr_T;
+
+}
+#endif // __STDAIR_STDAIR_SERVICE_HPP
Modified: trunk/stdair/stdair/stdair_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_types.hpp 2010-12-03 15:33:52 UTC (rev 387)
+++ trunk/stdair/stdair/stdair_types.hpp 2010-12-03 15:36:11 UTC (rev 388)
@@ -15,6 +15,6 @@
#include <stdair/stdair_inventory_types.hpp>
#include <stdair/stdair_rm_types.hpp>
#include <stdair/stdair_date_time_types.hpp>
-#include <stdair/stdair_service.hpp>
+#include <stdair/stdair_service_types.hpp>
#endif // __STDAIR_STDAIR_TYPES_HPP
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...> - 2010-12-03 15:20:53
|
Revision: 385
http://stdair.svn.sourceforge.net/stdair/?rev=385&view=rev
Author: denis_arnaud
Date: 2010-12-03 15:20:46 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[Branch 0.9.0][API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
branches/stdair/0.9.0/main/batches/stdair.cpp
branches/stdair/0.9.0/main/stdair/service/STDAIR_Service.cpp
branches/stdair/0.9.0/main/stdair/sources.mk
branches/stdair/0.9.0/main/test/stdair/StdairTestLib.cpp
Added Paths:
-----------
branches/stdair/0.9.0/main/stdair/STDAIR_Service.hpp
Removed Paths:
-------------
branches/stdair/0.9.0/main/stdair/stdair.hpp
Modified: branches/stdair/0.9.0/main/batches/stdair.cpp
===================================================================
--- branches/stdair/0.9.0/main/batches/stdair.cpp 2010-12-03 15:09:51 UTC (rev 384)
+++ branches/stdair/0.9.0/main/batches/stdair.cpp 2010-12-03 15:20:46 UTC (rev 385)
@@ -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: branches/stdair/0.9.0/main/stdair/STDAIR_Service.hpp (from rev 376, branches/stdair/0.9.0/main/stdair/stdair.hpp)
===================================================================
--- branches/stdair/0.9.0/main/stdair/STDAIR_Service.hpp (rev 0)
+++ branches/stdair/0.9.0/main/stdair/STDAIR_Service.hpp 2010-12-03 15:20:46 UTC (rev 385)
@@ -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: branches/stdair/0.9.0/main/stdair/service/STDAIR_Service.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/service/STDAIR_Service.cpp 2010-12-03 15:09:51 UTC (rev 384)
+++ branches/stdair/0.9.0/main/stdair/service/STDAIR_Service.cpp 2010-12-03 15:20:46 UTC (rev 385)
@@ -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: branches/stdair/0.9.0/main/stdair/sources.mk
===================================================================
--- branches/stdair/0.9.0/main/stdair/sources.mk 2010-12-03 15:09:51 UTC (rev 384)
+++ branches/stdair/0.9.0/main/stdair/sources.mk 2010-12-03 15:20:46 UTC (rev 385)
@@ -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: branches/stdair/0.9.0/main/stdair/stdair.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair.hpp 2010-12-03 15:09:51 UTC (rev 384)
+++ branches/stdair/0.9.0/main/stdair/stdair.hpp 2010-12-03 15:20:46 UTC (rev 385)
@@ -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: branches/stdair/0.9.0/main/test/stdair/StdairTestLib.cpp
===================================================================
--- branches/stdair/0.9.0/main/test/stdair/StdairTestLib.cpp 2010-12-03 15:09:51 UTC (rev 384)
+++ branches/stdair/0.9.0/main/test/stdair/StdairTestLib.cpp 2010-12-03 15:20:46 UTC (rev 385)
@@ -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...> - 2010-12-03 15:09:57
|
Revision: 384
http://stdair.svn.sourceforge.net/stdair/?rev=384&view=rev
Author: denis_arnaud
Date: 2010-12-03 15:09:51 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
trunk/stdair/stdair/bom/TravelSolutionStruct.hpp
trunk/stdair/stdair/stdair_basic_types.hpp
trunk/stdair/stdair/stdair_fare_types.hpp
trunk/stdair/stdair/stdair_inventory_types.hpp
Modified: trunk/stdair/stdair/bom/TravelSolutionStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/TravelSolutionStruct.hpp 2010-12-03 15:09:36 UTC (rev 383)
+++ trunk/stdair/stdair/bom/TravelSolutionStruct.hpp 2010-12-03 15:09:51 UTC (rev 384)
@@ -19,27 +19,38 @@
struct TravelSolutionStruct : public StructAbstract {
public:
// /////////// Getters ///////////////
+ /** Get the fare/price. */
+ const Fare_T getFare() const {
+ return _fare;
+ }
+ /** Get the availability. */
+ const Availability_T getAvailability() const {
+ return _availability;
+ }
+ /** Get the list of segment-date keys. */
const KeyList_T& getSegmentDateKeyList () const {
return _segmentDateKeyList;
}
+ /** Get the list of booking-class keys. */
const ClassList_String_T& getBookingClassKeyList () const {
return _bookingClassKeyList;
}
- const Fare_T getFare() const { return _fare; }
- const Availability_T getAvailability() const { return _availability; }
public:
// /////////// Setters ///////////////
- /** Setter for some attributes. */
+ /** Set the fare/price. */
void setFare (const Fare_T& iFare) {
_fare = iFare;
}
+ /** Set the availability. */
void setAvailability (const Availability_T& iAvail) {
_availability=iAvail;
}
+ /** Add a segment-date key to the dedicated list. */
void addSegmentDateKey (const std::string& iKey) {
_segmentDateKeyList.push_back (iKey);
}
+ /** Add a booking-class key to the dedicated list. */
void addBookingClassKey (const char iKey) {
_bookingClassKeyList.push_back (iKey);
}
Modified: trunk/stdair/stdair/stdair_basic_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_basic_types.hpp 2010-12-03 15:09:36 UTC (rev 383)
+++ trunk/stdair/stdair/stdair_basic_types.hpp 2010-12-03 15:09:51 UTC (rev 384)
@@ -96,6 +96,21 @@
(in a travel solution block). */
typedef unsigned short NbOfTravelSolutions_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 an availability. */
+ typedef double Availability_T;
+
+ /** Define the price of a travel solution. */
+ typedef double Fare_T;
+
// ///////////// Technical ////////////////
/** File or directory name.
<br>It may contain paths, relative or absolute (e.g., /foo/bar
Modified: trunk/stdair/stdair/stdair_fare_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_fare_types.hpp 2010-12-03 15:09:36 UTC (rev 383)
+++ trunk/stdair/stdair/stdair_fare_types.hpp 2010-12-03 15:09:51 UTC (rev 384)
@@ -11,8 +11,5 @@
/** 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
Modified: trunk/stdair/stdair/stdair_inventory_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_inventory_types.hpp 2010-12-03 15:09:36 UTC (rev 383)
+++ trunk/stdair/stdair/stdair_inventory_types.hpp 2010-12-03 15:09:51 UTC (rev 384)
@@ -32,15 +32,6 @@
/** 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;
@@ -70,10 +61,7 @@
/** 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. */
+ /** Define an availability status (AVS). */
typedef bool AvailabilityStatus_T;
/** Define a list of availabilities. */
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:09:42
|
Revision: 383
http://stdair.svn.sourceforge.net/stdair/?rev=383&view=rev
Author: denis_arnaud
Date: 2010-12-03 15:09:36 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[Branch 0.9.0][API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.hpp
branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp
branches/stdair/0.9.0/main/stdair/stdair_fare_types.hpp
branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp
Modified: branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.hpp 2010-12-03 14:51:47 UTC (rev 382)
+++ branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.hpp 2010-12-03 15:09:36 UTC (rev 383)
@@ -19,27 +19,38 @@
struct TravelSolutionStruct : public StructAbstract {
public:
// /////////// Getters ///////////////
+ /** Get the fare/price. */
+ const Fare_T getFare() const {
+ return _fare;
+ }
+ /** Get the availability. */
+ const Availability_T getAvailability() const {
+ return _availability;
+ }
+ /** Get the list of segment-date keys. */
const KeyList_T& getSegmentDateKeyList () const {
return _segmentDateKeyList;
}
+ /** Get the list of booking-class keys. */
const ClassList_String_T& getBookingClassKeyList () const {
return _bookingClassKeyList;
}
- const Fare_T getFare() const { return _fare; }
- const Availability_T getAvailability() const { return _availability; }
public:
// /////////// Setters ///////////////
- /** Setter for some attributes. */
+ /** Set the fare/price. */
void setFare (const Fare_T& iFare) {
_fare = iFare;
}
+ /** Set the availability. */
void setAvailability (const Availability_T& iAvail) {
_availability=iAvail;
}
+ /** Add a segment-date key to the dedicated list. */
void addSegmentDateKey (const std::string& iKey) {
_segmentDateKeyList.push_back (iKey);
}
+ /** Add a booking-class key to the dedicated list. */
void addBookingClassKey (const char iKey) {
_bookingClassKeyList.push_back (iKey);
}
Modified: branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp 2010-12-03 14:51:47 UTC (rev 382)
+++ branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp 2010-12-03 15:09:36 UTC (rev 383)
@@ -96,6 +96,21 @@
(in a travel solution block). */
typedef unsigned short NbOfTravelSolutions_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 an availability. */
+ typedef double Availability_T;
+
+ /** Define the price of a travel solution. */
+ typedef double Fare_T;
+
// ///////////// Technical ////////////////
/** File or directory name.
<br>It may contain paths, relative or absolute (e.g., /foo/bar
Modified: branches/stdair/0.9.0/main/stdair/stdair_fare_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_fare_types.hpp 2010-12-03 14:51:47 UTC (rev 382)
+++ branches/stdair/0.9.0/main/stdair/stdair_fare_types.hpp 2010-12-03 15:09:36 UTC (rev 383)
@@ -11,8 +11,5 @@
/** 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
Modified: branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp 2010-12-03 14:51:47 UTC (rev 382)
+++ branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp 2010-12-03 15:09:36 UTC (rev 383)
@@ -32,15 +32,6 @@
/** 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;
@@ -70,10 +61,7 @@
/** 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. */
+ /** Define an availability status (AVS). */
typedef bool AvailabilityStatus_T;
/** Define a list of availabilities. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 14:51:53
|
Revision: 382
http://stdair.svn.sourceforge.net/stdair/?rev=382&view=rev
Author: denis_arnaud
Date: 2010-12-03 14:51:47 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
trunk/stdair/stdair/bom/Bucket.cpp
trunk/stdair/stdair/bom/Bucket.hpp
trunk/stdair/stdair/bom/BucketKey.hpp
trunk/stdair/stdair/bom/OptimizerStruct.cpp
trunk/stdair/stdair/bom/OptimizerStruct.hpp
trunk/stdair/stdair/bom/TravelSolutionStruct.cpp
trunk/stdair/stdair/bom/TravelSolutionStruct.hpp
trunk/stdair/stdair/stdair_rm_types.hpp
Modified: trunk/stdair/stdair/bom/Bucket.cpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.cpp 2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/Bucket.cpp 2010-12-03 14:51:47 UTC (rev 382)
@@ -3,6 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
+#include <sstream>
// StdAir
#include <stdair/bom/Bucket.hpp>
Modified: trunk/stdair/stdair/bom/Bucket.hpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.hpp 2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/Bucket.hpp 2010-12-03 14:51:47 UTC (rev 382)
@@ -4,8 +4,11 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// STL
+#include <string>
+#include <iosfwd>
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BucketKey.hpp>
#include <stdair/bom/BucketTypes.hpp>
Modified: trunk/stdair/stdair/bom/BucketKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BucketKey.hpp 2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/BucketKey.hpp 2010-12-03 14:51:47 UTC (rev 382)
@@ -4,7 +4,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// STL
+#include <string>
+#include <iosfwd>
+// StdAir
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/OptimizerStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/OptimizerStruct.cpp 2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/OptimizerStruct.cpp 2010-12-03 14:51:47 UTC (rev 382)
@@ -2,11 +2,10 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STL
-#include <string>
+#include <cassert>
#include <sstream>
#include <vector>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/OptimizerStruct.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/OptimizerStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/OptimizerStruct.hpp 2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/OptimizerStruct.hpp 2010-12-03 14:51:47 UTC (rev 382)
@@ -6,6 +6,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <string>
+// StdAir
+#include <stdair/stdair_rm_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/TravelSolutionStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/TravelSolutionStruct.cpp 2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/TravelSolutionStruct.cpp 2010-12-03 14:51:47 UTC (rev 382)
@@ -3,11 +3,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-#include <istream>
-#include <ostream>
#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/bom/TravelSolutionStruct.hpp>
Modified: trunk/stdair/stdair/bom/TravelSolutionStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/TravelSolutionStruct.hpp 2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/bom/TravelSolutionStruct.hpp 2010-12-03 14:51:47 UTC (rev 382)
@@ -9,10 +9,12 @@
#include <string>
#include <vector>
// StdAir
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/basic/StructAbstract.hpp>
#include <stdair/bom/BookingClassTypes.hpp>
namespace stdair {
+
/** Structure holding the elements of a travel solution. */
struct TravelSolutionStruct : public StructAbstract {
public:
Modified: trunk/stdair/stdair/stdair_rm_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_rm_types.hpp 2010-12-03 14:51:21 UTC (rev 381)
+++ trunk/stdair/stdair/stdair_rm_types.hpp 2010-12-03 14:51:47 UTC (rev 382)
@@ -7,6 +7,8 @@
// STL
#include <string>
#include <vector>
+// StdAir
+#include <stdair/stdair_basic_types.hpp>
namespace stdair {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 14:51:27
|
Revision: 381
http://stdair.svn.sourceforge.net/stdair/?rev=381&view=rev
Author: denis_arnaud
Date: 2010-12-03 14:51:21 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[Branch 0.9.0][API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
branches/stdair/0.9.0/main/stdair/bom/Bucket.cpp
branches/stdair/0.9.0/main/stdair/bom/Bucket.hpp
branches/stdair/0.9.0/main/stdair/bom/BucketKey.hpp
branches/stdair/0.9.0/main/stdair/bom/OptimizerStruct.cpp
branches/stdair/0.9.0/main/stdair/bom/OptimizerStruct.hpp
branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.cpp
branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.hpp
branches/stdair/0.9.0/main/stdair/stdair_rm_types.hpp
Modified: branches/stdair/0.9.0/main/stdair/bom/Bucket.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/Bucket.cpp 2010-12-03 14:27:44 UTC (rev 380)
+++ branches/stdair/0.9.0/main/stdair/bom/Bucket.cpp 2010-12-03 14:51:21 UTC (rev 381)
@@ -3,6 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
+#include <sstream>
// StdAir
#include <stdair/bom/Bucket.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/Bucket.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/Bucket.hpp 2010-12-03 14:27:44 UTC (rev 380)
+++ branches/stdair/0.9.0/main/stdair/bom/Bucket.hpp 2010-12-03 14:51:21 UTC (rev 381)
@@ -4,8 +4,11 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// STL
+#include <string>
+#include <iosfwd>
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BucketKey.hpp>
#include <stdair/bom/BucketTypes.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/BucketKey.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/BucketKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
+++ branches/stdair/0.9.0/main/stdair/bom/BucketKey.hpp 2010-12-03 14:51:21 UTC (rev 381)
@@ -4,7 +4,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// STL
+#include <string>
+#include <iosfwd>
+// StdAir
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: branches/stdair/0.9.0/main/stdair/bom/OptimizerStruct.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/OptimizerStruct.cpp 2010-12-03 14:27:44 UTC (rev 380)
+++ branches/stdair/0.9.0/main/stdair/bom/OptimizerStruct.cpp 2010-12-03 14:51:21 UTC (rev 381)
@@ -2,11 +2,10 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STL
-#include <string>
+#include <cassert>
#include <sstream>
#include <vector>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/OptimizerStruct.hpp>
namespace stdair {
Modified: branches/stdair/0.9.0/main/stdair/bom/OptimizerStruct.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/OptimizerStruct.hpp 2010-12-03 14:27:44 UTC (rev 380)
+++ branches/stdair/0.9.0/main/stdair/bom/OptimizerStruct.hpp 2010-12-03 14:51:21 UTC (rev 381)
@@ -6,6 +6,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <string>
+// StdAir
+#include <stdair/stdair_rm_types.hpp>
namespace stdair {
Modified: branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.cpp 2010-12-03 14:27:44 UTC (rev 380)
+++ branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.cpp 2010-12-03 14:51:21 UTC (rev 381)
@@ -3,11 +3,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-#include <istream>
-#include <ostream>
#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/bom/TravelSolutionStruct.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.hpp 2010-12-03 14:27:44 UTC (rev 380)
+++ branches/stdair/0.9.0/main/stdair/bom/TravelSolutionStruct.hpp 2010-12-03 14:51:21 UTC (rev 381)
@@ -9,10 +9,12 @@
#include <string>
#include <vector>
// StdAir
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/basic/StructAbstract.hpp>
#include <stdair/bom/BookingClassTypes.hpp>
namespace stdair {
+
/** Structure holding the elements of a travel solution. */
struct TravelSolutionStruct : public StructAbstract {
public:
Modified: branches/stdair/0.9.0/main/stdair/stdair_rm_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_rm_types.hpp 2010-12-03 14:27:44 UTC (rev 380)
+++ branches/stdair/0.9.0/main/stdair/stdair_rm_types.hpp 2010-12-03 14:51:21 UTC (rev 381)
@@ -7,6 +7,8 @@
// STL
#include <string>
#include <vector>
+// StdAir
+#include <stdair/stdair_basic_types.hpp>
namespace stdair {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 14:27:51
|
Revision: 380
http://stdair.svn.sourceforge.net/stdair/?rev=380&view=rev
Author: denis_arnaud
Date: 2010-12-03 14:27:44 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
trunk/stdair/stdair/bom/BookingClass.cpp
trunk/stdair/stdair/bom/BookingClass.hpp
trunk/stdair/stdair/bom/BookingClassKey.cpp
trunk/stdair/stdair/bom/BookingClassKey.hpp
trunk/stdair/stdair/bom/FlightDate.cpp
trunk/stdair/stdair/bom/FlightDateKey.cpp
trunk/stdair/stdair/bom/FlightDateKey.hpp
trunk/stdair/stdair/bom/LegCabin.hpp
trunk/stdair/stdair/bom/LegCabinKey.cpp
trunk/stdair/stdair/bom/LegCabinKey.hpp
trunk/stdair/stdair/bom/LegDate.hpp
trunk/stdair/stdair/bom/LegDateKey.cpp
trunk/stdair/stdair/bom/LegDateKey.hpp
trunk/stdair/stdair/bom/SegmentCabin.cpp
trunk/stdair/stdair/bom/SegmentCabin.hpp
trunk/stdair/stdair/bom/SegmentCabinKey.cpp
trunk/stdair/stdair/bom/SegmentCabinKey.hpp
trunk/stdair/stdair/bom/SegmentDateKey.cpp
trunk/stdair/stdair/bom/SegmentDateKey.hpp
trunk/stdair/stdair/stdair_basic_types.hpp
trunk/stdair/stdair/stdair_demand_types.hpp
trunk/stdair/stdair/stdair_inventory_types.hpp
Modified: trunk/stdair/stdair/bom/BookingClass.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClass.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/BookingClass.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -3,6 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
+#include <sstream>
// STDAIR
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/basic/BasConst_Yield.hpp>
Modified: trunk/stdair/stdair/bom/BookingClass.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClass.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/BookingClass.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BookingClassKey.hpp>
#include <stdair/bom/BookingClassTypes.hpp>
Modified: trunk/stdair/stdair/bom/BookingClassKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/BookingClassKey.hpp>
Modified: trunk/stdair/stdair/bom/BookingClassKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDate.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -3,6 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
+#include <sstream>
// StdAir
#include <stdair/bom/FlightDate.hpp>
Modified: trunk/stdair/stdair/bom/FlightDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/FlightDateKey.hpp>
Modified: trunk/stdair/stdair/bom/FlightDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -5,7 +5,8 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_date_time_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegCabin.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabin.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegCabin.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/LegCabinKey.hpp>
#include <stdair/bom/LegCabinTypes.hpp>
Modified: trunk/stdair/stdair/bom/LegCabinKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegCabinKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/LegCabinKey.hpp>
Modified: trunk/stdair/stdair/bom/LegCabinKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegCabinKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegDate.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegDate.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/LegDateKey.hpp>
#include <stdair/bom/LegDateTypes.hpp>
Modified: trunk/stdair/stdair/bom/LegDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegDateKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/LegDateKey.hpp>
Modified: trunk/stdair/stdair/bom/LegDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegDateKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -6,7 +6,6 @@
// //////////////////////////////////////////////////////////////////////
// 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/SegmentCabin.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabin.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentCabin.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -3,7 +3,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
+#include <sstream>
+// StdAir
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/basic/BasConst_Inventory.hpp>
#include <stdair/bom/SegmentCabin.hpp>
Modified: trunk/stdair/stdair/bom/SegmentCabin.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabin.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentCabin.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/SegmentCabinKey.hpp>
#include <stdair/bom/SegmentCabinTypes.hpp>
Modified: trunk/stdair/stdair/bom/SegmentCabinKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabinKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentCabinKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/SegmentCabinKey.hpp>
Modified: trunk/stdair/stdair/bom/SegmentCabinKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabinKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentCabinKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentDateKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/SegmentDateKey.hpp>
Modified: trunk/stdair/stdair/bom/SegmentDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentDateKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -6,7 +6,6 @@
// //////////////////////////////////////////////////////////////////////
// StdAir
#include <stdair/stdair_basic_types.hpp>
-#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/stdair_basic_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_basic_types.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/stdair_basic_types.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -14,9 +14,6 @@
/** 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;
@@ -29,6 +26,23 @@
/** City code */
typedef LocationCode_T CityCode_T;
+ /** Define the Airline Code type (2-letter-code, e.g., BA). */
+ typedef std::string AirlineCode_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 identity number. */
typedef unsigned long Identity_T;
@@ -66,6 +80,22 @@
/** Define the number of seats required by a demand. */
// typedef unsigned short NbOfSeats_T;
+ /** Count */
+ typedef int Count_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 travel solutions
+ (in a travel solution block). */
+ typedef unsigned short NbOfTravelSolutions_T;
+
// ///////////// Technical ////////////////
/** File or directory name.
<br>It may contain paths, relative or absolute (e.g., /foo/bar
Modified: trunk/stdair/stdair/stdair_demand_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_demand_types.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/stdair_demand_types.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -69,25 +69,12 @@
/** Define the name of a WTP-component of characteristics pattern. */
typedef boost::tuples::tuple<double, WTP_T> CharacteristicsWTP_tuple_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 a indicator of demand to class matching. */
typedef double MatchingIndicator_T;
Modified: trunk/stdair/stdair/stdair_inventory_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_inventory_types.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/stdair_inventory_types.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -18,27 +18,10 @@
/** 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. */
+ /** 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. */
+ /** 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 14:26:50
|
Revision: 379
http://stdair.svn.sourceforge.net/stdair/?rev=379&view=rev
Author: denis_arnaud
Date: 2010-12-03 14:26:43 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[Branch 0.9.0][API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
branches/stdair/0.9.0/main/stdair/bom/BookingClass.cpp
branches/stdair/0.9.0/main/stdair/bom/BookingClass.hpp
branches/stdair/0.9.0/main/stdair/bom/BookingClassKey.cpp
branches/stdair/0.9.0/main/stdair/bom/BookingClassKey.hpp
branches/stdair/0.9.0/main/stdair/bom/FlightDate.cpp
branches/stdair/0.9.0/main/stdair/bom/FlightDateKey.cpp
branches/stdair/0.9.0/main/stdair/bom/FlightDateKey.hpp
branches/stdair/0.9.0/main/stdair/bom/LegCabin.hpp
branches/stdair/0.9.0/main/stdair/bom/LegCabinKey.cpp
branches/stdair/0.9.0/main/stdair/bom/LegCabinKey.hpp
branches/stdair/0.9.0/main/stdair/bom/LegDate.hpp
branches/stdair/0.9.0/main/stdair/bom/LegDateKey.cpp
branches/stdair/0.9.0/main/stdair/bom/LegDateKey.hpp
branches/stdair/0.9.0/main/stdair/bom/SegmentCabin.cpp
branches/stdair/0.9.0/main/stdair/bom/SegmentCabin.hpp
branches/stdair/0.9.0/main/stdair/bom/SegmentCabinKey.cpp
branches/stdair/0.9.0/main/stdair/bom/SegmentCabinKey.hpp
branches/stdair/0.9.0/main/stdair/bom/SegmentDateKey.cpp
branches/stdair/0.9.0/main/stdair/bom/SegmentDateKey.hpp
branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp
branches/stdair/0.9.0/main/stdair/stdair_demand_types.hpp
branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp
Modified: branches/stdair/0.9.0/main/stdair/bom/BookingClass.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/BookingClass.cpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/BookingClass.cpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -3,6 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
+#include <sstream>
// STDAIR
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/basic/BasConst_Yield.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/BookingClass.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/BookingClass.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/BookingClass.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BookingClassKey.hpp>
#include <stdair/bom/BookingClassTypes.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/BookingClassKey.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/BookingClassKey.cpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/BookingClassKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/BookingClassKey.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/BookingClassKey.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/BookingClassKey.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/BookingClassKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: branches/stdair/0.9.0/main/stdair/bom/FlightDate.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/FlightDate.cpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/FlightDate.cpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -3,6 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
+#include <sstream>
// StdAir
#include <stdair/bom/FlightDate.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/FlightDateKey.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/FlightDateKey.cpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/FlightDateKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/FlightDateKey.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/FlightDateKey.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/FlightDateKey.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/FlightDateKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -5,7 +5,8 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_date_time_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: branches/stdair/0.9.0/main/stdair/bom/LegCabin.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/LegCabin.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/LegCabin.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/LegCabinKey.hpp>
#include <stdair/bom/LegCabinTypes.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/LegCabinKey.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/LegCabinKey.cpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/LegCabinKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/LegCabinKey.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/LegCabinKey.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/LegCabinKey.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/LegCabinKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: branches/stdair/0.9.0/main/stdair/bom/LegDate.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/LegDate.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/LegDate.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/LegDateKey.hpp>
#include <stdair/bom/LegDateTypes.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/LegDateKey.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/LegDateKey.cpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/LegDateKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/LegDateKey.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/LegDateKey.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/LegDateKey.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/LegDateKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -6,7 +6,6 @@
// //////////////////////////////////////////////////////////////////////
// StdAir
#include <stdair/stdair_basic_types.hpp>
-#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: branches/stdair/0.9.0/main/stdair/bom/SegmentCabin.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/SegmentCabin.cpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/SegmentCabin.cpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -3,7 +3,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
+#include <sstream>
+// StdAir
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/basic/BasConst_Inventory.hpp>
#include <stdair/bom/SegmentCabin.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/SegmentCabin.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/SegmentCabin.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/SegmentCabin.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/SegmentCabinKey.hpp>
#include <stdair/bom/SegmentCabinTypes.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/SegmentCabinKey.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/SegmentCabinKey.cpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/SegmentCabinKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/SegmentCabinKey.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/SegmentCabinKey.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/SegmentCabinKey.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/SegmentCabinKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: branches/stdair/0.9.0/main/stdair/bom/SegmentDateKey.cpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/SegmentDateKey.cpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/SegmentDateKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/SegmentDateKey.hpp>
Modified: branches/stdair/0.9.0/main/stdair/bom/SegmentDateKey.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/bom/SegmentDateKey.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/bom/SegmentDateKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -6,7 +6,6 @@
// //////////////////////////////////////////////////////////////////////
// StdAir
#include <stdair/stdair_basic_types.hpp>
-#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -14,9 +14,6 @@
/** 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;
@@ -29,6 +26,23 @@
/** City code */
typedef LocationCode_T CityCode_T;
+ /** Define the Airline Code type (2-letter-code, e.g., BA). */
+ typedef std::string AirlineCode_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 identity number. */
typedef unsigned long Identity_T;
@@ -66,6 +80,22 @@
/** Define the number of seats required by a demand. */
// typedef unsigned short NbOfSeats_T;
+ /** Count */
+ typedef int Count_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 travel solutions
+ (in a travel solution block). */
+ typedef unsigned short NbOfTravelSolutions_T;
+
// ///////////// Technical ////////////////
/** File or directory name.
<br>It may contain paths, relative or absolute (e.g., /foo/bar
Modified: branches/stdair/0.9.0/main/stdair/stdair_demand_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_demand_types.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/stdair_demand_types.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -69,25 +69,12 @@
/** Define the name of a WTP-component of characteristics pattern. */
typedef boost::tuples::tuple<double, WTP_T> CharacteristicsWTP_tuple_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 a indicator of demand to class matching. */
typedef double MatchingIndicator_T;
Modified: branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp 2010-12-03 09:22:27 UTC (rev 378)
+++ branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp 2010-12-03 14:26:43 UTC (rev 379)
@@ -18,27 +18,10 @@
/** 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. */
+ /** 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. */
+ /** 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 10:04:53
|
Revision: 378
http://stdair.svn.sourceforge.net/stdair/?rev=378&view=rev
Author: denis_arnaud
Date: 2010-12-03 09:22:27 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[API] Further specified the API.
Modified Paths:
--------------
trunk/stdair/stdair/sources.mk
trunk/stdair/stdair/stdair_basic_types.hpp
trunk/stdair/stdair/stdair_demand_types.hpp
trunk/stdair/stdair/stdair_inventory_types.hpp
trunk/stdair/stdair/stdair_types.hpp
Added Paths:
-----------
trunk/stdair/stdair/stdair_maths_types.hpp
trunk/stdair/stdair/stdair_rm_types.hpp
Modified: trunk/stdair/stdair/sources.mk
===================================================================
--- trunk/stdair/stdair/sources.mk 2010-12-03 09:18:14 UTC (rev 377)
+++ trunk/stdair/stdair/sources.mk 2010-12-03 09:22:27 UTC (rev 378)
@@ -3,8 +3,10 @@
$(top_srcdir)/stdair/stdair_log.hpp \
$(top_srcdir)/stdair/stdair_db.hpp \
$(top_srcdir)/stdair/stdair_basic_types.hpp \
+ $(top_srcdir)/stdair/stdair_maths_types.hpp \
$(top_srcdir)/stdair/stdair_date_time_types.hpp \
$(top_srcdir)/stdair/stdair_inventory_types.hpp \
+ $(top_srcdir)/stdair/stdair_rm_types.hpp \
$(top_srcdir)/stdair/stdair_demand_types.hpp \
$(top_srcdir)/stdair/stdair_fare_types.hpp \
$(top_srcdir)/stdair/stdair_types.hpp \
Modified: trunk/stdair/stdair/stdair_basic_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_basic_types.hpp 2010-12-03 09:18:14 UTC (rev 377)
+++ trunk/stdair/stdair/stdair_basic_types.hpp 2010-12-03 09:22:27 UTC (rev 378)
@@ -66,10 +66,15 @@
/** Define the number of seats required by a demand. */
// typedef unsigned short NbOfSeats_T;
- // //////////////////////////////////////////////////////////////////////
- // Probability
- /** Probability */
- typedef float Probability_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;
+
+ /** Define the file address type (e.g. "a_directory/a_filename").
+ <br>NOTE: That type should be deprecated. */
+ typedef std::string FileAddress_T;
}
#endif // __STDAIR_STDAIR_BASIC_TYPES_HPP
Modified: trunk/stdair/stdair/stdair_demand_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_demand_types.hpp 2010-12-03 09:18:14 UTC (rev 377)
+++ trunk/stdair/stdair/stdair_demand_types.hpp 2010-12-03 09:22:27 UTC (rev 378)
@@ -66,6 +66,9 @@
/** Define a Willingness-To-Pay (WTP) (e.g., 1000.0 Euros). */
typedef double WTP_T;
+ /** Define the name of a WTP-component of characteristics pattern. */
+ typedef boost::tuples::tuple<double, WTP_T> CharacteristicsWTP_tuple_T;
+
/** Number of passengers (in a group) for a booking. */
typedef unsigned short PartySize_T;
@@ -85,13 +88,15 @@
(in a travel solution block). */
typedef unsigned short NbOfTravelSolutions_T;
+ /** Define a indicator of demand to class matching. */
+ typedef double MatchingIndicator_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;
@@ -105,5 +110,12 @@
/** Type of frequent flyer (P=Platinum, G=Gold, S=Silver, M=Member, N=None).*/
typedef std::string FrequentFlyer_T;
+ /** Define the Request status for booking (1-letter-code, e.g.,
+ B: booked, C: cancelled, R: Rejected). */
+ typedef std::string RequestStatus_T;
+
+ /** Define a map between a BookingID and a TravelSolutionID. */
+ typedef std::map<Identity_T, Identity_T> BookingTSIDMap_T;
+
}
#endif // __STDAIR_STDAIR_DEMAND_TYPES_HPP
Modified: trunk/stdair/stdair/stdair_inventory_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_inventory_types.hpp 2010-12-03 09:18:14 UTC (rev 377)
+++ trunk/stdair/stdair/stdair_inventory_types.hpp 2010-12-03 09:22:27 UTC (rev 378)
@@ -15,6 +15,9 @@
namespace stdair {
// //////// Type definitions /////////
+ /** 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;
@@ -122,5 +125,8 @@
/** Define the current index of a Bid-Price Vector (for a given LegCabin). */
typedef unsigned int SeatIndex_T;
+ /** Mode of inventory control. */
+ typedef std::string ControlMode_T;
+
}
#endif // __STDAIR_STDAIR_INVENTORY_TYPES_HPP
Added: trunk/stdair/stdair/stdair_maths_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_maths_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_maths_types.hpp 2010-12-03 09:22:27 UTC (rev 378)
@@ -0,0 +1,48 @@
+#ifndef __STDAIR_STDAIR_MATHS_TYPES_HPP
+#define __STDAIR_STDAIR_MATHS_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>
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** 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;
+
+ /** 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;
+
+ /** 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;
+
+ /** Probability */
+ typedef float Probability_T;
+
+}
+#endif // __STDAIR_STDAIR_MATHS_TYPES_HPP
Added: trunk/stdair/stdair/stdair_rm_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_rm_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_rm_types.hpp 2010-12-03 09:22:27 UTC (rev 378)
@@ -0,0 +1,53 @@
+#ifndef __STDAIR_STDAIR_RM_TYPES_HPP
+#define __STDAIR_STDAIR_RM_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+#include <vector>
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** 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;
+
+ /** 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;
+
+}
+#endif // __STDAIR_STDAIR_RM_TYPES_HPP
Modified: trunk/stdair/stdair/stdair_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_types.hpp 2010-12-03 09:18:14 UTC (rev 377)
+++ trunk/stdair/stdair/stdair_types.hpp 2010-12-03 09:22:27 UTC (rev 378)
@@ -4,147 +4,17 @@
// //////////////////////////////////////////////////////////////////////
// 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_basic_types.hpp>
#include <stdair/stdair_demand_types.hpp>
+#include <stdair/stdair_maths_types.hpp>
#include <stdair/stdair_fare_types.hpp>
#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_rm_types.hpp>
#include <stdair/stdair_date_time_types.hpp>
#include <stdair/stdair_service.hpp>
-namespace stdair {
-
- // //////// Type definitions /////////
- /** Define the type for network ID. */
- typedef std::string NetworkID_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 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 a map between a BookingID and a TravelSolutionID. */
- typedef std::map<Identity_T, Identity_T> BookingTSIDMap_T;
-
- /** Define a indicator of demand to class matching. */
- typedef double MatchingIndicator_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;
-
- // //////////////////////////////////////////////////////////////////////
- // 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;
-
- // //////////////////////////////////////////////////////////////////////
- /** 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_TYPES_HPP
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-12-03 09:18:21
|
Revision: 377
http://stdair.svn.sourceforge.net/stdair/?rev=377&view=rev
Author: denis_arnaud
Date: 2010-12-03 09:18:14 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[Branch 0.9.0][API] Further specified the API.
Modified Paths:
--------------
branches/stdair/0.9.0/main/stdair/sources.mk
branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp
branches/stdair/0.9.0/main/stdair/stdair_demand_types.hpp
branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp
branches/stdair/0.9.0/main/stdair/stdair_types.hpp
Added Paths:
-----------
branches/stdair/0.9.0/main/stdair/stdair_maths_types.hpp
branches/stdair/0.9.0/main/stdair/stdair_rm_types.hpp
Modified: branches/stdair/0.9.0/main/stdair/sources.mk
===================================================================
--- branches/stdair/0.9.0/main/stdair/sources.mk 2010-12-02 23:56:41 UTC (rev 376)
+++ branches/stdair/0.9.0/main/stdair/sources.mk 2010-12-03 09:18:14 UTC (rev 377)
@@ -3,8 +3,10 @@
$(top_srcdir)/stdair/stdair_log.hpp \
$(top_srcdir)/stdair/stdair_db.hpp \
$(top_srcdir)/stdair/stdair_basic_types.hpp \
+ $(top_srcdir)/stdair/stdair_maths_types.hpp \
$(top_srcdir)/stdair/stdair_date_time_types.hpp \
$(top_srcdir)/stdair/stdair_inventory_types.hpp \
+ $(top_srcdir)/stdair/stdair_rm_types.hpp \
$(top_srcdir)/stdair/stdair_demand_types.hpp \
$(top_srcdir)/stdair/stdair_fare_types.hpp \
$(top_srcdir)/stdair/stdair_types.hpp \
Modified: branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp 2010-12-02 23:56:41 UTC (rev 376)
+++ branches/stdair/0.9.0/main/stdair/stdair_basic_types.hpp 2010-12-03 09:18:14 UTC (rev 377)
@@ -66,10 +66,15 @@
/** Define the number of seats required by a demand. */
// typedef unsigned short NbOfSeats_T;
- // //////////////////////////////////////////////////////////////////////
- // Probability
- /** Probability */
- typedef float Probability_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;
+
+ /** Define the file address type (e.g. "a_directory/a_filename").
+ <br>NOTE: That type should be deprecated. */
+ typedef std::string FileAddress_T;
}
#endif // __STDAIR_STDAIR_BASIC_TYPES_HPP
Modified: branches/stdair/0.9.0/main/stdair/stdair_demand_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_demand_types.hpp 2010-12-02 23:56:41 UTC (rev 376)
+++ branches/stdair/0.9.0/main/stdair/stdair_demand_types.hpp 2010-12-03 09:18:14 UTC (rev 377)
@@ -66,6 +66,9 @@
/** Define a Willingness-To-Pay (WTP) (e.g., 1000.0 Euros). */
typedef double WTP_T;
+ /** Define the name of a WTP-component of characteristics pattern. */
+ typedef boost::tuples::tuple<double, WTP_T> CharacteristicsWTP_tuple_T;
+
/** Number of passengers (in a group) for a booking. */
typedef unsigned short PartySize_T;
@@ -85,13 +88,15 @@
(in a travel solution block). */
typedef unsigned short NbOfTravelSolutions_T;
+ /** Define a indicator of demand to class matching. */
+ typedef double MatchingIndicator_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;
@@ -105,5 +110,12 @@
/** Type of frequent flyer (P=Platinum, G=Gold, S=Silver, M=Member, N=None).*/
typedef std::string FrequentFlyer_T;
+ /** Define the Request status for booking (1-letter-code, e.g.,
+ B: booked, C: cancelled, R: Rejected). */
+ typedef std::string RequestStatus_T;
+
+ /** Define a map between a BookingID and a TravelSolutionID. */
+ typedef std::map<Identity_T, Identity_T> BookingTSIDMap_T;
+
}
#endif // __STDAIR_STDAIR_DEMAND_TYPES_HPP
Modified: branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp 2010-12-02 23:56:41 UTC (rev 376)
+++ branches/stdair/0.9.0/main/stdair/stdair_inventory_types.hpp 2010-12-03 09:18:14 UTC (rev 377)
@@ -15,6 +15,9 @@
namespace stdair {
// //////// Type definitions /////////
+ /** 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;
@@ -122,5 +125,8 @@
/** Define the current index of a Bid-Price Vector (for a given LegCabin). */
typedef unsigned int SeatIndex_T;
+ /** Mode of inventory control. */
+ typedef std::string ControlMode_T;
+
}
#endif // __STDAIR_STDAIR_INVENTORY_TYPES_HPP
Copied: branches/stdair/0.9.0/main/stdair/stdair_maths_types.hpp (from rev 376, branches/stdair/0.9.0/main/stdair/stdair_types.hpp)
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_maths_types.hpp (rev 0)
+++ branches/stdair/0.9.0/main/stdair/stdair_maths_types.hpp 2010-12-03 09:18:14 UTC (rev 377)
@@ -0,0 +1,48 @@
+#ifndef __STDAIR_STDAIR_MATHS_TYPES_HPP
+#define __STDAIR_STDAIR_MATHS_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>
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** 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;
+
+ /** 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;
+
+ /** 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;
+
+ /** Probability */
+ typedef float Probability_T;
+
+}
+#endif // __STDAIR_STDAIR_MATHS_TYPES_HPP
Copied: branches/stdair/0.9.0/main/stdair/stdair_rm_types.hpp (from rev 376, branches/stdair/0.9.0/main/stdair/stdair_types.hpp)
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_rm_types.hpp (rev 0)
+++ branches/stdair/0.9.0/main/stdair/stdair_rm_types.hpp 2010-12-03 09:18:14 UTC (rev 377)
@@ -0,0 +1,53 @@
+#ifndef __STDAIR_STDAIR_RM_TYPES_HPP
+#define __STDAIR_STDAIR_RM_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+#include <vector>
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** 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;
+
+ /** 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;
+
+}
+#endif // __STDAIR_STDAIR_RM_TYPES_HPP
Modified: branches/stdair/0.9.0/main/stdair/stdair_types.hpp
===================================================================
--- branches/stdair/0.9.0/main/stdair/stdair_types.hpp 2010-12-02 23:56:41 UTC (rev 376)
+++ branches/stdair/0.9.0/main/stdair/stdair_types.hpp 2010-12-03 09:18:14 UTC (rev 377)
@@ -4,147 +4,17 @@
// //////////////////////////////////////////////////////////////////////
// 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_basic_types.hpp>
#include <stdair/stdair_demand_types.hpp>
+#include <stdair/stdair_maths_types.hpp>
#include <stdair/stdair_fare_types.hpp>
#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_rm_types.hpp>
#include <stdair/stdair_date_time_types.hpp>
#include <stdair/stdair_service.hpp>
-namespace stdair {
-
- // //////// Type definitions /////////
- /** Define the type for network ID. */
- typedef std::string NetworkID_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 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 a map between a BookingID and a TravelSolutionID. */
- typedef std::map<Identity_T, Identity_T> BookingTSIDMap_T;
-
- /** Define a indicator of demand to class matching. */
- typedef double MatchingIndicator_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;
-
- // //////////////////////////////////////////////////////////////////////
- // 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;
-
- // //////////////////////////////////////////////////////////////////////
- /** 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_TYPES_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:56:47
|
Revision: 376
http://stdair.svn.sourceforge.net/stdair/?rev=376&view=rev
Author: denis_arnaud
Date: 2010-12-02 23:56:41 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
[Config][StdAir] The StdAir has a new API.
Modified Paths:
--------------
trunk/stdair/config/stdair.m4
Modified: trunk/stdair/config/stdair.m4
===================================================================
--- trunk/stdair/config/stdair.m4 2010-12-02 23:52:45 UTC (rev 375)
+++ trunk/stdair/config/stdair.m4 2010-12-02 23:56:41 UTC (rev 376)
@@ -40,7 +40,7 @@
AC_MSG_RESULT([ok (set to ${BOOST_DATE_TIME_LIB})])
fi
- min_stdair_version=ifelse([$1], ,0.5.0,$1)
+ min_stdair_version=ifelse([$1], ,0.9.0,$1)
AC_MSG_CHECKING(for STDAIR - version >= $min_stdair_version)
no_stdair=""
if test "${STDAIR_CONFIG}" = "no" ; then
@@ -83,7 +83,7 @@
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM([[
- #include <stdair/STDAIR_Service.hpp>
+ #include <stdair/stdair.hpp>
]],
[[int i=0;]]
)
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:52:51
|
Revision: 375
http://stdair.svn.sourceforge.net/stdair/?rev=375&view=rev
Author: denis_arnaud
Date: 2010-12-02 23:52:45 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
[Branch 0.9.0][API] Fixed a small compilation error.
Modified Paths:
--------------
branches/stdair/0.9.0/main/batches/stdair.cpp
Modified: branches/stdair/0.9.0/main/batches/stdair.cpp
===================================================================
--- branches/stdair/0.9.0/main/batches/stdair.cpp 2010-12-02 23:52:13 UTC (rev 374)
+++ branches/stdair/0.9.0/main/batches/stdair.cpp 2010-12-02 23:52:45 UTC (rev 375)
@@ -15,8 +15,8 @@
#include <boost/tokenizer.hpp>
#include <boost/lexical_cast.hpp>
// StdAir
-#include <stdair/STDAIR_Types.hpp>
-#include <stdair/STDAIR_Service.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>
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:52:19
|
Revision: 374
http://stdair.svn.sourceforge.net/stdair/?rev=374&view=rev
Author: denis_arnaud
Date: 2010-12-02 23:52:13 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
[API] Fixed a small compilation error.
Modified Paths:
--------------
trunk/stdair/batches/stdair.cpp
Modified: trunk/stdair/batches/stdair.cpp
===================================================================
--- trunk/stdair/batches/stdair.cpp 2010-12-02 23:47:42 UTC (rev 373)
+++ trunk/stdair/batches/stdair.cpp 2010-12-02 23:52:13 UTC (rev 374)
@@ -15,8 +15,8 @@
#include <boost/tokenizer.hpp>
#include <boost/lexical_cast.hpp>
// StdAir
-#include <stdair/STDAIR_Types.hpp>
-#include <stdair/STDAIR_Service.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>
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:47:48
|
Revision: 373
http://stdair.svn.sourceforge.net/stdair/?rev=373&view=rev
Author: denis_arnaud
Date: 2010-12-02 23:47:42 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
[Release] Created the main 0.9.0 release branch, from revision r371.
Added Paths:
-----------
branches/stdair/0.9.0/main/
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-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.
|
