Menu
▾
▴
avlcal-svn — Subversion activity mailing list
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(5) |
Feb
(2) |
Mar
(2) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(2) |
Oct
|
Nov
|
Dec
(1) |
|
From: <den...@us...> - 2010-12-03 20:17:10
|
Revision: 17
http://avlcal.svn.sourceforge.net/avlcal/?rev=17&view=rev
Author: denis_arnaud
Date: 2010-12-03 20:17:04 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[StdAir API] Adapted the code to the new StdAir API.
Modified Paths:
--------------
trunk/avlcal/avlcal/AVLCAL_Service.hpp
Modified: trunk/avlcal/avlcal/AVLCAL_Service.hpp
===================================================================
--- trunk/avlcal/avlcal/AVLCAL_Service.hpp 2010-09-06 20:48:00 UTC (rev 16)
+++ trunk/avlcal/avlcal/AVLCAL_Service.hpp 2010-12-03 20:17:04 UTC (rev 17)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/basic/BasLogParams.hpp>
// Avlcal
#include <avlcal/AVLCAL_Types.hpp>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-06 20:48:07
|
Revision: 16
http://avlcal.svn.sourceforge.net/avlcal/?rev=16&view=rev
Author: denis_arnaud
Date: 2010-09-06 20:48:00 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
[Build] Changed the dependency on StdAir, which is no longer an external Subversion reference.
Modified Paths:
--------------
trunk/avlcal/test/avlcal/Makefile.am
Modified: trunk/avlcal/test/avlcal/Makefile.am
===================================================================
--- trunk/avlcal/test/avlcal/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
+++ trunk/avlcal/test/avlcal/Makefile.am 2010-09-06 20:48:00 UTC (rev 16)
@@ -14,11 +14,10 @@
XFAIL_TESTS = #
AvlCalTestSuite_SOURCES = AvlCalTestSuite.hpp AvlCalTestSuite.cpp
-AvlCalTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
+AvlCalTestSuite_CXXFLAGS = $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS) \
+ $(EXTRACC_CFLAGS) $(STDAIR_CFLAGS)
AvlCalTestSuite_LDADD =
AvlCalTestSuite_LDFLAGS = \
- $(BOOST_LIBS) $(CPPUNIT_LIBS) \
- $(top_builddir)/extracppunit/libextracppunit.la \
- $(top_builddir)/stdair/core/libstdair.la \
+ $(BOOST_LIBS) $(CPPUNIT_LIBS) $(EXTRACC_LIBS) $(STDAIR_LIBS) \
$(top_builddir)/avlcal/core/libavlcal.la
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-09-06 20:18:59
|
Revision: 15
http://avlcal.svn.sourceforge.net/avlcal/?rev=15&view=rev
Author: denis_arnaud
Date: 2010-09-06 20:18:52 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
[Build] Changed the dependency on StdAir, which is no longer an external Subversion reference.
Modified Paths:
--------------
trunk/avlcal/Makefile.am
trunk/avlcal/avlcal/Makefile.am
trunk/avlcal/avlcal/basic/Makefile.am
trunk/avlcal/avlcal/basic/sources.mk
trunk/avlcal/avlcal/batches/Makefile.am
trunk/avlcal/avlcal/batches/sources.mk
trunk/avlcal/avlcal/bom/Makefile.am
trunk/avlcal/avlcal/bom/sources.mk
trunk/avlcal/avlcal/command/Makefile.am
trunk/avlcal/avlcal/command/sources.mk
trunk/avlcal/avlcal/config/Makefile.am
trunk/avlcal/avlcal/core/Makefile.am
trunk/avlcal/avlcal/core/sources.mk
trunk/avlcal/avlcal/factory/Makefile.am
trunk/avlcal/avlcal/factory/sources.mk
trunk/avlcal/avlcal/service/Makefile.am
trunk/avlcal/avlcal/service/sources.mk
trunk/avlcal/configure.ac
trunk/avlcal/test/Makefile.am
Property Changed:
----------------
trunk/avlcal/
trunk/avlcal/test/
Property changes on: trunk/avlcal
___________________________________________________________________
Modified: svn:externals
- config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/stdair
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit
+ config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
test/samples https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/test/samples
Modified: trunk/avlcal/Makefile.am
===================================================================
--- trunk/avlcal/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -21,10 +21,16 @@
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
config-h.in sic/stamp-h.in autogen.sh bootstrap
-EXTRA_DIST = @PACKAGE@.spec @PACKAGE@.m4 @PACKAGE@.pc Makefile.common
+# Note 1: the RPM specification file (@PACKAGE@.spec) must not be distributed
+# with the rest of the source code. The tar-ball will be used by the packaging
+# process, from an external RPM specification file: duplicating it in the
+# tar-ball may only confuse things.
+# Note 2: Both @PACKAGE@.m4 and @PACKAGE@.pc must not be distributed, as they
+# will be generated by the configure script.
+EXTRA_DIST =
# Build in these directories:
-SUBDIRS = stdair @PACKAGE@ extracppunit $(TEST_DIR)
+SUBDIRS = avlcal $(TEST_DIR)
# Configuration helpers
Modified: trunk/avlcal/avlcal/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -12,6 +12,6 @@
# Header files
-nobase_pkginclude_HEADERS = $(service_h_sources)
+nobase_pkginclude_HEADERS = $(avlcal_service_h_sources)
#nobase_nodist_pkginclude_HEADERS = $(top_builddir)/@PACKAGE@/config.h
Modified: trunk/avlcal/avlcal/basic/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/basic/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/basic/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,11 +1,15 @@
-## basic sub-directory
+## avlcal/basic sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbas.la
+#
+noinst_LTLIBRARIES = libavlcalbas.la
-libbas_la_SOURCES= $(bas_h_sources) $(bas_cc_sources)
-libbas_la_CXXFLAGS =
+libavlcalbas_la_SOURCES = $(avlcal_bas_h_sources) $(avlcal_bas_cc_sources)
+libavlcalbas_la_CXXFLAGS = $(STDAIR_CFLAGS)
+libavlcalbas_la_LDFLAGS =
+#
#pkgincludedir = $(includedir)/@PACKAGE@/basic
-#pkginclude_HEADERS = $(bas_h_sources)
+#pkginclude_HEADERS = $(avlcal_bas_h_sources)
+
Modified: trunk/avlcal/avlcal/basic/sources.mk
===================================================================
--- trunk/avlcal/avlcal/basic/sources.mk 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/basic/sources.mk 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,3 +1,6 @@
-bas_h_sources = $(top_srcdir)/avlcal/basic/BasConst_General.hpp \
- $(top_srcdir)/avlcal/basic/BasConst_AVLCAL_Service.hpp
-bas_cc_sources = $(top_srcdir)/avlcal/basic/BasConst.cpp
+avlcal_bas_h_sources = \
+ $(top_srcdir)/avlcal/basic/BasConst_General.hpp \
+ $(top_srcdir)/avlcal/basic/BasConst_AVLCAL_Service.hpp
+avlcal_bas_cc_sources = \
+ $(top_srcdir)/avlcal/basic/BasConst.cpp
+
Modified: trunk/avlcal/avlcal/batches/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/batches/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/batches/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,4 +1,4 @@
-# batches
+# avlcal/batches
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -9,7 +9,8 @@
# Binaries (batches)
bin_PROGRAMS =
-#avlcal_SOURCES = $(batches_h_sources) $(batches_cc_sources)
+#avlcal_SOURCES = $(avlcal_batches_h_sources) $(avlcal_batches_cc_sources)
#avlcal_CXXFLAGS = $(BOOST_CFLAGS)
#avlcal_LDADD =
#avlcal_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(top_builddir)/avlcal/core/libavlcal.la
+
Modified: trunk/avlcal/avlcal/batches/sources.mk
===================================================================
--- trunk/avlcal/avlcal/batches/sources.mk 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/batches/sources.mk 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,2 +1,3 @@
-batches_h_sources =
-batches_cc_sources =
+avlcal_batches_h_sources =
+avlcal_batches_cc_sources =
+
Modified: trunk/avlcal/avlcal/bom/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/bom/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/bom/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,12 +1,15 @@
-## bom sub-directory
+## avlcal/bom sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbom.la
+#
+noinst_LTLIBRARIES = libavlcalbom.la
-libbom_la_SOURCES= $(bom_h_sources) $(bom_cc_sources)
-libbom_la_CXXFLAGS =
-libbom_la_LDFLAGS =
+libavlcalbom_la_SOURCES = $(avlcal_bom_h_sources) $(avlcal_bom_cc_sources)
+libavlcalbom_la_CXXFLAGS = $(STDAIR_CFLAGS)
+libavlcalbom_la_LDFLAGS =
+#
#pkgincludedir = $(includedir)/@PACKAGE@/bom
-#pkginclude_HEADERS = $(bom_h_sources)
+#pkginclude_HEADERS = $(avlcal_bom_h_sources)
+
Modified: trunk/avlcal/avlcal/bom/sources.mk
===================================================================
--- trunk/avlcal/avlcal/bom/sources.mk 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/bom/sources.mk 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,2 +1,5 @@
-bom_h_sources = $(top_srcdir)/avlcal/bom/BomAbstract.hpp
-bom_cc_sources = $(top_srcdir)/avlcal/bom/BomAbstract.cpp
+avlcal_bom_h_sources = \
+ $(top_srcdir)/avlcal/bom/BomAbstract.hpp
+avlcal_bom_cc_sources = \
+ $(top_srcdir)/avlcal/bom/BomAbstract.cpp
+
Modified: trunk/avlcal/avlcal/command/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/command/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/command/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,13 +1,16 @@
-## command sub-directory
+## avlcal/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libcmd.la
+#
+noinst_LTLIBRARIES = libavlcalcmd.la
-libcmd_la_SOURCES= $(cmd_h_sources) $(cmd_cc_sources)
-libcmd_la_CXXFLAGS = $(BOOST_CFLAGS)
-libcmd_la_LIBADD =
-libcmd_la_LDFLAGS = $(BOOST_LIBS)
+libavlcalcmd_la_SOURCES = $(avlcal_cmd_h_sources) $(avlcal_cmd_cc_sources)
+libavlcalcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
+libavlcalcmd_la_LIBADD =
+libavlcalcmd_la_LDFLAGS =
+#
#pkgincludedir = $(includedir)/@PACKAGE@/command
-#pkginclude_HEADERS = $(cmd_h_sources)
+#pkginclude_HEADERS = $(avlcal_cmd_h_sources)
+
Modified: trunk/avlcal/avlcal/command/sources.mk
===================================================================
--- trunk/avlcal/avlcal/command/sources.mk 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/command/sources.mk 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,4 +1,5 @@
-cmd_h_sources = \
- $(top_srcdir)/avlcal/command/AvailabilityCalculator.hpp
-cmd_cc_sources = \
- $(top_srcdir)/avlcal/command/AvailabilityCalculator.cpp
+avlcal_cmd_h_sources = \
+ $(top_srcdir)/avlcal/command/AvailabilityCalculator.hpp
+avlcal_cmd_cc_sources = \
+ $(top_srcdir)/avlcal/command/AvailabilityCalculator.cpp
+
Modified: trunk/avlcal/avlcal/config/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/config/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/config/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -24,3 +24,4 @@
@echo '#define DATADIR "$(datadir)"' >> $@
@echo '#define DOCDIR "$(docdir)"' >> $@
@echo '#endif // __AVLCAL_PATHS_HPP' >> $@
+
Modified: trunk/avlcal/avlcal/core/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/core/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/core/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -12,14 +12,14 @@
# Library
lib_LTLIBRARIES = libavlcal.la
-libavlcal_la_SOURCES = $(service_h_sources) $(service_cc_sources)
+libavlcal_la_SOURCES = $(avlcal_service_h_sources) $(avlcal_service_cc_sources)
libavlcal_la_LIBADD = \
- $(top_builddir)/avlcal/basic/libbas.la \
- $(top_builddir)/avlcal/bom/libbom.la \
- $(top_builddir)/avlcal/factory/libfac.la \
- $(top_builddir)/avlcal/command/libcmd.la \
- $(top_builddir)/avlcal/service/libsvc.la
+ $(top_builddir)/avlcal/basic/libavlcalbas.la \
+ $(top_builddir)/avlcal/bom/libavlcalbom.la \
+ $(top_builddir)/avlcal/factory/libavlcalfac.la \
+ $(top_builddir)/avlcal/command/libavlcalcmd.la \
+ $(top_builddir)/avlcal/service/libavlcalsvc.la
libavlcal_la_LDFLAGS = \
- $(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(top_builddir)/stdair/core/libstdair.la \
+ $(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(STDAIR_LIBS) \
-version-info $(GENERIC_LIBRARY_VERSION)
+
Modified: trunk/avlcal/avlcal/core/sources.mk
===================================================================
--- trunk/avlcal/avlcal/core/sources.mk 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/core/sources.mk 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,4 +1,5 @@
-service_h_sources = \
- $(top_srcdir)/avlcal/AVLCAL_Types.hpp \
- $(top_srcdir)/avlcal/AVLCAL_Service.hpp
-service_cc_sources =
+avlcal_service_h_sources = \
+ $(top_srcdir)/avlcal/AVLCAL_Types.hpp \
+ $(top_srcdir)/avlcal/AVLCAL_Service.hpp
+avlcal_service_cc_sources =
+
Modified: trunk/avlcal/avlcal/factory/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/factory/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/factory/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,11 +1,15 @@
-## factory sub-directory
+## avlcal/factory sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libfac.la
+#
+noinst_LTLIBRARIES = libavlcalfac.la
-libfac_la_SOURCES= $(fac_h_sources) $(fac_cc_sources)
-libfac_la_CXXFLAGS =
+libavlcalfac_la_SOURCES = $(avlcal_fac_h_sources) $(avlcal_fac_cc_sources)
+libavlcalfac_la_CXXFLAGS = $(STDAIR_CFLAGS)
+libavlcalfac_la_LDFLAGS =
+#
#pkgincludedir = $(includedir)/@PACKAGE@/factory
-#pkginclude_HEADERS = $(fac_h_sources)
+#pkginclude_HEADERS = $(avlcal_fac_h_sources)
+
Modified: trunk/avlcal/avlcal/factory/sources.mk
===================================================================
--- trunk/avlcal/avlcal/factory/sources.mk 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/factory/sources.mk 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,10 +1,11 @@
-fac_h_sources = \
- $(top_srcdir)/avlcal/factory/FacBomAbstract.hpp \
- $(top_srcdir)/avlcal/factory/FacServiceAbstract.hpp \
- $(top_srcdir)/avlcal/factory/FacSupervisor.hpp \
- $(top_srcdir)/avlcal/factory/FacAvlcalServiceContext.hpp
-fac_cc_sources = \
- $(top_srcdir)/avlcal/factory/FacBomAbstract.cpp \
- $(top_srcdir)/avlcal/factory/FacServiceAbstract.cpp \
- $(top_srcdir)/avlcal/factory/FacSupervisor.cpp \
- $(top_srcdir)/avlcal/factory/FacAvlcalServiceContext.cpp
+avlcal_fac_h_sources = \
+ $(top_srcdir)/avlcal/factory/FacBomAbstract.hpp \
+ $(top_srcdir)/avlcal/factory/FacServiceAbstract.hpp \
+ $(top_srcdir)/avlcal/factory/FacSupervisor.hpp \
+ $(top_srcdir)/avlcal/factory/FacAvlcalServiceContext.hpp
+avlcal_fac_cc_sources = \
+ $(top_srcdir)/avlcal/factory/FacBomAbstract.cpp \
+ $(top_srcdir)/avlcal/factory/FacServiceAbstract.cpp \
+ $(top_srcdir)/avlcal/factory/FacSupervisor.cpp \
+ $(top_srcdir)/avlcal/factory/FacAvlcalServiceContext.cpp
+
Modified: trunk/avlcal/avlcal/service/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/service/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/service/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,11 +1,15 @@
-## command sub-directory
+## avlcal/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libsvc.la
+#
+noinst_LTLIBRARIES = libavlcalsvc.la
-libsvc_la_SOURCES= $(svc_h_sources) $(svc_cc_sources)
-libsvc_la_CXXFLAGS = $(BOOST_CFLAGS)
+libavlcalsvc_la_SOURCES = $(avlcal_svc_h_sources) $(avlcal_svc_cc_sources)
+libavlcalsvc_la_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
+libavlcalsvc_la_LDFLAGS =
+#
#pkgincludedir = $(includedir)/@PACKAGE@/service
-#pkginclude_HEADERS = $(svc_h_sources)
+#pkginclude_HEADERS = $(avlcal_svc_h_sources)
+
Modified: trunk/avlcal/avlcal/service/sources.mk
===================================================================
--- trunk/avlcal/avlcal/service/sources.mk 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/avlcal/service/sources.mk 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,5 +1,8 @@
-svc_h_sources = $(top_srcdir)/avlcal/service/ServiceAbstract.hpp \
- $(top_srcdir)/avlcal/service/AVLCAL_ServiceContext.hpp
-svc_cc_sources = $(top_srcdir)/avlcal/service/ServiceAbstract.cpp \
- $(top_srcdir)/avlcal/service/AVLCAL_ServiceContext.cpp \
- $(top_srcdir)/avlcal/service/AVLCAL_Service.cpp
+avlcal_svc_h_sources = \
+ $(top_srcdir)/avlcal/service/ServiceAbstract.hpp \
+ $(top_srcdir)/avlcal/service/AVLCAL_ServiceContext.hpp
+avlcal_svc_cc_sources = \
+ $(top_srcdir)/avlcal/service/ServiceAbstract.cpp \
+ $(top_srcdir)/avlcal/service/AVLCAL_ServiceContext.cpp \
+ $(top_srcdir)/avlcal/service/AVLCAL_Service.cpp
+
Modified: trunk/avlcal/configure.ac
===================================================================
--- trunk/avlcal/configure.ac 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/configure.ac 2010-09-06 20:18:52 UTC (rev 15)
@@ -10,10 +10,6 @@
AM_PATH_CPPUNIT(1.10)
AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$CPPUNIT_LIBS" != x])
-# RPM release number
-RPM_RELEASE="1"
-AC_SUBST(RPM_RELEASE)
-
# Shared library versioning
GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
@@ -110,10 +106,10 @@
# thus directly accessible within the extracppunit directory.
# When that library will be widely avaible on Linux distributions,
# the external reference can be removed and the following line uncommented.
-#AM_PATH_EXTRACC
-#AC_SUBST(EXTRACC_VERSION)
-#AC_SUBST(EXTRACC_CFLAGS)
-#AC_SUBST(EXTRACC_LIBS)
+AM_PATH_EXTRACC
+AC_SUBST(EXTRACC_VERSION)
+AC_SUBST(EXTRACC_CFLAGS)
+AC_SUBST(EXTRACC_LIBS)
# -----------------------------------------------------------
# Python: http://www.python.org
@@ -173,6 +169,17 @@
AC_SUBST(SOCI_CFLAGS)
AC_SUBST(SOCI_LIBS)
+# -----------------------------------------------------------------------------
+# Support for StdAir (): http://sf.net/projects/stdair
+# -----------------------------------------------------------------------------
+# Note: the StdAir is now imported as a Subversion external reference,
+# thus directly accessible within the extracppunit directory.
+# When that library will be widely avaible on Linux distributions,
+# the external reference can be removed and the following line uncommented.
+AM_PATH_STDAIR
+AC_SUBST(STDAIR_VERSION)
+AC_SUBST(STDAIR_CFLAGS)
+AC_SUBST(STDAIR_LIBS)
# -------------------------------------------------------------------
# Support for documentation
@@ -245,18 +252,7 @@
Makefile
avlcal-config
avlcal.pc
- avlcal.spec
avlcal.m4
- stdair/Makefile
- stdair/basic/Makefile
- stdair/bom/Makefile
- stdair/dbadaptor/Makefile
- stdair/factory/Makefile
- stdair/command/Makefile
- stdair/config/Makefile
- stdair/service/Makefile
- stdair/core/Makefile
- stdair/batches/Makefile
avlcal/Makefile
avlcal/basic/Makefile
avlcal/bom/Makefile
@@ -266,10 +262,8 @@
avlcal/config/Makefile
avlcal/core/Makefile
avlcal/batches/Makefile
- extracppunit/Makefile
test/Makefile
test/samples/Makefile
- test/stdair/Makefile
test/avlcal/Makefile
)
AC_OUTPUT
@@ -344,6 +338,11 @@
o SOCI_CFLAGS ..... : ${SOCI_CFLAGS}
o SOCI_LIBS ....... : ${SOCI_LIBS}
+ - StdAir ............ :
+ o STDAIR_VERSION .. : ${STDAIR_VERSION}
+ o STDAIR_CFLAGS ... : ${STDAIR_CFLAGS}
+ o STDAIR_LIBS ..... : ${STDAIR_LIBS}
+
- ExtraCC ........... :
o EXTRACC_VERSION . : ${EXTRACC_VERSION}
o EXTRACC_CFLAGS .. : ${EXTRACC_CFLAGS}
@@ -358,3 +357,4 @@
Now type 'make && make install' to build and install $PACKAGE-$VERSION library
------------------------------------------------------------------------------
"
+
Property changes on: trunk/avlcal/test
___________________________________________________________________
Modified: svn:externals
- samples https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/test/samples
stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/test/stdair
+
Modified: trunk/avlcal/test/Makefile.am
===================================================================
--- trunk/avlcal/test/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
+++ trunk/avlcal/test/Makefile.am 2010-09-06 20:18:52 UTC (rev 15)
@@ -1,10 +1,10 @@
-## test sub-directory
+## test sub-directory of the AvlCal project
include $(top_srcdir)/Makefile.common
MAINTAINERCLEANFILES = Makefile.in
##
-SUBDIRS = samples stdair avlcal
+SUBDIRS = samples avlcal
EXTRA_DIST =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-08-20 10:49:00
|
Revision: 14
http://avlcal.svn.sourceforge.net/avlcal/?rev=14&view=rev
Author: denis_arnaud
Date: 2010-08-20 10:48:54 +0000 (Fri, 20 Aug 2010)
Log Message:
-----------
[Build] Added a missing tab in the Makefile.
Modified Paths:
--------------
trunk/avlcal/Makefile.am
Modified: trunk/avlcal/Makefile.am
===================================================================
--- trunk/avlcal/Makefile.am 2010-06-13 14:33:57 UTC (rev 13)
+++ trunk/avlcal/Makefile.am 2010-08-20 10:48:54 UTC (rev 14)
@@ -50,7 +50,7 @@
snapshot-src:
- $(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
+ $(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
snapshot-html:
$(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-html-doc-`date +"%Y%m%d"`
@@ -71,3 +71,4 @@
upload-gui: dist-gui
@UPLOAD_COMMAND@ @PACKAGE_TARNAME@-gui-@VERSION@.tar.gz \
@PACKAGE_TARNAME@-gui-@VERSION@.tar.bz2
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-06-13 14:34:04
|
Revision: 13
http://avlcal.svn.sourceforge.net/avlcal/?rev=13&view=rev
Author: denis_arnaud
Date: 2010-06-13 14:33:57 +0000 (Sun, 13 Jun 2010)
Log Message:
-----------
[Test] Updated the dependency for the new ExtraCPPUnit library name.
Modified Paths:
--------------
trunk/avlcal/configure.ac
trunk/avlcal/test/avlcal/Makefile.am
Modified: trunk/avlcal/configure.ac
===================================================================
--- trunk/avlcal/configure.ac 2010-04-06 16:39:45 UTC (rev 12)
+++ trunk/avlcal/configure.ac 2010-06-13 14:33:57 UTC (rev 13)
@@ -103,6 +103,18 @@
fi
+# -----------------------------------------------------------------------------
+# Support for ExtraCC (Extra-CruiseControl): http://sf.net/projects/extracc
+# -----------------------------------------------------------------------------
+# Note: the ExtraCC is now imported as a Subversion external reference,
+# thus directly accessible within the extracppunit directory.
+# When that library will be widely avaible on Linux distributions,
+# the external reference can be removed and the following line uncommented.
+#AM_PATH_EXTRACC
+#AC_SUBST(EXTRACC_VERSION)
+#AC_SUBST(EXTRACC_CFLAGS)
+#AC_SUBST(EXTRACC_LIBS)
+
# -----------------------------------------------------------
# Python: http://www.python.org
# -----------------------------------------------------------
@@ -332,6 +344,11 @@
o SOCI_CFLAGS ..... : ${SOCI_CFLAGS}
o SOCI_LIBS ....... : ${SOCI_LIBS}
+ - ExtraCC ........... :
+ o EXTRACC_VERSION . : ${EXTRACC_VERSION}
+ o EXTRACC_CFLAGS .. : ${EXTRACC_CFLAGS}
+ o EXTRACC_LIBS .... : ${EXTRACC_LIBS}
+
- CPPUNIT ........... :
o CPPUNIT_VERSION . : ${CPPUNIT_VERSION}
o CPPUNIT_CFLAGS .. : ${CPPUNIT_CFLAGS}
Modified: trunk/avlcal/test/avlcal/Makefile.am
===================================================================
--- trunk/avlcal/test/avlcal/Makefile.am 2010-04-06 16:39:45 UTC (rev 12)
+++ trunk/avlcal/test/avlcal/Makefile.am 2010-06-13 14:33:57 UTC (rev 13)
@@ -18,6 +18,7 @@
AvlCalTestSuite_LDADD =
AvlCalTestSuite_LDFLAGS = \
$(BOOST_LIBS) $(CPPUNIT_LIBS) \
- $(top_builddir)/extracppunit/libextracc-extracppunit.la \
+ $(top_builddir)/extracppunit/libextracppunit.la \
$(top_builddir)/stdair/core/libstdair.la \
$(top_builddir)/avlcal/core/libavlcal.la
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-04-06 16:39:51
|
Revision: 12
http://avlcal.svn.sourceforge.net/avlcal/?rev=12&view=rev
Author: denis_arnaud
Date: 2010-04-06 16:39:45 +0000 (Tue, 06 Apr 2010)
Log Message:
-----------
[Conf] Added the StdAir batch layer.
Modified Paths:
--------------
trunk/avlcal/configure.ac
Modified: trunk/avlcal/configure.ac
===================================================================
--- trunk/avlcal/configure.ac 2010-03-24 13:04:00 UTC (rev 11)
+++ trunk/avlcal/configure.ac 2010-04-06 16:39:45 UTC (rev 12)
@@ -244,6 +244,7 @@
stdair/config/Makefile
stdair/service/Makefile
stdair/core/Makefile
+ stdair/batches/Makefile
avlcal/Makefile
avlcal/basic/Makefile
avlcal/bom/Makefile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-03-24 13:04:13
|
Revision: 11
http://avlcal.svn.sourceforge.net/avlcal/?rev=11&view=rev
Author: denis_arnaud
Date: 2010-03-24 13:04:00 +0000 (Wed, 24 Mar 2010)
Log Message:
-----------
[Test] Migrated the test to CPPUnit framework.
Modified Paths:
--------------
trunk/avlcal/test/avlcal/Makefile.am
Added Paths:
-----------
trunk/avlcal/test/avlcal/AvlCalTestSuite.cpp
trunk/avlcal/test/avlcal/AvlCalTestSuite.hpp
Removed Paths:
-------------
trunk/avlcal/test/avlcal/avlCalc.cpp
Property Changed:
----------------
trunk/avlcal/test/avlcal/
Property changes on: trunk/avlcal/test/avlcal
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile.in
Makefile
avlCalc
avlCalc.log
+ .deps
.libs
Makefile.in
Makefile
AvlCalTestSuite
AvlCalTestSuite.log
AvlCalTestSuite_results.xml
Added: trunk/avlcal/test/avlcal/AvlCalTestSuite.cpp
===================================================================
--- trunk/avlcal/test/avlcal/AvlCalTestSuite.cpp (rev 0)
+++ trunk/avlcal/test/avlcal/AvlCalTestSuite.cpp 2010-03-24 13:04:00 UTC (rev 11)
@@ -0,0 +1,80 @@
+// STL
+#include <sstream>
+#include <fstream>
+#include <string>
+// CPPUNIT
+#include <extracppunit/CppUnitCore.hpp>
+// StdAir
+#include <stdair/basic/BasLogParams.hpp>
+#include <stdair/basic/BasDBParams.hpp>
+#include <stdair/bom/TravelSolutionStruct.hpp>
+// Avlcal
+#include <avlcal/AVLCAL_Types.hpp>
+#include <avlcal/AVLCAL_Service.hpp>
+// Avlcal Test Suite
+#include <test/avlcal/AvlCalTestSuite.hpp>
+
+// //////////////////////////////////////////////////////////////////////
+// Test is based on ...
+// //////////////////////////////////////////////////////////////////////
+
+// //////////////////////////////////////////////////////////////////////
+void AvlCalTestSuite::simpleAvlCalHelper() {
+
+ try {
+
+ // Airline code
+ std::string lAirlineCode ("SV");
+
+ // Number of passengers in the travelling group
+ AVLCAL::PartySize_T lPartySize = 5;
+
+ // Output log File
+ std::string lLogFilename ("AvlCalTestSuite.log");
+
+ // Set the log parameters
+ std::ofstream logOutputFile;
+ // Open and clean the log outputfile
+ logOutputFile.open (lLogFilename.c_str());
+ logOutputFile.clear();
+
+ // Initialise the list of classes/buckets
+ const stdair::BasLogParams lLogParams (stdair::LOG::DEBUG, logOutputFile);
+ AVLCAL::AVLCAL_Service avlcalService (lLogParams, lAirlineCode);
+
+ // Perform an availability calculation
+ avlcalService.avlCalculate (lPartySize);
+
+ } catch (const AVLCAL::RootException& otexp) {
+ std::cerr << "Standard exception: " << otexp.what() << std::endl;
+ return;
+
+ } catch (const std::exception& stde) {
+ std::cerr << "Standard exception: " << stde.what() << std::endl;
+ return;
+
+ } catch (...) {
+ return;
+ }
+
+}
+
+// //////////////////////////////////////////////////////////////////////
+void AvlCalTestSuite::simpleAvlCal () {
+ // TODO: Check that the availability calculation goes as expected
+ CPPUNIT_ASSERT_NO_THROW ( simpleAvlCalHelper(););
+}
+
+// //////////////////////////////////////////////////////////////////////
+// void AvlCalTestSuite::errorCase () {
+// CPPUNIT_ASSERT (false);
+// }
+
+// //////////////////////////////////////////////////////////////////////
+AvlCalTestSuite::AvlCalTestSuite () {
+ _describeKey << "Running test on availability calculation";
+}
+
+// /////////////// M A I N /////////////////
+CPPUNIT_MAIN()
+
Added: trunk/avlcal/test/avlcal/AvlCalTestSuite.hpp
===================================================================
--- trunk/avlcal/test/avlcal/AvlCalTestSuite.hpp (rev 0)
+++ trunk/avlcal/test/avlcal/AvlCalTestSuite.hpp 2010-03-24 13:04:00 UTC (rev 11)
@@ -0,0 +1,31 @@
+// STL
+#include <iosfwd>
+// CPPUNIT
+#include <cppunit/extensions/HelperMacros.h>
+
+/** Utility class for CPPUnit-based testing. */
+class AvlCalTestSuite : public CppUnit::TestFixture {
+ CPPUNIT_TEST_SUITE (AvlCalTestSuite);
+ CPPUNIT_TEST (simpleAvlCal);
+ // CPPUNIT_TEST (errorCase);
+ CPPUNIT_TEST_SUITE_END ();
+public:
+
+ /** Test a simple availability calculation functionality. */
+ void simpleAvlCal();
+
+ /** Test some error detection functionalities. */
+ // void errorCase ();
+
+ /** Constructor. */
+ AvlCalTestSuite ();
+
+private:
+ /** Test a simple availability calculation functionality. */
+ void simpleAvlCalHelper();
+
+protected:
+ std::stringstream _describeKey;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION (AvlCalTestSuite);
Modified: trunk/avlcal/test/avlcal/Makefile.am
===================================================================
--- trunk/avlcal/test/avlcal/Makefile.am 2010-03-15 10:26:23 UTC (rev 10)
+++ trunk/avlcal/test/avlcal/Makefile.am 2010-03-24 13:04:00 UTC (rev 11)
@@ -9,22 +9,15 @@
EXTRA_DIST =
##
-check_PROGRAMS = avlCalc
+check_PROGRAMS = AvlCalTestSuite
TESTS = $(check_PROGRAMS)
XFAIL_TESTS = #
-#InventoryTestSuite_SOURCES = InventoryTestSuite.hpp \
- InventoryTestSuite.cpp
-#InventoryTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
-#InventoryTestSuite_LDADD = $(top_builddir)/test/com/libcppunitcore.la
-#InventoryTestSuite_LDFLAGS = \
-# $(BOOST_LIBS) $(CPPUNIT_LIBS) \
-# $(top_builddir)/stdair/core/libstdair.la \
-# $(top_builddir)/avlcal/libavlcal.la
-
-avlCalc_SOURCES = avlCalc.cpp
-avlCalc_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
-avlCalc_LDADD =
-avlCalc_LDFLAGS = $(BOOST_LIBS) \
+AvlCalTestSuite_SOURCES = AvlCalTestSuite.hpp AvlCalTestSuite.cpp
+AvlCalTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
+AvlCalTestSuite_LDADD =
+AvlCalTestSuite_LDFLAGS = \
+ $(BOOST_LIBS) $(CPPUNIT_LIBS) \
+ $(top_builddir)/extracppunit/libextracc-extracppunit.la \
$(top_builddir)/stdair/core/libstdair.la \
$(top_builddir)/avlcal/core/libavlcal.la
Deleted: trunk/avlcal/test/avlcal/avlCalc.cpp
===================================================================
--- trunk/avlcal/test/avlcal/avlCalc.cpp 2010-03-15 10:26:23 UTC (rev 10)
+++ trunk/avlcal/test/avlcal/avlCalc.cpp 2010-03-24 13:04:00 UTC (rev 11)
@@ -1,47 +0,0 @@
-// STL
-#include <cassert>
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <string>
-// AVLCAL
-#include <avlcal/AVLCAL_Service.hpp>
-#include <avlcal/config/avlcal-paths.hpp>
-
-// ///////// M A I N ////////////
-int main (int argc, char* argv[]) {
-
- try {
-
- // Airline code
- std::string lAirlineCode ("LH");
-
- // Number of passengers in the travelling group
- AVLCAL::PartySize_T lPartySize = 5;
-
- // Output log File
- std::string lLogFilename ("avlCalc.log");
-
- // Set the log parameters
- std::ofstream logOutputFile;
- // Open and clean the log outputfile
- logOutputFile.open (lLogFilename.c_str());
- logOutputFile.clear();
-
- // Initialise the list of classes/buckets
- const stdair::BasLogParams lLogParams (stdair::LOG::DEBUG, logOutputFile);
- AVLCAL::AVLCAL_Service avlcalService (lLogParams, lAirlineCode);
-
- // Perform an availability calculation
- avlcalService.avlCalculate (lPartySize);
-
- } catch (const std::exception& stde) {
- std::cerr << "Standard exception: " << stde.what() << std::endl;
- return -1;
-
- } catch (...) {
- return -1;
- }
-
- return 0;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-03-15 10:26:30
|
Revision: 10
http://avlcal.svn.sourceforge.net/avlcal/?rev=10&view=rev
Author: denis_arnaud
Date: 2010-03-15 10:26:23 +0000 (Mon, 15 Mar 2010)
Log Message:
-----------
[Test] Added the dependency on the StdAir library.
Modified Paths:
--------------
trunk/avlcal/test/avlcal/Makefile.am
Modified: trunk/avlcal/test/avlcal/Makefile.am
===================================================================
--- trunk/avlcal/test/avlcal/Makefile.am 2010-02-07 19:58:00 UTC (rev 9)
+++ trunk/avlcal/test/avlcal/Makefile.am 2010-03-15 10:26:23 UTC (rev 10)
@@ -19,10 +19,12 @@
#InventoryTestSuite_LDADD = $(top_builddir)/test/com/libcppunitcore.la
#InventoryTestSuite_LDFLAGS = \
# $(BOOST_LIBS) $(CPPUNIT_LIBS) \
+# $(top_builddir)/stdair/core/libstdair.la \
# $(top_builddir)/avlcal/libavlcal.la
avlCalc_SOURCES = avlCalc.cpp
avlCalc_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
avlCalc_LDADD =
avlCalc_LDFLAGS = $(BOOST_LIBS) \
+ $(top_builddir)/stdair/core/libstdair.la \
$(top_builddir)/avlcal/core/libavlcal.la
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-02-07 19:58:08
|
Revision: 9
http://avlcal.svn.sourceforge.net/avlcal/?rev=9&view=rev
Author: denis_arnaud
Date: 2010-02-07 19:58:00 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
[StdAir] Added the command layer for StdAir.
Modified Paths:
--------------
trunk/avlcal/configure.ac
Modified: trunk/avlcal/configure.ac
===================================================================
--- trunk/avlcal/configure.ac 2010-02-07 02:58:22 UTC (rev 8)
+++ trunk/avlcal/configure.ac 2010-02-07 19:58:00 UTC (rev 9)
@@ -240,6 +240,7 @@
stdair/bom/Makefile
stdair/dbadaptor/Makefile
stdair/factory/Makefile
+ stdair/command/Makefile
stdair/config/Makefile
stdair/service/Makefile
stdair/core/Makefile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-02-07 02:58:29
|
Revision: 8
http://avlcal.svn.sourceforge.net/avlcal/?rev=8&view=rev
Author: denis_arnaud
Date: 2010-02-07 02:58:22 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
[DB] Added support for database administration, as well as a sample table (for airline description).
Modified Paths:
--------------
trunk/avlcal/configure.ac
Modified: trunk/avlcal/configure.ac
===================================================================
--- trunk/avlcal/configure.ac 2010-01-21 23:32:29 UTC (rev 7)
+++ trunk/avlcal/configure.ac 2010-02-07 02:58:22 UTC (rev 8)
@@ -104,15 +104,6 @@
# -----------------------------------------------------------
-# Python
-# -----------------------------------------------------------
-PGAC_CHECK_PYTHON_EMBED_SETUP
-AC_SUBST(PYTHON_VERSION)
-AC_SUBST(PYTHON_LIBS)
-AC_SUBST(PYTHON_CFLAGS)
-AC_SUBST(PYTHON_ADD_LIBS)
-
-# -----------------------------------------------------------
# Python: http://www.python.org
# -----------------------------------------------------------
PGAC_CHECK_PYTHON_EMBED_SETUP
@@ -125,18 +116,18 @@
# MPICH2: http://www.mcs.anl.gov/research/projects/mpich2
# Note: Boost.MPI depends on MPICH2, rather than on OpenMPI
# -----------------------------------------------------------
-AX_MPICH2
-AC_SUBST(MPICH2_VERSION)
-AC_SUBST(MPICH2_CFLAGS)
-AC_SUBST(MPICH2_LIBS)
+#AX_MPICH2
+#AC_SUBST(MPICH2_VERSION)
+#AC_SUBST(MPICH2_CFLAGS)
+#AC_SUBST(MPICH2_LIBS)
# -----------------------------------------------------------
# OpenMPI: http://www.open-mpi.org
# -----------------------------------------------------------
-#AX_OPENMPI
-#AC_SUBST(OPENMPI_VERSION)
-#AC_SUBST(OPENMPI_CFLAGS)
-#AC_SUBST(OPENMPI_LIBS)
+AX_OPENMPI
+AC_SUBST(OPENMPI_VERSION)
+AC_SUBST(OPENMPI_CFLAGS)
+AC_SUBST(OPENMPI_LIBS)
# ---------------------------------------------------------------
# Boost (STL Extensions): http://www.boost.org
@@ -247,6 +238,7 @@
stdair/Makefile
stdair/basic/Makefile
stdair/bom/Makefile
+ stdair/dbadaptor/Makefile
stdair/factory/Makefile
stdair/config/Makefile
stdair/service/Makefile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-01-21 23:32:35
|
Revision: 7
http://avlcal.svn.sourceforge.net/avlcal/?rev=7&view=rev
Author: denis_arnaud
Date: 2010-01-21 23:32:29 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
[Dev] The log service now needs a log level at the initialisation stage.
Modified Paths:
--------------
trunk/avlcal/test/avlcal/avlCalc.cpp
Modified: trunk/avlcal/test/avlcal/avlCalc.cpp
===================================================================
--- trunk/avlcal/test/avlcal/avlCalc.cpp 2010-01-21 19:34:37 UTC (rev 6)
+++ trunk/avlcal/test/avlcal/avlCalc.cpp 2010-01-21 23:32:29 UTC (rev 7)
@@ -29,7 +29,8 @@
logOutputFile.clear();
// Initialise the list of classes/buckets
- AVLCAL::AVLCAL_Service avlcalService (logOutputFile, lAirlineCode);
+ const stdair::BasLogParams lLogParams (stdair::LOG::DEBUG, logOutputFile);
+ AVLCAL::AVLCAL_Service avlcalService (lLogParams, lAirlineCode);
// Perform an availability calculation
avlcalService.avlCalculate (lPartySize);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-01-21 19:34:43
|
Revision: 6
http://avlcal.svn.sourceforge.net/avlcal/?rev=6&view=rev
Author: denis_arnaud
Date: 2010-01-21 19:34:37 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
[Dev] The log output stream initialisation has been moved into the StdAir library.
Modified Paths:
--------------
trunk/avlcal/avlcal/AVLCAL_Service.hpp
trunk/avlcal/avlcal/command/AvailabilityCalculator.cpp
trunk/avlcal/avlcal/factory/FacSupervisor.cpp
trunk/avlcal/avlcal/factory/FacSupervisor.hpp
trunk/avlcal/avlcal/service/AVLCAL_Service.cpp
trunk/avlcal/avlcal/service/sources.mk
Removed Paths:
-------------
trunk/avlcal/avlcal/service/Logger.cpp
trunk/avlcal/avlcal/service/Logger.hpp
Modified: trunk/avlcal/avlcal/AVLCAL_Service.hpp
===================================================================
--- trunk/avlcal/avlcal/AVLCAL_Service.hpp 2010-01-20 22:07:00 UTC (rev 5)
+++ trunk/avlcal/avlcal/AVLCAL_Service.hpp 2010-01-21 19:34:37 UTC (rev 6)
@@ -4,9 +4,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STL
-#include <ostream>
-#include <string>
+// StdAir
+#include <stdair/STDAIR_Types.hpp>
+#include <stdair/basic/BasLogParams.hpp>
// Avlcal
#include <avlcal/AVLCAL_Types.hpp>
@@ -26,10 +26,26 @@
// ////////// Constructors and destructors //////////
/** Constructor.
- @param std::ostream& Output log stream (for instance, std::cout)
+ <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 const stdair::BasLogParams& Parameters for the output log stream.
@param AirlineCode_T& Code of the owner airline. */
- AVLCAL_Service (std::ostream& ioLogStream, const AirlineCode_T&);
+ AVLCAL_Service (const stdair::BasLogParams&, const AirlineCode_T&);
+ /** Constructor.
+ <br>The init() method is called; see the corresponding documentation
+ for more details.
+ <br>Moreover, as no reference on any output stream is given,
+ it is assumed that the StdAir log service has already been
+ initialised with the proper log output stream by some other
+ methods in the calling chain (for instance, when the AVLCAL_Service
+ is itself being initialised by another library service such as
+ SIMCRS_Service).
+ @param AirlineCode_T& Code of the owner airline. */
+ AVLCAL_Service (const AirlineCode_T&);
+
/** Destructor. */
~AVLCAL_Service();
@@ -41,9 +57,14 @@
/** Default copy constructor. */
AVLCAL_Service (const AVLCAL_Service&);
- /** Initialise. */
- void init (std::ostream& ioLogStream, const AirlineCode_T&);
+ /** Initialise the log. */
+ void logInit (const stdair::BasLogParams&);
+ /** Initialise.
+ @param const stdair::AirlineCode_T& Airline code of the inventory
+ owner. */
+ void init (const stdair::AirlineCode_T&);
+
/** Finalise. */
void finalise ();
Modified: trunk/avlcal/avlcal/command/AvailabilityCalculator.cpp
===================================================================
--- trunk/avlcal/avlcal/command/AvailabilityCalculator.cpp 2010-01-20 22:07:00 UTC (rev 5)
+++ trunk/avlcal/avlcal/command/AvailabilityCalculator.cpp 2010-01-21 19:34:37 UTC (rev 6)
@@ -2,10 +2,11 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STL
-#include <exception>
+#include <cassert>
+// StdAir
+#include <stdair/service/Logger.hpp>
// Avlcal
#include <avlcal/command/AvailabilityCalculator.hpp>
-#include <avlcal/service/Logger.hpp>
namespace AVLCAL {
@@ -16,12 +17,12 @@
try {
// DEBUG
- AVLCAL_LOG_DEBUG ("An availability calculation has been performed "
+ STDAIR_LOG_DEBUG ("An availability calculation has been performed "
<< "for the airline " << iAirlineCode
<< " for " << iPartySize << " passengers.");
} catch (const std::exception& lStdError) {
- AVLCAL_LOG_ERROR ("Error: " << lStdError.what());
+ STDAIR_LOG_ERROR ("Error: " << lStdError.what());
throw AvlCalcultationException();
}
}
Modified: trunk/avlcal/avlcal/factory/FacSupervisor.cpp
===================================================================
--- trunk/avlcal/avlcal/factory/FacSupervisor.cpp 2010-01-20 22:07:00 UTC (rev 5)
+++ trunk/avlcal/avlcal/factory/FacSupervisor.cpp 2010-01-21 19:34:37 UTC (rev 6)
@@ -7,15 +7,13 @@
#include <avlcal/factory/FacBomAbstract.hpp>
#include <avlcal/factory/FacServiceAbstract.hpp>
#include <avlcal/factory/FacSupervisor.hpp>
-#include <avlcal/service/Logger.hpp>
namespace AVLCAL {
FacSupervisor* FacSupervisor::_instance = NULL;
// //////////////////////////////////////////////////////////////////////
- FacSupervisor::FacSupervisor () :
- _logger (NULL) {
+ FacSupervisor::FacSupervisor () {
}
// //////////////////////////////////////////////////////////////////////
@@ -40,15 +38,9 @@
}
// //////////////////////////////////////////////////////////////////////
- void FacSupervisor::registerLoggerService (Logger* ioLogger_ptr) {
- _logger = ioLogger_ptr;
- }
-
- // //////////////////////////////////////////////////////////////////////
FacSupervisor::~FacSupervisor() {
cleanBomLayer();
cleanServiceLayer();
- cleanLoggerService();
}
// //////////////////////////////////////////////////////////////////////
@@ -80,16 +72,10 @@
}
// //////////////////////////////////////////////////////////////////////
- void FacSupervisor::cleanLoggerService() {
- delete _logger; _logger = NULL;
- }
-
- // //////////////////////////////////////////////////////////////////////
void FacSupervisor::cleanFactory () {
if (_instance != NULL) {
_instance->cleanBomLayer();
_instance->cleanServiceLayer();
- _instance->cleanLoggerService();
}
delete (_instance); _instance = NULL;
}
Modified: trunk/avlcal/avlcal/factory/FacSupervisor.hpp
===================================================================
--- trunk/avlcal/avlcal/factory/FacSupervisor.hpp 2010-01-20 22:07:00 UTC (rev 5)
+++ trunk/avlcal/avlcal/factory/FacSupervisor.hpp 2010-01-21 19:34:37 UTC (rev 6)
@@ -12,7 +12,6 @@
// Forward declarations
class FacBomAbstract;
class FacServiceAbstract;
- class Logger;
/** Singleton class to register and clean all Factories. */
class FacSupervisor {
@@ -39,16 +38,6 @@
@param FacServiceAbstract& the concrete Factory to register. */
void registerServiceFactory (FacServiceAbstract*);
- /** Register a newly instantiated concrete factory for the
- Logger object. In fact, as the Logger object
- follows the singleton pattern, the concrete factory is the
- Logger object itself.
- <br>When a concrete Factory is firstly instantiated this
- factory have to register itself to the FacSupervisor.
- @param FacServiceAbstract& the concrete Factory to
- register. */
- void registerLoggerService (Logger*);
-
/** Clean all created object.
<br>Call the clean method of all the instantiated factories
for the Bom layer. */
@@ -59,9 +48,6 @@
for the Service layer. */
void cleanServiceLayer();
- /** Delete the Logger object. */
- void cleanLoggerService();
-
/** Clean the static instance.
<br> The singleton is deleted.*/
static void cleanFactory ();
@@ -84,9 +70,6 @@
/** The unique instance.*/
static FacSupervisor* _instance;
- /** Logger (singleton) instance. */
- Logger* _logger;
-
/** List of instantiated factories for the Bom layer. */
BomFactoryPool_T _bomPool;
Modified: trunk/avlcal/avlcal/service/AVLCAL_Service.cpp
===================================================================
--- trunk/avlcal/avlcal/service/AVLCAL_Service.cpp 2010-01-20 22:07:00 UTC (rev 5)
+++ trunk/avlcal/avlcal/service/AVLCAL_Service.cpp 2010-01-21 19:34:37 UTC (rev 6)
@@ -3,29 +3,20 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// Boost
-#include <boost/date_time/gregorian/gregorian.hpp>
-#include <boost/date_time/posix_time/ptime.hpp>
// StdAir
#include <stdair/basic/BasChronometer.hpp>
+#include <stdair/bom/BomManager.hpp> // for display()
+#include <stdair/service/Logger.hpp>
// Avlcal
#include <avlcal/basic/BasConst_AVLCAL_Service.hpp>
#include <avlcal/command/AvailabilityCalculator.hpp>
#include <avlcal/factory/FacAvlcalServiceContext.hpp>
#include <avlcal/service/AVLCAL_ServiceContext.hpp>
-#include <avlcal/service/Logger.hpp>
#include <avlcal/AVLCAL_Service.hpp>
namespace AVLCAL {
// //////////////////////////////////////////////////////////////////////
- AVLCAL_Service::
- AVLCAL_Service (std::ostream& ioLogStream, const AirlineCode_T& iAirlineCode)
- : _avlcalServiceContext (NULL) {
- init (ioLogStream, iAirlineCode);
- }
-
- // //////////////////////////////////////////////////////////////////////
AVLCAL_Service::AVLCAL_Service ()
: _avlcalServiceContext (NULL) {
assert (false);
@@ -37,23 +28,38 @@
}
// //////////////////////////////////////////////////////////////////////
+ AVLCAL_Service::AVLCAL_Service (const AirlineCode_T& iAirlineCode)
+ : _avlcalServiceContext (NULL) {
+
+ // Initialise the context
+ init (iAirlineCode);
+ }
+
+ // //////////////////////////////////////////////////////////////////////
+ AVLCAL_Service::AVLCAL_Service (const stdair::BasLogParams& iLogParams,
+ const AirlineCode_T& iAirlineCode)
+ : _avlcalServiceContext (NULL) {
+
+ // Set the log file
+ logInit (iLogParams);
+
+ // Initialise the (remaining of the) context
+ init (iAirlineCode);
+ }
+
+ // //////////////////////////////////////////////////////////////////////
AVLCAL_Service::~AVLCAL_Service () {
// Delete/Clean all the objects from memory
finalise();
}
// //////////////////////////////////////////////////////////////////////
- void logInit (const LOG::EN_LogLevel iLogLevel,
- std::ostream& ioLogOutputFile) {
- Logger::instance().setLogParameters (iLogLevel, ioLogOutputFile);
+ void AVLCAL_Service::logInit (const stdair::BasLogParams& iLogParams) {
+ stdair::Logger::init (iLogParams);
}
// //////////////////////////////////////////////////////////////////////
- void AVLCAL_Service::init (std::ostream& ioLogStream,
- const AirlineCode_T& iAirlineCode) {
- // Set the log file
- logInit (LOG::DEBUG, ioLogStream);
-
+ void AVLCAL_Service::init (const AirlineCode_T& iAirlineCode) {
// Initialise the context
AVLCAL_ServiceContext& lAVLCAL_ServiceContext =
FacAvlcalServiceContext::instance().create (iAirlineCode);
@@ -87,11 +93,11 @@
const double lAvlCalcMeasure = lAvlCalcChronometer.elapsed();
// DEBUG
- AVLCAL_LOG_DEBUG ("Availability Calculation: " << lAvlCalcMeasure << " - "
+ STDAIR_LOG_DEBUG ("Availability Calculation: " << lAvlCalcMeasure << " - "
<< lAVLCAL_ServiceContext.display());
} catch (const std::exception& error) {
- AVLCAL_LOG_ERROR ("Exception: " << error.what());
+ STDAIR_LOG_ERROR ("Exception: " << error.what());
throw AvlCalcultationException();
}
}
Deleted: trunk/avlcal/avlcal/service/Logger.cpp
===================================================================
--- trunk/avlcal/avlcal/service/Logger.cpp 2010-01-20 22:07:00 UTC (rev 5)
+++ trunk/avlcal/avlcal/service/Logger.cpp 2010-01-21 19:34:37 UTC (rev 6)
@@ -1,64 +0,0 @@
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// STL
-#include <iostream>
-// Avlcal Logger
-#include <avlcal/factory/FacSupervisor.hpp>
-#include <avlcal/service/Logger.hpp>
-
-namespace AVLCAL {
-
- Logger* Logger::_instance = NULL;
-
- // //////////////////////////////////////////////////////////////////////
- Logger::Logger () : _logStream (&std::cout) {
- assert (false);
- }
-
- // //////////////////////////////////////////////////////////////////////
- Logger::Logger (const Logger&) : _logStream (&std::cout) {
- assert (false);
- }
-
- // //////////////////////////////////////////////////////////////////////
- Logger::Logger (const LOG::EN_LogLevel iLevel, std::ostream& ioLogStream)
- : _level (iLevel), _logStream (&ioLogStream) {
- }
-
- // //////////////////////////////////////////////////////////////////////
- Logger::~Logger () {
- _logStream = NULL;
- }
-
- // //////////////////////////////////////////////////////////////////////
- LOG::EN_LogLevel Logger::getLogLevel() {
- return _level;
- }
-
- // //////////////////////////////////////////////////////////////////////
- std::ostream& Logger::getLogStream() {
- assert (_logStream != NULL);
- return *_logStream;
- }
-
- // //////////////////////////////////////////////////////////////////////
- void Logger::setLogParameters (const LOG::EN_LogLevel iLogLevel,
- std::ostream& ioLogStream) {
- _level = iLogLevel;
- _logStream = &ioLogStream;
- }
-
- // //////////////////////////////////////////////////////////////////////
- Logger& Logger::instance() {
- if (_instance == NULL) {
- _instance = new Logger (LOG::DEBUG, std::cout);
-
- assert (_instance != NULL);
-
- FacSupervisor::instance().registerLoggerService (_instance);
- }
- return *_instance;
- }
-
-}
Deleted: trunk/avlcal/avlcal/service/Logger.hpp
===================================================================
--- trunk/avlcal/avlcal/service/Logger.hpp 2010-01-20 22:07:00 UTC (rev 5)
+++ trunk/avlcal/avlcal/service/Logger.hpp 2010-01-21 19:34:37 UTC (rev 6)
@@ -1,94 +0,0 @@
-#ifndef __AVLCAL_SVC_LOGGER_HPP
-#define __AVLCAL_SVC_LOGGER_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// STL
-#include <cassert>
-#include <sstream>
-#include <string>
-// AVLCAL
-#include <avlcal/AVLCAL_Types.hpp>
-
-// /////////////// LOG MACROS /////////////////
-#define AVLCAL_LOG_CORE(iLevel, iToBeLogged) \
- { std::ostringstream ostr; ostr << iToBeLogged; \
- AVLCAL::Logger::instance().log (iLevel, __LINE__, __FILE__, ostr.str()); }
-
-#define AVLCAL_LOG_CRITICAL(iToBeLogged) \
- AVLCAL_LOG_CORE (AVLCAL::LOG::CRITICAL, iToBeLogged)
-
-#define AVLCAL_LOG_ERROR(iToBeLogged) \
- AVLCAL_LOG_CORE (AVLCAL::LOG::ERROR, iToBeLogged)
-
-#define AVLCAL_LOG_NOTIFICATION(iToBeLogged) \
- AVLCAL_LOG_CORE (AVLCAL::LOG::NOTIFICATION, iToBeLogged)
-
-#define AVLCAL_LOG_WARNING(iToBeLogged) \
- AVLCAL_LOG_CORE (AVLCAL::LOG::WARNING, iToBeLogged)
-
-#define AVLCAL_LOG_DEBUG(iToBeLogged) \
- AVLCAL_LOG_CORE (AVLCAL::LOG::DEBUG, iToBeLogged)
-
-#define AVLCAL_LOG_VERBOSE(iToBeLogged) \
- AVLCAL_LOG_CORE (AVLCAL::LOG::VERBOSE, iToBeLogged)
-// /////////// (END OF) LOG MACROS /////////////
-
-
-namespace AVLCAL {
-
- /** Class holding the stream for logs.
- <br>Note that the error logs are seen as standard output logs,
- but with a higher level of visibility. */
- class Logger {
- // Friend classes
- friend class FacSupervisor;
- public:
-
- /** Main log entry. */
- template <typename T>
- void log (const LOG::EN_LogLevel iLevel, const int iLineNumber,
- const std::string& iFileName, const T& iToBeLogged) {
- if (iLevel <= _level) {
- assert (_logStream != NULL);
- *_logStream << iFileName << ":" << iLineNumber
- << ": " << iToBeLogged << std::endl;
- }
- }
-
- /** Get the log level. */
- LOG::EN_LogLevel getLogLevel();
-
- /** get the log stream. */
- std::ostream& getLogStream();
-
- /** Set the logger parameters (level and stream). */
- void setLogParameters (const LOG::EN_LogLevel iLogLevel,
- std::ostream& ioLogStream);
-
- /** Returns a current Logger instance.*/
- static Logger& instance();
-
- private:
- /** Default constructors are private so that only the required
- constructor can be used. */
- Logger ();
- Logger (const Logger&);
- Logger (const LOG::EN_LogLevel iLevel, std::ostream& ioLogStream);
- /** Destructor. */
- ~Logger ();
-
- private:
- /** Log level. */
- LOG::EN_LogLevel _level;
-
- /** Stream dedicated to the logs. */
- std::ostream* _logStream;
-
- /** Instance object.*/
- static Logger* _instance;
- };
-
-}
-#endif // __AVLCAL_SVC_LOGGER_HPP
Modified: trunk/avlcal/avlcal/service/sources.mk
===================================================================
--- trunk/avlcal/avlcal/service/sources.mk 2010-01-20 22:07:00 UTC (rev 5)
+++ trunk/avlcal/avlcal/service/sources.mk 2010-01-21 19:34:37 UTC (rev 6)
@@ -1,7 +1,5 @@
svc_h_sources = $(top_srcdir)/avlcal/service/ServiceAbstract.hpp \
- $(top_srcdir)/avlcal/service/AVLCAL_ServiceContext.hpp \
- $(top_srcdir)/avlcal/service/Logger.hpp
+ $(top_srcdir)/avlcal/service/AVLCAL_ServiceContext.hpp
svc_cc_sources = $(top_srcdir)/avlcal/service/ServiceAbstract.cpp \
$(top_srcdir)/avlcal/service/AVLCAL_ServiceContext.cpp \
- $(top_srcdir)/avlcal/service/Logger.cpp \
$(top_srcdir)/avlcal/service/AVLCAL_Service.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-01-20 22:08:35
|
Revision: 5
http://avlcal.svn.sourceforge.net/avlcal/?rev=5&view=rev
Author: denis_arnaud
Date: 2010-01-20 22:07:00 +0000 (Wed, 20 Jan 2010)
Log Message:
-----------
[Conf] Added the stdair/service/Makefile build.
Modified Paths:
--------------
trunk/avlcal/configure.ac
Modified: trunk/avlcal/configure.ac
===================================================================
--- trunk/avlcal/configure.ac 2010-01-20 17:33:53 UTC (rev 4)
+++ trunk/avlcal/configure.ac 2010-01-20 22:07:00 UTC (rev 5)
@@ -15,7 +15,7 @@
AC_SUBST(RPM_RELEASE)
# Shared library versioning
-GENERIC_LIBRARY_VERSION="0:1:0"
+GENERIC_LIBRARY_VERSION="99:99:99"
# | | |
# +------+ | +---+
# | | |
@@ -249,6 +249,7 @@
stdair/bom/Makefile
stdair/factory/Makefile
stdair/config/Makefile
+ stdair/service/Makefile
stdair/core/Makefile
avlcal/Makefile
avlcal/basic/Makefile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-01-20 17:33:59
|
Revision: 4
http://avlcal.svn.sourceforge.net/avlcal/?rev=4&view=rev
Author: denis_arnaud
Date: 2010-01-20 17:33:53 +0000 (Wed, 20 Jan 2010)
Log Message:
-----------
[Dev] Removed the BasChronometer class, as it is now given by the StdAir library.
Modified Paths:
--------------
trunk/avlcal/avlcal/core/Makefile.am
Modified: trunk/avlcal/avlcal/core/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/core/Makefile.am 2010-01-20 17:28:24 UTC (rev 3)
+++ trunk/avlcal/avlcal/core/Makefile.am 2010-01-20 17:33:53 UTC (rev 4)
@@ -21,9 +21,5 @@
$(top_builddir)/avlcal/service/libsvc.la
libavlcal_la_LDFLAGS = \
$(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(top_builddir)/stdair/core/libstdair.la \
-version-info $(GENERIC_LIBRARY_VERSION)
-
-# Header files
-#pkginclude_HEADERS = $(service_h_sources)
-#nobase_nodist_pkginclude_HEADERS = $(top_builddir)/avlcal/config.h
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-01-20 17:28:31
|
Revision: 3
http://avlcal.svn.sourceforge.net/avlcal/?rev=3&view=rev
Author: denis_arnaud
Date: 2010-01-20 17:28:24 +0000 (Wed, 20 Jan 2010)
Log Message:
-----------
[Dev] Removed the BasChronometer class, as it is now given by the StdAir library.
Modified Paths:
--------------
trunk/avlcal/avlcal/basic/sources.mk
trunk/avlcal/avlcal/service/AVLCAL_Service.cpp
Removed Paths:
-------------
trunk/avlcal/avlcal/basic/BasChronometer.cpp
trunk/avlcal/avlcal/basic/BasChronometer.hpp
Deleted: trunk/avlcal/avlcal/basic/BasChronometer.cpp
===================================================================
--- trunk/avlcal/avlcal/basic/BasChronometer.cpp 2009-12-31 11:06:07 UTC (rev 2)
+++ trunk/avlcal/avlcal/basic/BasChronometer.cpp 2010-01-20 17:28:24 UTC (rev 3)
@@ -1,50 +0,0 @@
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// STL
-#include <cassert>
-// Avlcal
-#include <avlcal/basic/BasChronometer.hpp>
-#include <avlcal/service/Logger.hpp>
-
-namespace AVLCAL {
-
- // //////////////////////////////////////////////////////////////////////
- BasChronometer::BasChronometer () : _startTimeLaunched (false) {
- }
-
- // //////////////////////////////////////////////////////////////////////
- void BasChronometer::start () {
- // Get the time-stamp of now, and store it for later use
- _startTime = boost::posix_time::microsec_clock::local_time();
-
- // Update the boolean which states whether the chronometer
- // is launched
- _startTimeLaunched = true;
- }
-
- // //////////////////////////////////////////////////////////////////////
- double BasChronometer::elapsed () const {
- assert (_startTimeLaunched == true);
-
- // Get the time-stamp of now
- const boost::posix_time::ptime lStopTime =
- boost::posix_time::microsec_clock::local_time();
-
- // Calculate the time elapsed since the last time-stamp
- const boost::posix_time::time_duration lElapsedTime =
- lStopTime - _startTime;
-
- // Derived the corresponding number of milliseconds
- const double lElapsedTimeInMicroSeconds =
- static_cast<const double> (lElapsedTime.total_microseconds());
-
- /*AVLCAL_LOG_DEBUG ("Elapsed: " << lElapsedTime
- << "; (micros): "
- << lElapsedTimeInMicroSeconds / 1e6);*/
-
- // The elapsed time given in return is expressed in seconds
- return (lElapsedTimeInMicroSeconds / 1e6);
- }
-
-}
Deleted: trunk/avlcal/avlcal/basic/BasChronometer.hpp
===================================================================
--- trunk/avlcal/avlcal/basic/BasChronometer.hpp 2009-12-31 11:06:07 UTC (rev 2)
+++ trunk/avlcal/avlcal/basic/BasChronometer.hpp 2010-01-20 17:28:24 UTC (rev 3)
@@ -1,40 +0,0 @@
-#ifndef __AVLCAL_COM_BAS_BASCHRONOMETER_HPP
-#define __AVLCAL_COM_BAS_BASCHRONOMETER_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// Boost Date-Time (http://boost.org/doc/html/date_time/posix_time.html)
-#include <boost/date_time/posix_time/posix_time.hpp>
-
-namespace AVLCAL {
-
- /** Structure allowing measuring the time elapsed between two events. */
- struct BasChronometer {
- /** Constructor. */
- BasChronometer();
-
- /** Start the chronometer from the local time
- <br>The elapsed time given is the one elapsed since the start
- is launched. */
- void start ();
-
- /** Get the start time. */
- std::string getStart () const {
- return boost::posix_time::to_simple_string (_startTime);
- }
-
- /** Return the time elapsed since the structure has been instanciated.
- <br>That elapsed time is expressed in seconds. */
- double elapsed () const;
-
- private:
- /** Start time. */
- boost::posix_time::ptime _startTime;
-
- /** Boolean which states whether the chronometer is started or not.*/
- bool _startTimeLaunched;
- };
-
-}
-#endif // __AVLCAL_COM_BAS_BASCHRONOMETER_HPP
Modified: trunk/avlcal/avlcal/basic/sources.mk
===================================================================
--- trunk/avlcal/avlcal/basic/sources.mk 2009-12-31 11:06:07 UTC (rev 2)
+++ trunk/avlcal/avlcal/basic/sources.mk 2010-01-20 17:28:24 UTC (rev 3)
@@ -1,5 +1,3 @@
bas_h_sources = $(top_srcdir)/avlcal/basic/BasConst_General.hpp \
- $(top_srcdir)/avlcal/basic/BasConst_AVLCAL_Service.hpp \
- $(top_srcdir)/avlcal/basic/BasChronometer.hpp
-bas_cc_sources = $(top_srcdir)/avlcal/basic/BasConst.cpp \
- $(top_srcdir)/avlcal/basic/BasChronometer.cpp
+ $(top_srcdir)/avlcal/basic/BasConst_AVLCAL_Service.hpp
+bas_cc_sources = $(top_srcdir)/avlcal/basic/BasConst.cpp
Modified: trunk/avlcal/avlcal/service/AVLCAL_Service.cpp
===================================================================
--- trunk/avlcal/avlcal/service/AVLCAL_Service.cpp 2009-12-31 11:06:07 UTC (rev 2)
+++ trunk/avlcal/avlcal/service/AVLCAL_Service.cpp 2010-01-20 17:28:24 UTC (rev 3)
@@ -6,9 +6,10 @@
// Boost
#include <boost/date_time/gregorian/gregorian.hpp>
#include <boost/date_time/posix_time/ptime.hpp>
+// StdAir
+#include <stdair/basic/BasChronometer.hpp>
// Avlcal
#include <avlcal/basic/BasConst_AVLCAL_Service.hpp>
-#include <avlcal/basic/BasChronometer.hpp>
#include <avlcal/command/AvailabilityCalculator.hpp>
#include <avlcal/factory/FacAvlcalServiceContext.hpp>
#include <avlcal/service/AVLCAL_ServiceContext.hpp>
@@ -80,7 +81,7 @@
lAVLCAL_ServiceContext.getAirlineCode();
// Delegate the booking to the dedicated command
- BasChronometer lAvlCalcChronometer;
+ stdair::BasChronometer lAvlCalcChronometer;
lAvlCalcChronometer.start();
AvailabilityCalculator::avlCalculate (lAirlineCode, iPartySize);
const double lAvlCalcMeasure = lAvlCalcChronometer.elapsed();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2009-12-31 11:06:16
|
Revision: 2
http://avlcal.svn.sourceforge.net/avlcal/?rev=2&view=rev
Author: denis_arnaud
Date: 2009-12-31 11:06:07 +0000 (Thu, 31 Dec 2009)
Log Message:
-----------
[Dev] First working version (still very simple).
Added Paths:
-----------
trunk/avlcal/AUTHORS
trunk/avlcal/COPYING
trunk/avlcal/ChangeLog
trunk/avlcal/Makefile.am
trunk/avlcal/Makefile.common
trunk/avlcal/NEWS
trunk/avlcal/README
trunk/avlcal/autogen.sh
trunk/avlcal/avlcal/AVLCAL_Service.hpp
trunk/avlcal/avlcal/AVLCAL_Types.hpp
trunk/avlcal/avlcal/Makefile.am
trunk/avlcal/avlcal/basic/
trunk/avlcal/avlcal/basic/BasChronometer.cpp
trunk/avlcal/avlcal/basic/BasChronometer.hpp
trunk/avlcal/avlcal/basic/BasConst.cpp
trunk/avlcal/avlcal/basic/BasConst_AVLCAL_Service.hpp
trunk/avlcal/avlcal/basic/BasConst_General.hpp
trunk/avlcal/avlcal/basic/Makefile.am
trunk/avlcal/avlcal/basic/sources.mk
trunk/avlcal/avlcal/batches/
trunk/avlcal/avlcal/batches/Makefile.am
trunk/avlcal/avlcal/batches/sources.mk
trunk/avlcal/avlcal/bom/
trunk/avlcal/avlcal/bom/BomAbstract.cpp
trunk/avlcal/avlcal/bom/BomAbstract.hpp
trunk/avlcal/avlcal/bom/Makefile.am
trunk/avlcal/avlcal/bom/sources.mk
trunk/avlcal/avlcal/command/
trunk/avlcal/avlcal/command/AvailabilityCalculator.cpp
trunk/avlcal/avlcal/command/AvailabilityCalculator.hpp
trunk/avlcal/avlcal/command/Makefile.am
trunk/avlcal/avlcal/command/sources.mk
trunk/avlcal/avlcal/config/
trunk/avlcal/avlcal/config/Makefile.am
trunk/avlcal/avlcal/config_msvc.h
trunk/avlcal/avlcal/core/
trunk/avlcal/avlcal/core/Makefile.am
trunk/avlcal/avlcal/core/sources.mk
trunk/avlcal/avlcal/factory/
trunk/avlcal/avlcal/factory/FacAvlcalServiceContext.cpp
trunk/avlcal/avlcal/factory/FacAvlcalServiceContext.hpp
trunk/avlcal/avlcal/factory/FacBomAbstract.cpp
trunk/avlcal/avlcal/factory/FacBomAbstract.hpp
trunk/avlcal/avlcal/factory/FacServiceAbstract.cpp
trunk/avlcal/avlcal/factory/FacServiceAbstract.hpp
trunk/avlcal/avlcal/factory/FacSupervisor.cpp
trunk/avlcal/avlcal/factory/FacSupervisor.hpp
trunk/avlcal/avlcal/factory/Makefile.am
trunk/avlcal/avlcal/factory/sources.mk
trunk/avlcal/avlcal/service/
trunk/avlcal/avlcal/service/AVLCAL_Service.cpp
trunk/avlcal/avlcal/service/AVLCAL_ServiceContext.cpp
trunk/avlcal/avlcal/service/AVLCAL_ServiceContext.hpp
trunk/avlcal/avlcal/service/Logger.cpp
trunk/avlcal/avlcal/service/Logger.hpp
trunk/avlcal/avlcal/service/Makefile.am
trunk/avlcal/avlcal/service/ServiceAbstract.cpp
trunk/avlcal/avlcal/service/ServiceAbstract.hpp
trunk/avlcal/avlcal/service/sources.mk
trunk/avlcal/avlcal-config.in
trunk/avlcal/avlcal.m4.in
trunk/avlcal/avlcal.pc.in
trunk/avlcal/avlcal.spec.in
trunk/avlcal/configure.ac
trunk/avlcal/test/Makefile.am
trunk/avlcal/test/avlcal/
trunk/avlcal/test/avlcal/Makefile.am
trunk/avlcal/test/avlcal/avlCalc.cpp
Property Changed:
----------------
trunk/avlcal/
trunk/avlcal/avlcal/
trunk/avlcal/test/
Property changes on: trunk/avlcal
___________________________________________________________________
Added: svn:ignore
+ autom4te.cache
configure
config.status
config.log
libtool
aclocal.m4
Makefile.in
Makefile
INSTALL
COPYING
avlcal-config
avlcal.spec
avlcal.m4
avlcal.pc
avlcal-html-doc-*.tar.*
avlcal-*.tar.*
Added: svn:externals
+ config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/stdair
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit
Added: trunk/avlcal/COPYING
===================================================================
--- trunk/avlcal/COPYING (rev 0)
+++ trunk/avlcal/COPYING 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+Source: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
Added: trunk/avlcal/Makefile.am
===================================================================
--- trunk/avlcal/Makefile.am (rev 0)
+++ trunk/avlcal/Makefile.am 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,73 @@
+## top directory
+include $(top_srcdir)/Makefile.common
+
+ACLOCAL_AMFLAGS = -I config
+
+AUTOMAKE_OPTIONS = dist-bzip2
+
+if INFO_DOC
+ INFO_DOC_DIR = info
+endif
+
+if HTML_DOC
+ HTML_DOC_DIR = doc
+endif
+
+if RUN_TESTS
+ TEST_DIR = test
+endif
+
+# Maintainance files
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
+ config-h.in sic/stamp-h.in autogen.sh bootstrap
+
+EXTRA_DIST = @PACKAGE@.spec @PACKAGE@.m4 @PACKAGE@.pc Makefile.common
+
+# Build in these directories:
+SUBDIRS = stdair @PACKAGE@ extracppunit $(TEST_DIR)
+
+
+# Configuration helpers
+bin_SCRIPTS = @PACKAGE@-config
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE@.pc
+
+m4datadir = $(datadir)/aclocal
+m4data_DATA = @PACKAGE@.m4
+
+# Targets
+uninstall-local:
+ rm -rf $(DESTDIR)$(includedir)/@PACKAGE@
+
+dist-html:
+ $(MAKE) -C doc dist-html
+
+dist-gui:
+ $(MAKE) -C gui dist-gui
+
+snapshot: snapshot-src snapshot-html snapshot-gui
+
+
+snapshot-src:
+ $(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
+
+snapshot-html:
+ $(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-html-doc-`date +"%Y%m%d"`
+
+snapshot-gui:
+ $(MAKE) -C gui dist-gui
+
+upload: upload-src upload-html upload-gui
+
+upload-src: dist
+ @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-@VERSION@.tar.gz \
+ @PACKAGE_TARNAME@-@VERSION@.tar.bz2
+
+upload-html: dist-html
+ @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-html-doc-@VERSION@.tar.gz \
+ @PACKAGE_TARNAME@-html-doc-@VERSION@.tar.bz2
+
+upload-gui: dist-gui
+ @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-gui-@VERSION@.tar.gz \
+ @PACKAGE_TARNAME@-gui-@VERSION@.tar.bz2
Added: trunk/avlcal/Makefile.common
===================================================================
--- trunk/avlcal/Makefile.common (rev 0)
+++ trunk/avlcal/Makefile.common 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,2 @@
+@SET_MAKE@
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
Added: trunk/avlcal/autogen.sh
===================================================================
--- trunk/avlcal/autogen.sh (rev 0)
+++ trunk/avlcal/autogen.sh 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,40 @@
+#! /bin/sh
+
+# $Id: autogen.sh,v 1.4 2002/12/02 01:39:49 murrayc Exp $
+#
+# Copyright (c) 2002 Daniel Elstner <dan...@gm...>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License VERSION 2 as
+# published by the Free Software Foundation. You are not allowed to
+# use any other version of the license; unless you got the explicit
+# permission from the author to do so.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+dir=`echo "$0" | sed 's,[^/]*$,,'`
+test "x${dir}" = "x" && dir='.'
+
+if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
+then
+ echo "This script must be executed directly from the source directory."
+ exit 1
+fi
+
+rm -f config.cache acconfig.h
+
+echo "- autoreconf." && \
+autoreconf -fvi && \
+echo "- configure." && \
+./configure "$@" && exit 0
+
+exit 1
+
Property changes on: trunk/avlcal/autogen.sh
___________________________________________________________________
Added: svn:executable
+ *
Property changes on: trunk/avlcal/avlcal
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
stamp-h1
config.h
config.h.in
Added: trunk/avlcal/avlcal/AVLCAL_Service.hpp
===================================================================
--- trunk/avlcal/avlcal/AVLCAL_Service.hpp (rev 0)
+++ trunk/avlcal/avlcal/AVLCAL_Service.hpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,57 @@
+#ifndef __AVLCAL_SVC_AVLCAL_SERVICE_HPP
+#define __AVLCAL_SVC_AVLCAL_SERVICE_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <ostream>
+#include <string>
+// Avlcal
+#include <avlcal/AVLCAL_Types.hpp>
+
+namespace AVLCAL {
+
+ // Forward declaration
+ class AVLCAL_ServiceContext;
+
+
+ /** Interface for the AVLCAL Services. */
+ class AVLCAL_Service {
+ public:
+ // /////////// Business Methods /////////////
+ /** Perform a seat availability calculation. */
+ void avlCalculate (const PartySize_T&);
+
+
+ // ////////// Constructors and destructors //////////
+ /** Constructor.
+ @param std::ostream& Output log stream (for instance, std::cout)
+ @param AirlineCode_T& Code of the owner airline. */
+ AVLCAL_Service (std::ostream& ioLogStream, const AirlineCode_T&);
+
+ /** Destructor. */
+ ~AVLCAL_Service();
+
+
+ private:
+ // /////// Construction and Destruction helper methods ///////
+ /** Default constructor. */
+ AVLCAL_Service ();
+ /** Default copy constructor. */
+ AVLCAL_Service (const AVLCAL_Service&);
+
+ /** Initialise. */
+ void init (std::ostream& ioLogStream, const AirlineCode_T&);
+
+ /** Finalise. */
+ void finalise ();
+
+
+ private:
+ // ///////// Service Context /////////
+ /** Avlcal context. */
+ AVLCAL_ServiceContext* _avlcalServiceContext;
+ };
+}
+#endif // __AVLCAL_SVC_AVLCAL_SERVICE_HPP
Added: trunk/avlcal/avlcal/AVLCAL_Types.hpp
===================================================================
--- trunk/avlcal/avlcal/AVLCAL_Types.hpp (rev 0)
+++ trunk/avlcal/avlcal/AVLCAL_Types.hpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,59 @@
+#ifndef __AVLCAL_AVLCAL_TYPES_HPP
+#define __AVLCAL_AVLCAL_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <exception>
+#include <string>
+
+namespace AVLCAL {
+
+ // ///////// Exceptions ///////////
+ class RootException : public std::exception {
+ };
+
+ class NonInitialisedServiceException : public RootException {
+ };
+
+ class MemoryAllocationException : public RootException {
+ };
+
+ class ObjectNotFoundException : public RootException {
+ };
+
+ class SQLDatabaseException : public RootException {
+ };
+
+ class SQLDatabaseConnectionImpossibleException : public SQLDatabaseException {
+ };
+
+ class AvlCalcultationException : public RootException {
+ };
+
+
+ // /////////////// Log /////////////
+ /** Level of logs. */
+ namespace LOG {
+ typedef enum {
+ CRITICAL = 0,
+ ERROR,
+ NOTIFICATION,
+ WARNING,
+ DEBUG,
+ VERBOSE,
+ LAST_VALUE
+ } EN_LogLevel;
+ }
+
+
+ // //////// Type definitions /////////
+ /** IATA code of the airline owner of the inventory system. */
+ typedef std::string AirlineCode_T;
+
+ /** Number of passengers (in a group) for an availability request. */
+ typedef unsigned short PartySize_T;
+
+}
+#endif // __AVLCAL_AVLCAL_TYPES_HPP
Added: trunk/avlcal/avlcal/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/Makefile.am (rev 0)
+++ trunk/avlcal/avlcal/Makefile.am 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,17 @@
+# avlcal
+include $(top_srcdir)/Makefile.common
+include $(srcdir)/core/sources.mk
+
+## Source directory
+
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = basic bom factory command service core config batches
+
+EXTRA_DIST = config_msvc.h
+
+
+# Header files
+nobase_pkginclude_HEADERS = $(service_h_sources)
+#nobase_nodist_pkginclude_HEADERS = $(top_builddir)/@PACKAGE@/config.h
+
Property changes on: trunk/avlcal/avlcal/basic
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
Added: trunk/avlcal/avlcal/basic/BasChronometer.cpp
===================================================================
--- trunk/avlcal/avlcal/basic/BasChronometer.cpp (rev 0)
+++ trunk/avlcal/avlcal/basic/BasChronometer.cpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,50 @@
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <cassert>
+// Avlcal
+#include <avlcal/basic/BasChronometer.hpp>
+#include <avlcal/service/Logger.hpp>
+
+namespace AVLCAL {
+
+ // //////////////////////////////////////////////////////////////////////
+ BasChronometer::BasChronometer () : _startTimeLaunched (false) {
+ }
+
+ // //////////////////////////////////////////////////////////////////////
+ void BasChronometer::start () {
+ // Get the time-stamp of now, and store it for later use
+ _startTime = boost::posix_time::microsec_clock::local_time();
+
+ // Update the boolean which states whether the chronometer
+ // is launched
+ _startTimeLaunched = true;
+ }
+
+ // //////////////////////////////////////////////////////////////////////
+ double BasChronometer::elapsed () const {
+ assert (_startTimeLaunched == true);
+
+ // Get the time-stamp of now
+ const boost::posix_time::ptime lStopTime =
+ boost::posix_time::microsec_clock::local_time();
+
+ // Calculate the time elapsed since the last time-stamp
+ const boost::posix_time::time_duration lElapsedTime =
+ lStopTime - _startTime;
+
+ // Derived the corresponding number of milliseconds
+ const double lElapsedTimeInMicroSeconds =
+ static_cast<const double> (lElapsedTime.total_microseconds());
+
+ /*AVLCAL_LOG_DEBUG ("Elapsed: " << lElapsedTime
+ << "; (micros): "
+ << lElapsedTimeInMicroSeconds / 1e6);*/
+
+ // The elapsed time given in return is expressed in seconds
+ return (lElapsedTimeInMicroSeconds / 1e6);
+ }
+
+}
Added: trunk/avlcal/avlcal/basic/BasChronometer.hpp
===================================================================
--- trunk/avlcal/avlcal/basic/BasChronometer.hpp (rev 0)
+++ trunk/avlcal/avlcal/basic/BasChronometer.hpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,40 @@
+#ifndef __AVLCAL_COM_BAS_BASCHRONOMETER_HPP
+#define __AVLCAL_COM_BAS_BASCHRONOMETER_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// Boost Date-Time (http://boost.org/doc/html/date_time/posix_time.html)
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+namespace AVLCAL {
+
+ /** Structure allowing measuring the time elapsed between two events. */
+ struct BasChronometer {
+ /** Constructor. */
+ BasChronometer();
+
+ /** Start the chronometer from the local time
+ <br>The elapsed time given is the one elapsed since the start
+ is launched. */
+ void start ();
+
+ /** Get the start time. */
+ std::string getStart () const {
+ return boost::posix_time::to_simple_string (_startTime);
+ }
+
+ /** Return the time elapsed since the structure has been instanciated.
+ <br>That elapsed time is expressed in seconds. */
+ double elapsed () const;
+
+ private:
+ /** Start time. */
+ boost::posix_time::ptime _startTime;
+
+ /** Boolean which states whether the chronometer is started or not.*/
+ bool _startTimeLaunched;
+ };
+
+}
+#endif // __AVLCAL_COM_BAS_BASCHRONOMETER_HPP
Added: trunk/avlcal/avlcal/basic/BasConst.cpp
===================================================================
--- trunk/avlcal/avlcal/basic/BasConst.cpp (rev 0)
+++ trunk/avlcal/avlcal/basic/BasConst.cpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,12 @@
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+#include <avlcal/basic/BasConst_General.hpp>
+#include <avlcal/basic/BasConst_AVLCAL_Service.hpp>
+
+namespace AVLCAL {
+
+ /** Default airline name for the AVLCAL_Service. */
+ const std::string DEFAULT_AIRLINE_CODE = "BA";
+
+}
Added: trunk/avlcal/avlcal/basic/BasConst_AVLCAL_Service.hpp
===================================================================
--- trunk/avlcal/avlcal/basic/BasConst_AVLCAL_Service.hpp (rev 0)
+++ trunk/avlcal/avlcal/basic/BasConst_AVLCAL_Service.hpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,15 @@
+#ifndef __AVLCAL_BAS_BASCONST_AVLCAL_SERVICE_HPP
+#define __AVLCAL_BAS_BASCONST_AVLCAL_SERVICE_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+#include <string>
+
+namespace AVLCAL {
+
+ /** Default airline name for the AVLCAL_Service. */
+ extern const std::string DEFAULT_AIRLINE_CODE;
+
+}
+#endif // __AVLCAL_BAS_BASCONST_AVLCAL_SERVICE_HPP
Added: trunk/avlcal/avlcal/basic/BasConst_General.hpp
===================================================================
--- trunk/avlcal/avlcal/basic/BasConst_General.hpp (rev 0)
+++ trunk/avlcal/avlcal/basic/BasConst_General.hpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,11 @@
+#ifndef __AVLCAL_BAS_BASCONST_GENERAL_HPP
+#define __AVLCAL_BAS_BASCONST_GENERAL_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+
+namespace AVLCAL {
+
+}
+#endif // __AVLCAL_BAS_BASCONST_GENERAL_HPP
Added: trunk/avlcal/avlcal/basic/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/basic/Makefile.am (rev 0)
+++ trunk/avlcal/avlcal/basic/Makefile.am 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,11 @@
+## basic sub-directory
+include $(top_srcdir)/Makefile.common
+include $(srcdir)/sources.mk
+
+noinst_LTLIBRARIES= libbas.la
+
+libbas_la_SOURCES= $(bas_h_sources) $(bas_cc_sources)
+libbas_la_CXXFLAGS =
+
+#pkgincludedir = $(includedir)/@PACKAGE@/basic
+#pkginclude_HEADERS = $(bas_h_sources)
Added: trunk/avlcal/avlcal/basic/sources.mk
===================================================================
--- trunk/avlcal/avlcal/basic/sources.mk (rev 0)
+++ trunk/avlcal/avlcal/basic/sources.mk 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,5 @@
+bas_h_sources = $(top_srcdir)/avlcal/basic/BasConst_General.hpp \
+ $(top_srcdir)/avlcal/basic/BasConst_AVLCAL_Service.hpp \
+ $(top_srcdir)/avlcal/basic/BasChronometer.hpp
+bas_cc_sources = $(top_srcdir)/avlcal/basic/BasConst.cpp \
+ $(top_srcdir)/avlcal/basic/BasChronometer.cpp
Property changes on: trunk/avlcal/avlcal/batches
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
Added: trunk/avlcal/avlcal/batches/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/batches/Makefile.am (rev 0)
+++ trunk/avlcal/avlcal/batches/Makefile.am 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,15 @@
+# batches
+include $(top_srcdir)/Makefile.common
+include $(srcdir)/sources.mk
+
+## Source directory
+
+MAINTAINERCLEANFILES = Makefile.in
+
+# Binaries (batches)
+bin_PROGRAMS =
+
+#avlcal_SOURCES = $(batches_h_sources) $(batches_cc_sources)
+#avlcal_CXXFLAGS = $(BOOST_CFLAGS)
+#avlcal_LDADD =
+#avlcal_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(top_builddir)/avlcal/core/libavlcal.la
Added: trunk/avlcal/avlcal/batches/sources.mk
===================================================================
--- trunk/avlcal/avlcal/batches/sources.mk (rev 0)
+++ trunk/avlcal/avlcal/batches/sources.mk 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,2 @@
+batches_h_sources =
+batches_cc_sources =
Property changes on: trunk/avlcal/avlcal/bom
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
Added: trunk/avlcal/avlcal/bom/BomAbstract.cpp
===================================================================
--- trunk/avlcal/avlcal/bom/BomAbstract.cpp (rev 0)
+++ trunk/avlcal/avlcal/bom/BomAbstract.cpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,9 @@
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// AVLCAL
+#include <avlcal/bom/BomAbstract.hpp>
+
+namespace AVLCAL {
+
+}
Added: trunk/avlcal/avlcal/bom/BomAbstract.hpp
===================================================================
--- trunk/avlcal/avlcal/bom/BomAbstract.hpp (rev 0)
+++ trunk/avlcal/avlcal/bom/BomAbstract.hpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,91 @@
+#ifndef __AVLCAL_BOM_BOMABSTRACT_HPP
+#define __AVLCAL_BOM_BOMABSTRACT_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <iosfwd>
+#include <string>
+
+namespace AVLCAL {
+
+ /** Base class for the Business Object Model (BOM) layer. */
+ class BomAbstract {
+ friend class FacBomAbstract;
+ public:
+ // /////////// Display support methods /////////
+ /** Dump a Business Object into an output stream.
+ @param ostream& the output stream. */
+ virtual void toStream (std::ostream& ioOut) const = 0;
+
+ /** Read a Business Object from an input stream.
+ @param istream& the input stream. */
+ virtual void fromStream (std::istream& ioIn) = 0;
+
+ /** Get the serialised version of the Business Object. */
+ virtual std::string toString() const = 0;
+
+ /** Get a string describing the whole key (differentiating two objects
+ at any level). */
+ virtual std::string describeKey() const = 0;
+
+ /** Get a string describing the short key (differentiating two objects
+ at the same level). */
+ virtual std::string describeShortKey() const = 0;
+
+
+ protected:
+ /** Protected Default Constructor to ensure this class is abtract. */
+ BomAbstract() {}
+ BomAbstract(const BomAbstract&) {}
+
+ /** Destructor. */
+ virtual ~BomAbstract() {}
+ };
+}
+
+/**
+ Piece of code given by Nicolai M. Josuttis, Section 13.12.1 "Implementing
+ Output Operators" (p653) of his book "The C++ Standard Library: A Tutorial
+ and Reference", published by Addison-Wesley.
+ */
+template <class charT, class traits>
+inline
+std::basic_ostream<charT, traits>&
+operator<< (std::basic_ostream<charT, traits>& ioOut,
+ const AVLCAL::BomAbstract& iBom) {
+ /**
+ string stream:
+ - with same format
+ - without special field width
+ */
+ std::basic_ostringstream<charT,traits> ostr;
+ ostr.copyfmt (ioOut);
+ ostr.width (0);
+
+ // Fill string stream
+ iBom.toStream (ostr);
+
+ // Print string stream
+ ioOut << ostr.str();
+
+ return ioOut;
+}
+
+/**
+ Piece of code given by Nicolai M. Josuttis, Section 13.12.1 "Implementing
+ Output Operators" (pp655-657) of his book "The C++ Standard Library:
+ A Tutorial and Reference", published by Addison-Wesley.
+ */
+template <class charT, class traits>
+inline
+std::basic_istream<charT, traits>&
+operator>> (std::basic_istream<charT, traits>& ioIn,
+ AVLCAL::BomAbstract& ioBom) {
+ // Fill Bom object with input stream
+ ioBom.fromStream (ioIn);
+ return ioIn;
+}
+
+#endif // __AVLCAL_BOM_BOMABSTRACT_HPP
Added: trunk/avlcal/avlcal/bom/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/bom/Makefile.am (rev 0)
+++ trunk/avlcal/avlcal/bom/Makefile.am 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,12 @@
+## bom sub-directory
+include $(top_srcdir)/Makefile.common
+include $(srcdir)/sources.mk
+
+noinst_LTLIBRARIES= libbom.la
+
+libbom_la_SOURCES= $(bom_h_sources) $(bom_cc_sources)
+libbom_la_CXXFLAGS =
+libbom_la_LDFLAGS =
+
+#pkgincludedir = $(includedir)/@PACKAGE@/bom
+#pkginclude_HEADERS = $(bom_h_sources)
Added: trunk/avlcal/avlcal/bom/sources.mk
===================================================================
--- trunk/avlcal/avlcal/bom/sources.mk (rev 0)
+++ trunk/avlcal/avlcal/bom/sources.mk 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,2 @@
+bom_h_sources = $(top_srcdir)/avlcal/bom/BomAbstract.hpp
+bom_cc_sources = $(top_srcdir)/avlcal/bom/BomAbstract.cpp
Property changes on: trunk/avlcal/avlcal/command
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
Added: trunk/avlcal/avlcal/command/AvailabilityCalculator.cpp
===================================================================
--- trunk/avlcal/avlcal/command/AvailabilityCalculator.cpp (rev 0)
+++ trunk/avlcal/avlcal/command/AvailabilityCalculator.cpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,29 @@
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <exception>
+// Avlcal
+#include <avlcal/command/AvailabilityCalculator.hpp>
+#include <avlcal/service/Logger.hpp>
+
+namespace AVLCAL {
+
+ // //////////////////////////////////////////////////////////////////////
+ void AvailabilityCalculator::avlCalculate (const AirlineCode_T& iAirlineCode,
+ const PartySize_T& iPartySize) {
+
+ try {
+
+ // DEBUG
+ AVLCAL_LOG_DEBUG ("An availability calculation has been performed "
+ << "for the airline " << iAirlineCode
+ << " for " << iPartySize << " passengers.");
+
+ } catch (const std::exception& lStdError) {
+ AVLCAL_LOG_ERROR ("Error: " << lStdError.what());
+ throw AvlCalcultationException();
+ }
+ }
+
+}
Added: trunk/avlcal/avlcal/command/AvailabilityCalculator.hpp
===================================================================
--- trunk/avlcal/avlcal/command/AvailabilityCalculator.hpp (rev 0)
+++ trunk/avlcal/avlcal/command/AvailabilityCalculator.hpp 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,29 @@
+#ifndef __AVLCAL_CMD_INDEXBUILDER_HPP
+#define __AVLCAL_CMD_INDEXBUILDER_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// Avlcal
+#include <avlcal/AVLCAL_Types.hpp>
+
+namespace AVLCAL {
+
+ /** Command wrapping the availability calculation request process. */
+ class AvailabilityCalculator {
+ friend class AVLCAL_Service;
+ private:
+
+ /** Perform a seat availability calculation. */
+ static void avlCalculate (const AirlineCode_T&, const PartySize_T&);
+
+ private:
+ /** Constructors. */
+ AvailabilityCalculator() {}
+ AvailabilityCalculator(const AvailabilityCalculator&) {}
+ /** Destructor. */
+ ~AvailabilityCalculator() {}
+ };
+
+}
+#endif // __AVLCAL_CMD_INDEXBUILDER_HPP
Added: trunk/avlcal/avlcal/command/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/command/Makefile.am (rev 0)
+++ trunk/avlcal/avlcal/command/Makefile.am 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,13 @@
+## command sub-directory
+include $(top_srcdir)/Makefile.common
+include $(srcdir)/sources.mk
+
+noinst_LTLIBRARIES= libcmd.la
+
+libcmd_la_SOURCES= $(cmd_h_sources) $(cmd_cc_sources)
+libcmd_la_CXXFLAGS = $(BOOST_CFLAGS)
+libcmd_la_LIBADD =
+libcmd_la_LDFLAGS = $(BOOST_LIBS)
+
+#pkgincludedir = $(includedir)/@PACKAGE@/command
+#pkginclude_HEADERS = $(cmd_h_sources)
Added: trunk/avlcal/avlcal/command/sources.mk
===================================================================
--- trunk/avlcal/avlcal/command/sources.mk (rev 0)
+++ trunk/avlcal/avlcal/command/sources.mk 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,4 @@
+cmd_h_sources = \
+ $(top_srcdir)/avlcal/command/AvailabilityCalculator.hpp
+cmd_cc_sources = \
+ $(top_srcdir)/avlcal/command/AvailabilityCalculator.cpp
Property changes on: trunk/avlcal/avlcal/config
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
avlcal-paths.hpp
Added: trunk/avlcal/avlcal/config/Makefile.am
===================================================================
--- trunk/avlcal/avlcal/config/Makefile.am (rev 0)
+++ trunk/avlcal/avlcal/config/Makefile.am 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,26 @@
+# avlcal/config
+include $(top_srcdir)/Makefile.common
+
+## Source directory
+
+DISTCLEANFILES = avlcal-paths.hpp
+
+MAINTAINERCLEANFILES = Makefile.in
+
+EXTRA_DIST = avlcal-paths.hpp
+
+# Targets
+all-local: avlcal-paths.hpp
+
+avlcal-paths.hpp: Makefile
+ @echo '#ifndef __AVLCAL_PATHS_HPP' > $@
+ @echo '#define __AVLCAL_PATHS_HPP' >> $@
+ @echo '#define PACKAGE "avlcal"' >> $@
+ @echo '#define PACKAGE_NAME "AVLCAL"' >> $@
+ @echo '#define PACKAGE_VERSION "@VERSION@"' >> $@
+ @echo '#define PREFIXDIR "$(prefix)"' >> $@
+ @echo '#define BINDIR "$(bindir)"' >> $@
+ @echo '#define LIBEXECDIR "$(libexecdir)"' >> $@
+ @echo '#define DATADIR "$(datadir)"' >> $@
+ @echo '#define DOCDIR "$(docdir)"' >> $@
+ @echo '#endif // __AVLCAL_PATHS_HPP' >> $@
Added: trunk/avlcal/avlcal/config_msvc.h
===================================================================
--- trunk/avlcal/avlcal/config_msvc.h (rev 0)
+++ trunk/avlcal/avlcal/config_msvc.h 2009-12-31 11:06:07 UTC (rev 2)
@@ -0,0 +1,230 @@
+/* latus/config.h. Generated from config.h.in by configure. */
+/* latus/config.h.in. Generated from configure.ac by autoheader. */
+
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+
+/* Define to dummy `main' function (if any) required to link to the Fortran
+ libraries. */
+/* #undef F77_DUMMY_MAIN */
+
+/* Define if F77 and FC dummy `main' functions are identical. */
+/* #undef FC_DUMMY_MAIN_EQ_F77 */
+
+/* Define to 1 if you have the `acosh' function. */
+/* #undef HAVE_ACOSH */
+
+/* Define to 1 if you have the `asinh' function. */
+/* #undef HAVE_ASINH */
+
+/* Define to 1 if you have the `atanh' function. */
+/* #undef HAVE_ATANH */
+
+/* Define if you have a BLAS library. */
+#define HAVE_BLAS 1
+
+/* Define if you have CBLAS library. */
+#define HAVE_CBLAS 1
+
+/* Define if you have ACML CBLAS library. */
+/* #undef HAVE_CBLAS_ACML */
+
+/* Define to 1 if you have the `cbrt' function. */
+/* #undef HAVE_CBRT */
+
+/* Define to 1 if you have the <cmath> header file. */
+#define HAVE_CMATH 1
+
+/* Define to 1 if you have the <complex> header file. */
+#define HAVE_COMPLEX 1
+
+/* Define to 1 if you have the declaration of `signgam', and to 0 if you
+ don't. */
+/* #undef HAVE_DECL_SIGNGAM */
+
+/* Define to 1 if you have the <deque> header file. */
+#define HAVE_DEQUE 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `erf' function. */
+/* #undef HAVE_ERF */
+
+/* Define to 1 if you have the `erfc' function. */
+/* #undef HAVE_ERFC */
+
+/* Define if you have FFT library. */
+#define HAVE_FFT 1
+
+/* Define if you have FFTW3 library. */
+/* #undef HAVE_FFTW3 */
+
+/* Define if you have ACML FFT library. */
+/* #undef HAVE_FFT_ACML */
+
+/* Define if you have MKL8 FFT library. */
+#define HAVE_FFT_MKL8 1
+
+/* Define to 1 if you have the `finite' function. */
+/* #undef HAVE_FINITE */
+
+/* Define to 1 if you have the `fpclass' function. */
+/* #undef HAVE_FPCLASS */
+
+/* Define to 1 if you have the <fstream> header file. */
+#define HAVE_FSTREAM 1
+
+/* Define to 1 if you have the <ieeefp.h> header file. */
+/* #undef HAVE_IEEEFP_H */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <iomanip> header file. */
+#define HAVE_IOMANIP 1
+
+/* Define to 1 if you have the <iostream> header file. */
+#define HAVE_IOSTREAM 1
+
+/* Define to 1 if you have the `isfinite' function. */
+/* #undef HAVE_ISFINITE */
+
+/* Define to 1 if you have the `isinf' function. */
+/* #undef HAVE_ISINF */
+
+/* Define to 1 if you have the `isnan' function. */
+/* #undef HAVE_ISNAN */
+
+/* Define if you have LAPACK library. */
+#define HAVE_LAPACK 1
+
+/* Define to 1 if you have the `lgamma' function. */
+/* #undef HAVE_LGAMMA */
+
+/* Define to 1 if you have the <limits> header file. */
+#define HAVE_LIMITS 1
+
+/* Define to 1 if you have the <list> header file. */
+#define HAVE_LIST 1
+
+/* Define to 1 if you have the `log1p' function. */
+/* #undef HAVE_LOG1P */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <queue> header file. */
+#define HAVE_QUEUE 1
+
+/* Define to 1 if you have the `rint' function. */
+/* #undef HAVE_RINT */
+
+/* Define to 1 ...
[truncated message content] |