You can subscribe to this list here.
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2010 |
Jan
(4) |
Feb
(2) |
Mar
(2) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
(10) |
Dec
(6) |
From: <den...@us...> - 2010-01-21 23:32:54
|
Revision: 6 http://simfqt.svn.sourceforge.net/simfqt/?rev=6&view=rev Author: denis_arnaud Date: 2010-01-21 23:32:47 +0000 (Thu, 21 Jan 2010) Log Message: ----------- [Dev] The log service now needs a log level at the initialisation stage. Modified Paths: -------------- trunk/simfqt/test/simfqt/priceQuote.cpp Modified: trunk/simfqt/test/simfqt/priceQuote.cpp =================================================================== --- trunk/simfqt/test/simfqt/priceQuote.cpp 2010-01-21 19:34:10 UTC (rev 5) +++ trunk/simfqt/test/simfqt/priceQuote.cpp 2010-01-21 23:32:47 UTC (rev 6) @@ -29,7 +29,8 @@ logOutputFile.clear(); // Initialise the list of classes/buckets - SIMFQT::SIMFQT_Service simfqtService (logOutputFile, lAirlineCode); + const stdair::BasLogParams lLogParams (stdair::LOG::DEBUG, logOutputFile); + SIMFQT::SIMFQT_Service simfqtService (lLogParams, lAirlineCode); // Perform a price quotation simfqtService.priceQuote (lAirlineCode, 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:17
|
Revision: 5 http://simfqt.svn.sourceforge.net/simfqt/?rev=5&view=rev Author: denis_arnaud Date: 2010-01-21 19:34:10 +0000 (Thu, 21 Jan 2010) Log Message: ----------- [Dev] The log output stream initialisation has been moved into the StdAir library. Modified Paths: -------------- trunk/simfqt/simfqt/SIMFQT_Service.hpp trunk/simfqt/simfqt/command/FareQuoter.cpp trunk/simfqt/simfqt/factory/FacSupervisor.cpp trunk/simfqt/simfqt/factory/FacSupervisor.hpp trunk/simfqt/simfqt/service/SIMFQT_Service.cpp trunk/simfqt/simfqt/service/sources.mk Removed Paths: ------------- trunk/simfqt/simfqt/service/Logger.cpp trunk/simfqt/simfqt/service/Logger.hpp Modified: trunk/simfqt/simfqt/SIMFQT_Service.hpp =================================================================== --- trunk/simfqt/simfqt/SIMFQT_Service.hpp 2010-01-20 21:54:46 UTC (rev 4) +++ trunk/simfqt/simfqt/SIMFQT_Service.hpp 2010-01-21 19:34:10 UTC (rev 5) @@ -4,10 +4,10 @@ // ////////////////////////////////////////////////////////////////////// // Import section // ////////////////////////////////////////////////////////////////////// -// STL -#include <iosfwd> -#include <string> -// Simfqt +// StdAir +#include <stdair/STDAIR_Types.hpp> +#include <stdair/basic/BasLogParams.hpp> +// SimFQT #include <simfqt/SIMFQT_Types.hpp> namespace SIMFQT { @@ -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 FareQuoteID_T& ID of the Fare Quote system. */ - SIMFQT_Service (std::ostream& ioLogStream, const FareQuoteID_T&); + SIMFQT_Service (const stdair::BasLogParams&, const FareQuoteID_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 AIRINV_Service + is itself being initialised by another library service such as + SIMCRS_Service). + @param FareQuoteID_T& ID of the Fare Quote system. */ + SIMFQT_Service (const FareQuoteID_T&); + /** Destructor. */ ~SIMFQT_Service(); @@ -41,9 +57,13 @@ /** Default copy constructor. */ SIMFQT_Service (const SIMFQT_Service&); - /** Initialise. */ - void init (std::ostream& ioLogStream, const FareQuoteID_T&); + /** Initialise the log. */ + void logInit (const stdair::BasLogParams&); + /** Initialise. + @param const FareQuoteID_T& ID of the owner of the FareQuote system. */ + void init (const FareQuoteID_T&); + /** Finalise. */ void finalise (); Modified: trunk/simfqt/simfqt/command/FareQuoter.cpp =================================================================== --- trunk/simfqt/simfqt/command/FareQuoter.cpp 2010-01-20 21:54:46 UTC (rev 4) +++ trunk/simfqt/simfqt/command/FareQuoter.cpp 2010-01-21 19:34:10 UTC (rev 5) @@ -2,10 +2,11 @@ // Import section // ////////////////////////////////////////////////////////////////////// // STL -#include <exception> +#include <cassert> +// StdAir +#include <stdair/service/Logger.hpp> // Simfqt #include <simfqt/command/FareQuoter.hpp> -#include <simfqt/service/Logger.hpp> namespace SIMFQT { @@ -18,13 +19,13 @@ try { // DEBUG - SIMFQT_LOG_DEBUG ("The price is " << oPrice + STDAIR_LOG_DEBUG ("The price is " << oPrice << " EUR for the travel request for the airline " << iAirlineCode << " for " << iPartySize << " passengers."); } catch (const std::exception& lStdError) { - SIMFQT_LOG_ERROR ("Error: " << lStdError.what()); + STDAIR_LOG_ERROR ("Error: " << lStdError.what()); throw QuotingException(); } Modified: trunk/simfqt/simfqt/factory/FacSupervisor.cpp =================================================================== --- trunk/simfqt/simfqt/factory/FacSupervisor.cpp 2010-01-20 21:54:46 UTC (rev 4) +++ trunk/simfqt/simfqt/factory/FacSupervisor.cpp 2010-01-21 19:34:10 UTC (rev 5) @@ -7,15 +7,13 @@ #include <simfqt/factory/FacBomAbstract.hpp> #include <simfqt/factory/FacServiceAbstract.hpp> #include <simfqt/factory/FacSupervisor.hpp> -#include <simfqt/service/Logger.hpp> namespace SIMFQT { 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/simfqt/simfqt/factory/FacSupervisor.hpp =================================================================== --- trunk/simfqt/simfqt/factory/FacSupervisor.hpp 2010-01-20 21:54:46 UTC (rev 4) +++ trunk/simfqt/simfqt/factory/FacSupervisor.hpp 2010-01-21 19:34:10 UTC (rev 5) @@ -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; Deleted: trunk/simfqt/simfqt/service/Logger.cpp =================================================================== --- trunk/simfqt/simfqt/service/Logger.cpp 2010-01-20 21:54:46 UTC (rev 4) +++ trunk/simfqt/simfqt/service/Logger.cpp 2010-01-21 19:34:10 UTC (rev 5) @@ -1,64 +0,0 @@ -// ////////////////////////////////////////////////////////////////////// -// Import section -// ////////////////////////////////////////////////////////////////////// -// STL -#include <iostream> -// Simfqt Logger -#include <simfqt/factory/FacSupervisor.hpp> -#include <simfqt/service/Logger.hpp> - -namespace SIMFQT { - - 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/simfqt/simfqt/service/Logger.hpp =================================================================== --- trunk/simfqt/simfqt/service/Logger.hpp 2010-01-20 21:54:46 UTC (rev 4) +++ trunk/simfqt/simfqt/service/Logger.hpp 2010-01-21 19:34:10 UTC (rev 5) @@ -1,94 +0,0 @@ -#ifndef __SIMFQT_SVC_LOGGER_HPP -#define __SIMFQT_SVC_LOGGER_HPP - -// ////////////////////////////////////////////////////////////////////// -// Import section -// ////////////////////////////////////////////////////////////////////// -// STL -#include <cassert> -#include <sstream> -#include <string> -// SIMFQT -#include <simfqt/SIMFQT_Types.hpp> - -// /////////////// LOG MACROS ///////////////// -#define SIMFQT_LOG_CORE(iLevel, iToBeLogged) \ - { std::ostringstream ostr; ostr << iToBeLogged; \ - SIMFQT::Logger::instance().log (iLevel, __LINE__, __FILE__, ostr.str()); } - -#define SIMFQT_LOG_CRITICAL(iToBeLogged) \ - SIMFQT_LOG_CORE (SIMFQT::LOG::CRITICAL, iToBeLogged) - -#define SIMFQT_LOG_ERROR(iToBeLogged) \ - SIMFQT_LOG_CORE (SIMFQT::LOG::ERROR, iToBeLogged) - -#define SIMFQT_LOG_NOTIFICATION(iToBeLogged) \ - SIMFQT_LOG_CORE (SIMFQT::LOG::NOTIFICATION, iToBeLogged) - -#define SIMFQT_LOG_WARNING(iToBeLogged) \ - SIMFQT_LOG_CORE (SIMFQT::LOG::WARNING, iToBeLogged) - -#define SIMFQT_LOG_DEBUG(iToBeLogged) \ - SIMFQT_LOG_CORE (SIMFQT::LOG::DEBUG, iToBeLogged) - -#define SIMFQT_LOG_VERBOSE(iToBeLogged) \ - SIMFQT_LOG_CORE (SIMFQT::LOG::VERBOSE, iToBeLogged) -// /////////// (END OF) LOG MACROS ///////////// - - -namespace SIMFQT { - - /** 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 // __SIMFQT_SVC_LOGGER_HPP Modified: trunk/simfqt/simfqt/service/SIMFQT_Service.cpp =================================================================== --- trunk/simfqt/simfqt/service/SIMFQT_Service.cpp 2010-01-20 21:54:46 UTC (rev 4) +++ trunk/simfqt/simfqt/service/SIMFQT_Service.cpp 2010-01-21 19:34:10 UTC (rev 5) @@ -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> // Simfqt #include <simfqt/basic/BasConst_SIMFQT_Service.hpp> #include <simfqt/command/FareQuoter.hpp> #include <simfqt/factory/FacSimfqtServiceContext.hpp> #include <simfqt/service/SIMFQT_ServiceContext.hpp> -#include <simfqt/service/Logger.hpp> #include <simfqt/SIMFQT_Service.hpp> namespace SIMFQT { // ////////////////////////////////////////////////////////////////////// - SIMFQT_Service:: - SIMFQT_Service (std::ostream& ioLogStream, const FareQuoteID_T& iFareQuoteID) - : _simfqtServiceContext (NULL) { - init (ioLogStream, iFareQuoteID); - } - - // ////////////////////////////////////////////////////////////////////// SIMFQT_Service::SIMFQT_Service () : _simfqtServiceContext (NULL) { assert (false); @@ -37,23 +28,38 @@ } // ////////////////////////////////////////////////////////////////////// + SIMFQT_Service::SIMFQT_Service (const FareQuoteID_T& iFareQuoteID) + : _simfqtServiceContext (NULL) { + + // Initialise the context + init (iFareQuoteID); + } + + // ////////////////////////////////////////////////////////////////////// + SIMFQT_Service::SIMFQT_Service (const stdair::BasLogParams& iLogParams, + const FareQuoteID_T& iFareQuoteID) + : _simfqtServiceContext (NULL) { + + // Set the log file + logInit (iLogParams); + + // Initialise the (remaining of the) context + init (iFareQuoteID); + } + + // ////////////////////////////////////////////////////////////////////// SIMFQT_Service::~SIMFQT_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 SIMFQT_Service::logInit (const stdair::BasLogParams& iLogParams) { + stdair::Logger::init (iLogParams); } // ////////////////////////////////////////////////////////////////////// - void SIMFQT_Service::init (std::ostream& ioLogStream, - const FareQuoteID_T& iFareQuoteID) { - // Set the log file - logInit (LOG::DEBUG, ioLogStream); - + void SIMFQT_Service::init (const FareQuoteID_T& iFareQuoteID) { // Initialise the context SIMFQT_ServiceContext& lSIMFQT_ServiceContext = FacSimfqtServiceContext::instance().create (iFareQuoteID); @@ -89,11 +95,11 @@ const double lPriceQuotingMeasure = lPriceQuotingChronometer.elapsed(); // DEBUG - SIMFQT_LOG_DEBUG ("Price quoting: " << lPriceQuotingMeasure << " - " + STDAIR_LOG_DEBUG ("Price quoting: " << lPriceQuotingMeasure << " - " << lSIMFQT_ServiceContext.display()); } catch (const std::exception& error) { - SIMFQT_LOG_ERROR ("Exception: " << error.what()); + STDAIR_LOG_ERROR ("Exception: " << error.what()); throw QuotingException(); } Modified: trunk/simfqt/simfqt/service/sources.mk =================================================================== --- trunk/simfqt/simfqt/service/sources.mk 2010-01-20 21:54:46 UTC (rev 4) +++ trunk/simfqt/simfqt/service/sources.mk 2010-01-21 19:34:10 UTC (rev 5) @@ -1,7 +1,5 @@ svc_h_sources = $(top_srcdir)/simfqt/service/ServiceAbstract.hpp \ - $(top_srcdir)/simfqt/service/SIMFQT_ServiceContext.hpp \ - $(top_srcdir)/simfqt/service/Logger.hpp + $(top_srcdir)/simfqt/service/SIMFQT_ServiceContext.hpp svc_cc_sources = $(top_srcdir)/simfqt/service/ServiceAbstract.cpp \ $(top_srcdir)/simfqt/service/SIMFQT_ServiceContext.cpp \ - $(top_srcdir)/simfqt/service/Logger.cpp \ $(top_srcdir)/simfqt/service/SIMFQT_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 21:55:31
|
Revision: 4 http://simfqt.svn.sourceforge.net/simfqt/?rev=4&view=rev Author: denis_arnaud Date: 2010-01-20 21:54:46 +0000 (Wed, 20 Jan 2010) Log Message: ----------- [Conf] Added the stdair/service/Makefile build. Modified Paths: -------------- trunk/simfqt/configure.ac Modified: trunk/simfqt/configure.ac =================================================================== --- trunk/simfqt/configure.ac 2010-01-20 17:33:33 UTC (rev 3) +++ trunk/simfqt/configure.ac 2010-01-20 21:54:46 UTC (rev 4) @@ -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 simfqt/Makefile simfqt/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:39
|
Revision: 3 http://simfqt.svn.sourceforge.net/simfqt/?rev=3&view=rev Author: denis_arnaud Date: 2010-01-20 17:33:33 +0000 (Wed, 20 Jan 2010) Log Message: ----------- [Dev] Removed the BasChronometer class, as it is now given by the StdAir library. Modified Paths: -------------- trunk/simfqt/simfqt/basic/sources.mk trunk/simfqt/simfqt/core/Makefile.am trunk/simfqt/simfqt/service/SIMFQT_Service.cpp Removed Paths: ------------- trunk/simfqt/simfqt/basic/BasChronometer.cpp trunk/simfqt/simfqt/basic/BasChronometer.hpp Deleted: trunk/simfqt/simfqt/basic/BasChronometer.cpp =================================================================== --- trunk/simfqt/simfqt/basic/BasChronometer.cpp 2009-12-31 10:45:52 UTC (rev 2) +++ trunk/simfqt/simfqt/basic/BasChronometer.cpp 2010-01-20 17:33:33 UTC (rev 3) @@ -1,50 +0,0 @@ -// ////////////////////////////////////////////////////////////////////// -// Import section -// ////////////////////////////////////////////////////////////////////// -// STL -#include <cassert> -// Simfqt -#include <simfqt/basic/BasChronometer.hpp> -#include <simfqt/service/Logger.hpp> - -namespace SIMFQT { - - // ////////////////////////////////////////////////////////////////////// - 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()); - - /*SIMFQT_LOG_DEBUG ("Elapsed: " << lElapsedTime - << "; (micros): " - << lElapsedTimeInMicroSeconds / 1e6);*/ - - // The elapsed time given in return is expressed in seconds - return (lElapsedTimeInMicroSeconds / 1e6); - } - -} Deleted: trunk/simfqt/simfqt/basic/BasChronometer.hpp =================================================================== --- trunk/simfqt/simfqt/basic/BasChronometer.hpp 2009-12-31 10:45:52 UTC (rev 2) +++ trunk/simfqt/simfqt/basic/BasChronometer.hpp 2010-01-20 17:33:33 UTC (rev 3) @@ -1,40 +0,0 @@ -#ifndef __SIMFQT_COM_BAS_BASCHRONOMETER_HPP -#define __SIMFQT_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 SIMFQT { - - /** 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 // __SIMFQT_COM_BAS_BASCHRONOMETER_HPP Modified: trunk/simfqt/simfqt/basic/sources.mk =================================================================== --- trunk/simfqt/simfqt/basic/sources.mk 2009-12-31 10:45:52 UTC (rev 2) +++ trunk/simfqt/simfqt/basic/sources.mk 2010-01-20 17:33:33 UTC (rev 3) @@ -1,5 +1,3 @@ bas_h_sources = $(top_srcdir)/simfqt/basic/BasConst_General.hpp \ - $(top_srcdir)/simfqt/basic/BasConst_SIMFQT_Service.hpp \ - $(top_srcdir)/simfqt/basic/BasChronometer.hpp -bas_cc_sources = $(top_srcdir)/simfqt/basic/BasConst.cpp \ - $(top_srcdir)/simfqt/basic/BasChronometer.cpp + $(top_srcdir)/simfqt/basic/BasConst_SIMFQT_Service.hpp +bas_cc_sources = $(top_srcdir)/simfqt/basic/BasConst.cpp Modified: trunk/simfqt/simfqt/core/Makefile.am =================================================================== --- trunk/simfqt/simfqt/core/Makefile.am 2009-12-31 10:45:52 UTC (rev 2) +++ trunk/simfqt/simfqt/core/Makefile.am 2010-01-20 17:33:33 UTC (rev 3) @@ -21,6 +21,7 @@ $(top_builddir)/simfqt/service/libsvc.la libsimfqt_la_LDFLAGS = \ $(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \ + $(top_builddir)/stdair/core/libstdair.la \ -version-info $(GENERIC_LIBRARY_VERSION) # Header files Modified: trunk/simfqt/simfqt/service/SIMFQT_Service.cpp =================================================================== --- trunk/simfqt/simfqt/service/SIMFQT_Service.cpp 2009-12-31 10:45:52 UTC (rev 2) +++ trunk/simfqt/simfqt/service/SIMFQT_Service.cpp 2010-01-20 17:33:33 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> // Simfqt #include <simfqt/basic/BasConst_SIMFQT_Service.hpp> -#include <simfqt/basic/BasChronometer.hpp> #include <simfqt/command/FareQuoter.hpp> #include <simfqt/factory/FacSimfqtServiceContext.hpp> #include <simfqt/service/SIMFQT_ServiceContext.hpp> @@ -82,10 +83,9 @@ lSIMFQT_ServiceContext.getFareQuoteID(); // Delegate the price quotation to the dedicated command - BasChronometer lPriceQuotingChronometer; + stdair::BasChronometer lPriceQuotingChronometer; lPriceQuotingChronometer.start(); - oPrice = - FareQuoter::priceQuote (lFareQuoteID, iAirlineCode, iPartySize); + oPrice = FareQuoter::priceQuote (lFareQuoteID, iAirlineCode, iPartySize); const double lPriceQuotingMeasure = lPriceQuotingChronometer.elapsed(); // DEBUG This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <den...@us...> - 2009-12-31 10:46:03
|
Revision: 2 http://simfqt.svn.sourceforge.net/simfqt/?rev=2&view=rev Author: denis_arnaud Date: 2009-12-31 10:45:52 +0000 (Thu, 31 Dec 2009) Log Message: ----------- [Dev] First working version (still very simple). Added Paths: ----------- trunk/simfqt/AUTHORS trunk/simfqt/COPYING trunk/simfqt/ChangeLog trunk/simfqt/Makefile.am trunk/simfqt/Makefile.common trunk/simfqt/NEWS trunk/simfqt/README trunk/simfqt/autogen.sh trunk/simfqt/configure.ac trunk/simfqt/simfqt/Makefile.am trunk/simfqt/simfqt/SIMFQT_Service.hpp trunk/simfqt/simfqt/SIMFQT_Types.hpp trunk/simfqt/simfqt/basic/ trunk/simfqt/simfqt/basic/BasChronometer.cpp trunk/simfqt/simfqt/basic/BasChronometer.hpp trunk/simfqt/simfqt/basic/BasConst.cpp trunk/simfqt/simfqt/basic/BasConst_General.hpp trunk/simfqt/simfqt/basic/BasConst_SIMFQT_Service.hpp trunk/simfqt/simfqt/basic/Makefile.am trunk/simfqt/simfqt/basic/sources.mk trunk/simfqt/simfqt/batches/ trunk/simfqt/simfqt/batches/Makefile.am trunk/simfqt/simfqt/batches/sources.mk trunk/simfqt/simfqt/bom/ trunk/simfqt/simfqt/bom/BomAbstract.cpp trunk/simfqt/simfqt/bom/BomAbstract.hpp trunk/simfqt/simfqt/bom/Makefile.am trunk/simfqt/simfqt/bom/sources.mk trunk/simfqt/simfqt/command/ trunk/simfqt/simfqt/command/FareQuoter.cpp trunk/simfqt/simfqt/command/FareQuoter.hpp trunk/simfqt/simfqt/command/Makefile.am trunk/simfqt/simfqt/command/sources.mk trunk/simfqt/simfqt/config/ trunk/simfqt/simfqt/config/Makefile.am trunk/simfqt/simfqt/config_msvc.h trunk/simfqt/simfqt/core/ trunk/simfqt/simfqt/core/Makefile.am trunk/simfqt/simfqt/core/sources.mk trunk/simfqt/simfqt/factory/ trunk/simfqt/simfqt/factory/FacBomAbstract.cpp trunk/simfqt/simfqt/factory/FacBomAbstract.hpp trunk/simfqt/simfqt/factory/FacServiceAbstract.cpp trunk/simfqt/simfqt/factory/FacServiceAbstract.hpp trunk/simfqt/simfqt/factory/FacSimfqtServiceContext.cpp trunk/simfqt/simfqt/factory/FacSimfqtServiceContext.hpp trunk/simfqt/simfqt/factory/FacSupervisor.cpp trunk/simfqt/simfqt/factory/FacSupervisor.hpp trunk/simfqt/simfqt/factory/Makefile.am trunk/simfqt/simfqt/factory/sources.mk trunk/simfqt/simfqt/service/ trunk/simfqt/simfqt/service/Logger.cpp trunk/simfqt/simfqt/service/Logger.hpp trunk/simfqt/simfqt/service/Makefile.am trunk/simfqt/simfqt/service/SIMFQT_Service.cpp trunk/simfqt/simfqt/service/SIMFQT_ServiceContext.cpp trunk/simfqt/simfqt/service/SIMFQT_ServiceContext.hpp trunk/simfqt/simfqt/service/ServiceAbstract.cpp trunk/simfqt/simfqt/service/ServiceAbstract.hpp trunk/simfqt/simfqt/service/sources.mk trunk/simfqt/simfqt-config.in trunk/simfqt/simfqt.m4.in trunk/simfqt/simfqt.pc.in trunk/simfqt/simfqt.spec.in trunk/simfqt/test/Makefile.am trunk/simfqt/test/simfqt/ trunk/simfqt/test/simfqt/Makefile.am trunk/simfqt/test/simfqt/priceQuote.cpp Property Changed: ---------------- trunk/simfqt/ trunk/simfqt/simfqt/ trunk/simfqt/test/ Property changes on: trunk/simfqt ___________________________________________________________________ Added: svn:ignore + autom4te.cache configure config.status config.log libtool aclocal.m4 Makefile.in Makefile INSTALL COPYING simfqt-config simfqt.spec simfqt.m4 simfqt.pc simfqt-html-doc-*.tar.* simfqt-*.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/simfqt/COPYING =================================================================== --- trunk/simfqt/COPYING (rev 0) +++ trunk/simfqt/COPYING 2009-12-31 10:45:52 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/simfqt/Makefile.am =================================================================== --- trunk/simfqt/Makefile.am (rev 0) +++ trunk/simfqt/Makefile.am 2009-12-31 10:45:52 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/simfqt/Makefile.common =================================================================== --- trunk/simfqt/Makefile.common (rev 0) +++ trunk/simfqt/Makefile.common 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,2 @@ +@SET_MAKE@ +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) Added: trunk/simfqt/autogen.sh =================================================================== --- trunk/simfqt/autogen.sh (rev 0) +++ trunk/simfqt/autogen.sh 2009-12-31 10:45:52 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/simfqt/autogen.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/simfqt/configure.ac =================================================================== --- trunk/simfqt/configure.ac (rev 0) +++ trunk/simfqt/configure.ac 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,348 @@ +# Process this file with autoconf to produce a configure script +#------------------------------------------------------------------- +AC_PREREQ(2.59) +AC_COPYRIGHT([Copyright (C) 2007-2010 Denis Arnaud <den...@us...>]) +AC_INIT([SIMFQT],[99.99.99],[den...@us...],[simfqt]) +AC_CONFIG_HEADER([simfqt/config.h]) +AC_CONFIG_SRCDIR([simfqt/basic/BasConst.cpp]) +AC_CONFIG_AUX_DIR([config]) +AM_INIT_AUTOMAKE +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="0:1:0" +# | | | +# +------+ | +---+ +# | | | +# current:revision:age +# | | | +# | | +- increment if interfaces have been added; +# | | set to zero if interfaces have been +# | | removed or changed +# | +- increment if source code has changed; +# | set to zero if current is incremented +# +- increment if interfaces have been added, removed +# or changed +AC_SUBST(GENERIC_LIBRARY_VERSION) + +# Upload command for SourceForge +UPLOAD_COMMAND="ncftpput -v upload.sourceforge.net /incoming" +AC_SUBST(UPLOAD_COMMAND) + +# Check for host and disable building a shared library in Windows +AC_CANONICAL_HOST +case $host in + *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*) + AC_DISABLE_SHARED + AC_ENABLE_STATIC + ;; + *) + AC_ENABLE_SHARED + AC_DISABLE_STATIC + ;; +esac + +# Checks for programs +save_CXXFLAGS="$CXXFLAGS" +AC_PROG_CXX +AC_PROG_CXXCPP +CXXFLAGS="$save_CXXFLAGS" +AC_PROG_INSTALL +AC_PROG_LIBTOOL +AC_PROG_LN_S +AC_PROG_MAKE_SET + +# Set default language to C++ +AC_LANG([C++]) + +# Check for exceptions switch +AC_ARG_ENABLE(exceptions, + [AS_HELP_STRING([--enable-exceptions], + [enable exceptions handling mechanism])], + [AC_DEFINE([SIMFQT_EXCEPTIONS], [1], + [Define if you want exceptions handling])]) +test "x$enable_exceptions" != xno && enable_exceptions=yes +test "x$ax_cv_boost_date_time" != xno && enable_exceptions=yes + +# Check for info pages +AC_ARG_ENABLE(info-doc, + [AS_HELP_STRING([--disable-info-doc], + [do not generate Info documentation])]) +test "x$enable_info_doc" != xno && enable_info_doc=yes + + +# Check for html-doc switch +AC_ARG_ENABLE(html-doc, + [AS_HELP_STRING([--disable-html-doc], + [do not generate HTML documentation])]) +test "x$enable_html_doc" != xno && enable_html_doc=yes + + +# Provide --with-docdir +AC_ARG_WITH(docdir, + [AS_HELP_STRING([--with-docdir=DIR], + [set documentation directory to DIR])], + [DOC_DIR="$withval"], + [DOC_DIR=""]) +if test "x$DOC_DIR" != x; then + docdir="$DOC_DIR" +else + docdir="${datadir}/doc/$PACKAGE-$VERSION" +fi +AC_SUBST(docdir) + + +# Default compilation flags +if test -z "${CXXFLAGS}"; then + CXXFLAGS="-g -Wall" +fi + + +# ----------------------------------------------------------- +# 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 +AC_SUBST(PYTHON_VERSION) +AC_SUBST(PYTHON_LIBS) +AC_SUBST(PYTHON_CFLAGS) +AC_SUBST(PYTHON_ADD_LIBS) + +# ----------------------------------------------------------- +# 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) + +# ----------------------------------------------------------- +# OpenMPI: http://www.open-mpi.org +# ----------------------------------------------------------- +#AX_OPENMPI +#AC_SUBST(OPENMPI_VERSION) +#AC_SUBST(OPENMPI_CFLAGS) +#AC_SUBST(OPENMPI_LIBS) + +# --------------------------------------------------------------- +# Boost (STL Extensions): http://www.boost.org +# --------------------------------------------------------------- +AX_BOOST([1.33]) +AC_SUBST(BOOST_VERSION) +AC_SUBST(BOOST_CFLAGS) +AC_SUBST(BOOST_LIBS) +AC_SUBST(BOOST_DATE_TIME_LIB) +AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) +AC_SUBST(BOOST_FILESYSTEM_LIB) +AC_SUBST(BOOST_THREAD_LIB) +AC_SUBST(BOOST_PYTHON_LIB) +AC_SUBST(BOOST_ASIO_LIB) +AC_SUBST(BOOST_MPI_LIB) +AC_SUBST(BOOST_MPI_PYTHON_LIB) + +# -------------------------------------------------------------------- +# Support for MySQL (C client API): http://www.mysql.org +# -------------------------------------------------------------------- +AX_MYSQL +AC_SUBST(MYSQL_VERSION) +AC_SUBST(MYSQL_CFLAGS) +AC_SUBST(MYSQL_LIBS) + +# -------------------------------------------------------- +# SOCI (Database API: http://soci.sourceforge.net) +# -------------------------------------------------------- +AX_SOCI([3.0]) +AC_SUBST(SOCI_VERSION) +AC_SUBST(SOCI_CFLAGS) +AC_SUBST(SOCI_LIBS) + + +# ------------------------------------------------------------------- +# Support for documentation +# ------------------------------------------------------------------- +# Checks for documentation build tools +#AC_CHECK_PROG([texinfo_ok], [texinfo], [yes], [no]) +#if test "x$enable_info_doc" != xno; then +# test "x$texinfo_ok" != xyes && enable_info_doc=no +# AC_PATH_PROG([PERL], [perl], []) +#fi +AM_CONDITIONAL([INFO_DOC], [test "x$enable_info_doc" = xyes]) + +# Checks for documentation build tools +AC_CHECK_PROG([doxygen_ok], [doxygen], [yes], [no]) +AC_CHECK_PROG([latex_ok], [latex], [yes], [no]) +AC_CHECK_PROG([dvips_ok], [dvips], [yes], [no]) +AC_CHECK_PROG([gs_ok], [gs], [yes], [no]) +if test "x$enable_html_doc" != xno; then + test "x$doxygen_ok" != xyes && enable_html_doc=no + test "x$latex_ok" != xyes && enable_html_doc=no + test "x$dvips_ok" != xyes && enable_html_doc=no + test "x$gs_ok" != xyes && enable_html_doc=no + AC_PATH_PROG([PERL], [perl], []) +fi +AM_CONDITIONAL([HTML_DOC], [test "x$enable_html_doc" = xyes]) + + +# Check for diff program used for tests +AC_CHECK_PROG([diff_ok], [diff], [yes], [no]) +AC_CHECK_PROG([sed_ok], [sed], [yes], [no]) +enable_tests=yes +test "x$diff_ok" != xyes && enable_tests=no +test "x$sed_ok" != xyes && enable_tests=no +AM_CONDITIONAL([RUN_TESTS], [test "x$enable_tests" = xyes]) + + +# Checks for header files +AC_HEADER_STDC +AC_HEADER_TIME +AC_CHECK_HEADERS([cmath \ + deque \ + fstream \ + iomanip \ + iostream \ + sstream \ + limits \ + list \ + set \ + vector \ + map \ + queue \ + stdexcept \ + string]) + + +# -------------------------------------------------------- +# I18n (internationalisation) with GNU Gettext +# -------------------------------------------------------- +#AM_GNU_GETTEXT([external], [need-formatstring-macros]) +#AM_GNU_GETTEXT_VERSION([0.14]) +# Force the usage of the i18n feature: on 64bit architecture, +# as gettext uses conversions from int to char*, there may be +# some issues. However, for regular translation (e.g., to German +# or French), the PO files are correctly transformed into GMO. +USE_NLS=yes + + +# Define configured files +AC_CONFIG_FILES( + Makefile + simfqt-config + simfqt.pc + simfqt.spec + simfqt.m4 + stdair/Makefile + stdair/basic/Makefile + stdair/bom/Makefile + stdair/factory/Makefile + stdair/config/Makefile + stdair/core/Makefile + simfqt/Makefile + simfqt/basic/Makefile + simfqt/bom/Makefile + simfqt/factory/Makefile + simfqt/command/Makefile + simfqt/service/Makefile + simfqt/config/Makefile + simfqt/core/Makefile + simfqt/batches/Makefile + extracppunit/Makefile + test/Makefile + test/samples/Makefile + test/stdair/Makefile + test/simfqt/Makefile +) +AC_OUTPUT + +echo " +------------------------------------------------------------------------------ +$PACKAGE-$VERSION library configuration: +------------------------------------------------------------------------------ + +Directories: + - prefix ............ : ${prefix} + - exec_prefix ....... : ${exec_prefix} + - includedir ........ : ${includedir} + - libdir ............ : ${libdir} + - docdir ............ : ${docdir} + - mandir ............ : ${mandir} + - infodir ........... : ${infodir} + +Switches: + - exceptions ........ : ${enable_exceptions} + - use-nls ........... : ${USE_NLS} + - info-doc .......... : ${enable_info_doc} + - html-doc .......... : ${enable_html_doc} + - shared ............ : ${enable_shared} + - static ............ : ${enable_static} + +Documentation tools: + - texinfo ........... : ${texinfo_ok} + - doxygen ........... : ${doxygen_ok} + - latex ............. : ${latex_ok} + - dvips ............. : ${dvips_ok} + - ghostscript ....... : ${gs_ok} + +Testing tools: + - diff .............. : ${diff_ok} + - sed ............... : ${sed_ok} + +Compiler/linker flags/libs/defs: + - CXX ............... : ${CXX} + - CXXFLAGS .......... : ${CXXFLAGS} + - CPPFLAGS .......... : ${CPPFLAGS} + - LDFLAGS ........... : ${LDFLAGS} + - LIBS .............. : ${LIBS} + +External libraries: + - Python ............. : + o PYTHON_version ... : ${PYTHON_VERSION} + o PYTHON_CFLAGS .... : ${PYTHON_CFLAGS} + o PYTHON_LIBS ...... : ${PYTHON_LIBS} + o PYTHON_ADD_LIBS .. : ${PYTHON_ADD_LIBS} + + - Boost ............. : + o BOOST_VERSION ... : ${BOOST_VERSION} + o BOOST_CFLAGS .... : ${BOOST_CFLAGS} + o BOOST_LIBS ...... : ${BOOST_LIBS} + o BOOST_DT_LIB .... : ${BOOST_DATE_TIME_LIB} + o BOOST_PO_LIB .... : ${BOOST_PROGRAM_OPTIONS_LIB} + o BOOST_FS_LIB .... : ${BOOST_FILESYSTEM_LIB} + o BOOST_THRD_LIB .. : ${BOOST_THREAD_LIB} + o BOOST_PY_LIB .... : ${BOOST_PYTHON_LIB} + o BOOST_ASIO_LIB .. : ${BOOST_ASIO_LIB} + o BOOST_MPI_LIB ... : ${BOOST_MPI_LIB} + o BOOST_MPIPY_LIB . : ${BOOST_MPI_PYTHON_LIB} + + - MySQL ............. : + o MYSQL_version ... : ${MYSQL_VERSION} + o MYSQL_CFLAGS .... : ${MYSQL_CFLAGS} + o MYSQL_LIBS ...... : ${MYSQL_LIBS} + + - Soci .............. : + o SOCI_VERSION .... : ${SOCI_VERSION} + o SOCI_CFLAGS ..... : ${SOCI_CFLAGS} + o SOCI_LIBS ....... : ${SOCI_LIBS} + + - CPPUNIT ........... : + o CPPUNIT_VERSION . : ${CPPUNIT_VERSION} + o CPPUNIT_CFLAGS .. : ${CPPUNIT_CFLAGS} + o CPPUNIT_LIBS .... : ${CPPUNIT_LIBS} + +------------------------------------------------------------------------------ +Now type 'make && make install' to build and install $PACKAGE-$VERSION library +------------------------------------------------------------------------------ +" Property changes on: trunk/simfqt/simfqt ___________________________________________________________________ Added: svn:ignore + .deps .libs Makefile.in Makefile stamp-h1 config.h config.h.in Added: trunk/simfqt/simfqt/Makefile.am =================================================================== --- trunk/simfqt/simfqt/Makefile.am (rev 0) +++ trunk/simfqt/simfqt/Makefile.am 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,16 @@ +# simfqt +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 Added: trunk/simfqt/simfqt/SIMFQT_Service.hpp =================================================================== --- trunk/simfqt/simfqt/SIMFQT_Service.hpp (rev 0) +++ trunk/simfqt/simfqt/SIMFQT_Service.hpp 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,57 @@ +#ifndef __SIMFQT_SVC_SIMFQT_SERVICE_HPP +#define __SIMFQT_SVC_SIMFQT_SERVICE_HPP + +// ////////////////////////////////////////////////////////////////////// +// Import section +// ////////////////////////////////////////////////////////////////////// +// STL +#include <iosfwd> +#include <string> +// Simfqt +#include <simfqt/SIMFQT_Types.hpp> + +namespace SIMFQT { + + // Forward declaration + class SIMFQT_ServiceContext; + + + /** Interface for the SIMFQT Services. */ + class SIMFQT_Service { + public: + // /////////// Business Methods ///////////// + /** Perform a price quotation for the travel request. */ + Price_T priceQuote (const AirlineCode_T&, const PartySize_T&); + + + // ////////// Constructors and destructors ////////// + /** Constructor. + @param std::ostream& Output log stream (for instance, std::cout) + @param FareQuoteID_T& ID of the Fare Quote system. */ + SIMFQT_Service (std::ostream& ioLogStream, const FareQuoteID_T&); + + /** Destructor. */ + ~SIMFQT_Service(); + + + private: + // /////// Construction and Destruction helper methods /////// + /** Default constructor. */ + SIMFQT_Service (); + /** Default copy constructor. */ + SIMFQT_Service (const SIMFQT_Service&); + + /** Initialise. */ + void init (std::ostream& ioLogStream, const FareQuoteID_T&); + + /** Finalise. */ + void finalise (); + + + private: + // ///////// Service Context ///////// + /** Simfqt context. */ + SIMFQT_ServiceContext* _simfqtServiceContext; + }; +} +#endif // __SIMFQT_SVC_SIMFQT_SERVICE_HPP Added: trunk/simfqt/simfqt/SIMFQT_Types.hpp =================================================================== --- trunk/simfqt/simfqt/SIMFQT_Types.hpp (rev 0) +++ trunk/simfqt/simfqt/SIMFQT_Types.hpp 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,66 @@ +#ifndef __SIMFQT_SIMFQT_TYPES_HPP +#define __SIMFQT_SIMFQT_TYPES_HPP + +// ////////////////////////////////////////////////////////////////////// +// Import section +// ////////////////////////////////////////////////////////////////////// +// STL +#include <exception> +#include <string> + +namespace SIMFQT { + + // ///////// 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 QuotingException : public RootException { + }; + + + // /////////////// Log ///////////// + /** Level of logs. */ + namespace LOG { + typedef enum { + CRITICAL = 0, + ERROR, + NOTIFICATION, + WARNING, + DEBUG, + VERBOSE, + LAST_VALUE + } EN_LogLevel; + } + + + // //////// Type definitions ///////// + /** ID for the Fare Quote system. */ + typedef std::string FareQuoteID_T; + + /** Price, in Euros. */ + typedef double Price_T; + + /** IATA code of an airline. */ + typedef std::string AirlineCode_T; + + /** Number of passengers (in a group) for a booking. */ + typedef unsigned short PartySize_T; + +} +#endif // __SIMFQT_SIMFQT_TYPES_HPP + Property changes on: trunk/simfqt/simfqt/basic ___________________________________________________________________ Added: svn:ignore + .deps .libs Makefile.in Makefile Added: trunk/simfqt/simfqt/basic/BasChronometer.cpp =================================================================== --- trunk/simfqt/simfqt/basic/BasChronometer.cpp (rev 0) +++ trunk/simfqt/simfqt/basic/BasChronometer.cpp 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,50 @@ +// ////////////////////////////////////////////////////////////////////// +// Import section +// ////////////////////////////////////////////////////////////////////// +// STL +#include <cassert> +// Simfqt +#include <simfqt/basic/BasChronometer.hpp> +#include <simfqt/service/Logger.hpp> + +namespace SIMFQT { + + // ////////////////////////////////////////////////////////////////////// + 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()); + + /*SIMFQT_LOG_DEBUG ("Elapsed: " << lElapsedTime + << "; (micros): " + << lElapsedTimeInMicroSeconds / 1e6);*/ + + // The elapsed time given in return is expressed in seconds + return (lElapsedTimeInMicroSeconds / 1e6); + } + +} Added: trunk/simfqt/simfqt/basic/BasChronometer.hpp =================================================================== --- trunk/simfqt/simfqt/basic/BasChronometer.hpp (rev 0) +++ trunk/simfqt/simfqt/basic/BasChronometer.hpp 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,40 @@ +#ifndef __SIMFQT_COM_BAS_BASCHRONOMETER_HPP +#define __SIMFQT_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 SIMFQT { + + /** 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 // __SIMFQT_COM_BAS_BASCHRONOMETER_HPP Added: trunk/simfqt/simfqt/basic/BasConst.cpp =================================================================== --- trunk/simfqt/simfqt/basic/BasConst.cpp (rev 0) +++ trunk/simfqt/simfqt/basic/BasConst.cpp 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,12 @@ +// ////////////////////////////////////////////////////////////////////// +// Import section +// ////////////////////////////////////////////////////////////////////// +#include <simfqt/basic/BasConst_General.hpp> +#include <simfqt/basic/BasConst_SIMFQT_Service.hpp> + +namespace SIMFQT { + + /** Default ID for the SIMFQT_Service. */ + const std::string DEFAULT_FARE_QUOTER_ID = "IATA"; + +} Added: trunk/simfqt/simfqt/basic/BasConst_General.hpp =================================================================== --- trunk/simfqt/simfqt/basic/BasConst_General.hpp (rev 0) +++ trunk/simfqt/simfqt/basic/BasConst_General.hpp 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,11 @@ +#ifndef __SIMFQT_BAS_BASCONST_GENERAL_HPP +#define __SIMFQT_BAS_BASCONST_GENERAL_HPP + +// ////////////////////////////////////////////////////////////////////// +// Import section +// ////////////////////////////////////////////////////////////////////// + +namespace SIMFQT { + +} +#endif // __SIMFQT_BAS_BASCONST_GENERAL_HPP Added: trunk/simfqt/simfqt/basic/BasConst_SIMFQT_Service.hpp =================================================================== --- trunk/simfqt/simfqt/basic/BasConst_SIMFQT_Service.hpp (rev 0) +++ trunk/simfqt/simfqt/basic/BasConst_SIMFQT_Service.hpp 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,15 @@ +#ifndef __SIMFQT_BAS_BASCONST_SIMFQT_SERVICE_HPP +#define __SIMFQT_BAS_BASCONST_SIMFQT_SERVICE_HPP + +// ////////////////////////////////////////////////////////////////////// +// Import section +// ////////////////////////////////////////////////////////////////////// +#include <string> + +namespace SIMFQT { + + /** Default ID for the SIMFQT_Service. */ + extern const std::string DEFAULT_FARE_QUOTER_ID; + +} +#endif // __SIMFQT_BAS_BASCONST_SIMFQT_SERVICE_HPP Added: trunk/simfqt/simfqt/basic/Makefile.am =================================================================== --- trunk/simfqt/simfqt/basic/Makefile.am (rev 0) +++ trunk/simfqt/simfqt/basic/Makefile.am 2009-12-31 10:45:52 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/simfqt/simfqt/basic/sources.mk =================================================================== --- trunk/simfqt/simfqt/basic/sources.mk (rev 0) +++ trunk/simfqt/simfqt/basic/sources.mk 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,5 @@ +bas_h_sources = $(top_srcdir)/simfqt/basic/BasConst_General.hpp \ + $(top_srcdir)/simfqt/basic/BasConst_SIMFQT_Service.hpp \ + $(top_srcdir)/simfqt/basic/BasChronometer.hpp +bas_cc_sources = $(top_srcdir)/simfqt/basic/BasConst.cpp \ + $(top_srcdir)/simfqt/basic/BasChronometer.cpp Property changes on: trunk/simfqt/simfqt/batches ___________________________________________________________________ Added: svn:ignore + .deps .libs Makefile.in Makefile Added: trunk/simfqt/simfqt/batches/Makefile.am =================================================================== --- trunk/simfqt/simfqt/batches/Makefile.am (rev 0) +++ trunk/simfqt/simfqt/batches/Makefile.am 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,15 @@ +# simfqt/batches +include $(top_srcdir)/Makefile.common +include $(srcdir)/sources.mk + +## Source directory + +MAINTAINERCLEANFILES = Makefile.in + +# Binaries (batches) +bin_PROGRAMS = + +#simfqt_SOURCES = $(batches_h_sources) $(batches_cc_sources) +#simfqt_CXXFLAGS = $(BOOST_CFLAGS) +#simfqt_LDADD = +#simfqt_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(top_builddir)/simfqt/core/libsimfqt.la Added: trunk/simfqt/simfqt/batches/sources.mk =================================================================== --- trunk/simfqt/simfqt/batches/sources.mk (rev 0) +++ trunk/simfqt/simfqt/batches/sources.mk 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,2 @@ +batches_h_sources = +batches_cc_sources = Property changes on: trunk/simfqt/simfqt/bom ___________________________________________________________________ Added: svn:ignore + .deps .libs Makefile.in Makefile Added: trunk/simfqt/simfqt/bom/BomAbstract.cpp =================================================================== --- trunk/simfqt/simfqt/bom/BomAbstract.cpp (rev 0) +++ trunk/simfqt/simfqt/bom/BomAbstract.cpp 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,9 @@ +// ////////////////////////////////////////////////////////////////////// +// Import section +// ////////////////////////////////////////////////////////////////////// +// SIMFQT +#include <simfqt/bom/BomAbstract.hpp> + +namespace SIMFQT { + +} Added: trunk/simfqt/simfqt/bom/BomAbstract.hpp =================================================================== --- trunk/simfqt/simfqt/bom/BomAbstract.hpp (rev 0) +++ trunk/simfqt/simfqt/bom/BomAbstract.hpp 2009-12-31 10:45:52 UTC (rev 2) @@ -0,0 +1,91 @@ +#ifndef __SIMFQT_BOM_BOMABSTRACT_HPP +#define __SIMFQT_BOM_BOMABSTRACT_HPP + +// ////////////////////////////////////////////////////////////////////// +// Import section +// ////////////////////////////////////////////////////////////////////// +// STL +#include <iosfwd> +#include <string> + +namespace SIMFQT { + + /** 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 ... [truncated message content] |