Menu
▾
▴
[Simfqt-svn] SF.net SVN: simfqt:[18] trunk/simfqt/simfqt
|
From: <gsa...@us...> - 2010-11-02 16:01:35
|
Revision: 18
http://simfqt.svn.sourceforge.net/simfqt/?rev=18&view=rev
Author: gsabatier
Date: 2010-11-02 16:01:27 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
The simfqt parser files are now committed
Modified Paths:
--------------
trunk/simfqt/simfqt/SIMFQT_Service.hpp
trunk/simfqt/simfqt/SIMFQT_Types.hpp
trunk/simfqt/simfqt/batches/Makefile.am
trunk/simfqt/simfqt/batches/sources.mk
trunk/simfqt/simfqt/bom/Makefile.am
trunk/simfqt/simfqt/bom/sources.mk
trunk/simfqt/simfqt/command/FareQuoter.cpp
trunk/simfqt/simfqt/command/FareQuoter.hpp
trunk/simfqt/simfqt/command/sources.mk
trunk/simfqt/simfqt/factory/FacSupervisor.cpp
trunk/simfqt/simfqt/factory/FacSupervisor.hpp
trunk/simfqt/simfqt/factory/sources.mk
trunk/simfqt/simfqt/service/SIMFQT_Service.cpp
Added Paths:
-----------
trunk/simfqt/simfqt/basic/BasParserTypes.hpp
trunk/simfqt/simfqt/batches/simfqt.cpp
trunk/simfqt/simfqt/batches/simfqt.log
trunk/simfqt/simfqt/bom/FareRuleStruct.cpp
trunk/simfqt/simfqt/bom/FareRuleStruct.hpp
trunk/simfqt/simfqt/command/FareParser.cpp
trunk/simfqt/simfqt/command/FareParser.hpp
trunk/simfqt/simfqt/command/FareParserHelper.cpp
trunk/simfqt/simfqt/command/FareParserHelper.hpp
trunk/simfqt/simfqt/command/FareRuleGenerator.cpp
trunk/simfqt/simfqt/command/FareRuleGenerator.hpp
Removed Paths:
-------------
trunk/simfqt/simfqt/bom/BomAbstract.cpp
trunk/simfqt/simfqt/bom/BomAbstract.hpp
trunk/simfqt/simfqt/factory/FacBomAbstract.cpp
trunk/simfqt/simfqt/factory/FacBomAbstract.hpp
Property Changed:
----------------
trunk/simfqt/simfqt/batches/
Modified: trunk/simfqt/simfqt/SIMFQT_Service.hpp
===================================================================
--- trunk/simfqt/simfqt/SIMFQT_Service.hpp 2010-11-01 10:54:47 UTC (rev 17)
+++ trunk/simfqt/simfqt/SIMFQT_Service.hpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -26,11 +26,7 @@
/** 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&);
-
-
+ // /////////// Business Methods /////////////
// ////////////////// Constructors and Destructors //////////////////
/** Constructor.
<br>The init() method is called; see the corresponding documentation
Modified: trunk/simfqt/simfqt/SIMFQT_Types.hpp
===================================================================
--- trunk/simfqt/simfqt/SIMFQT_Types.hpp 2010-11-01 10:54:47 UTC (rev 17)
+++ trunk/simfqt/simfqt/SIMFQT_Types.hpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -5,13 +5,25 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STL
-#include <exception>
+#include <vector>
#include <string>
+// StdAir
namespace SIMFQT {
// ///////// Exceptions ///////////
class RootException : public std::exception {
+ public:
+ /** Constructors. */
+ RootException (const std::string& iWhat) : _what (iWhat) {}
+ RootException () : _what ("No more details") {}
+ /** Destructor. */
+ virtual ~RootException() throw() {}
+ /** Give the details of the exception. */
+ const char* what() const throw() { return _what.c_str(); }
+ protected:
+ /** Details for the exception. */
+ std::string _what;
};
class NonInitialisedServiceException : public RootException {
@@ -32,7 +44,20 @@
class QuotingException : public RootException {
};
+ class FileException : public RootException {
+ public:
+ /** Constructor. */
+ FileException (const std::string& iWhat) : RootException (iWhat) {}
+ };
+ class FareInputFileNotFoundException : public FileException {
+ public:
+ /** Constructor. */
+ FareInputFileNotFoundException (const std::string& iWhat)
+ : FileException (iWhat) {}
+ };
+
+
// /////////////// Log /////////////
/** Level of logs. */
namespace LOG {
@@ -50,14 +75,11 @@
// //////// Type definitions /////////
/** ID for the Fare Quote system. */
- typedef std::string FareQuoteID_T;
+ typedef unsigned int FareQuoteID_T;
- /** Price, in Euros. */
+ /** 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;
Added: trunk/simfqt/simfqt/basic/BasParserTypes.hpp
===================================================================
--- trunk/simfqt/simfqt/basic/BasParserTypes.hpp (rev 0)
+++ trunk/simfqt/simfqt/basic/BasParserTypes.hpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -0,0 +1,71 @@
+#ifndef __AIRSCHED_BAS_BASCOMPARSERTYPES_HPP
+#define __AIRSCHED_BAS_BASCOMPARSERTYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+// Boost
+//#define BOOST_SPIRIT_DEBUG
+#include <boost/spirit/home/classic/core.hpp>
+#include <boost/spirit/home/classic/attribute.hpp>
+#include <boost/spirit/home/classic/utility/functor_parser.hpp>
+#include <boost/spirit/home/classic/utility/loops.hpp>
+#include <boost/spirit/home/classic/utility/chset.hpp>
+#include <boost/spirit/home/classic/utility/confix.hpp>
+#include <boost/spirit/home/classic/iterator/file_iterator.hpp>
+#include <boost/spirit/home/classic/actor/push_back_actor.hpp>
+#include <boost/spirit/home/classic/actor/assign_actor.hpp>
+
+namespace SIMFQT {
+
+ // ///////////////////////////////////////////////////////////////////////
+ //
+ // Definition of Basic Types
+ //
+ // ///////////////////////////////////////////////////////////////////////
+ // For a file, the parsing unit is the character (char). For a string,
+ // it is a "char const *".
+ // typedef char const* iterator_t;
+ typedef char char_t;
+
+ // The types of iterator, scanner and rule are then derived from
+ // the parsing unit.
+ typedef boost::spirit::classic::file_iterator<char_t> iterator_t;
+ typedef boost::spirit::classic::scanner<iterator_t> scanner_t;
+ typedef boost::spirit::classic::rule<scanner_t> rule_t;
+
+ // ///////////////////////////////////////////////////////////////////////
+ //
+ // Parser related types
+ //
+ // ///////////////////////////////////////////////////////////////////////
+ /** 1-digit-integer parser */
+ typedef boost::spirit::classic::int_parser<unsigned int, 10, 1, 1> int1_p_t;
+
+ /** 2-digit-integer parser */
+ typedef boost::spirit::classic::uint_parser<unsigned int, 10, 2, 2> uint2_p_t;
+
+ /** 4-digit-integer parser */
+ typedef boost::spirit::classic::uint_parser<unsigned int, 10, 4, 4> uint4_p_t;
+
+ /** Up-to-4-digit-integer parser */
+ typedef boost::spirit::classic::uint_parser<unsigned int, 10, 1, 4> uint1_4_p_t;
+
+ /** character set */
+ typedef boost::spirit::classic::chset<char_t> chset_t;
+
+ /** (Repeating) sequence of a given number of characters:
+ repeat_p(min, max) */
+ typedef boost::spirit::classic::impl::loop_traits<chset_t,
+ unsigned int,
+ unsigned int>::type repeat_p_t;
+
+ /** Bounded-number-of-integers parser */
+ typedef boost::spirit::classic::bounded<uint2_p_t, unsigned int> bounded2_p_t;
+ typedef boost::spirit::classic::bounded<uint4_p_t, unsigned int> bounded4_p_t;
+ typedef boost::spirit::classic::bounded<uint1_4_p_t, unsigned int> bounded1_4_p_t;
+
+}
+#endif // __AIRSCHED_BAS_BASCOMPARSERTYPES_HPP
Property changes on: trunk/simfqt/simfqt/batches
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile.in
Makefile
+ .deps
.libs
Makefile.in
Makefile
.log
Modified: trunk/simfqt/simfqt/batches/Makefile.am
===================================================================
--- trunk/simfqt/simfqt/batches/Makefile.am 2010-11-01 10:54:47 UTC (rev 17)
+++ trunk/simfqt/simfqt/batches/Makefile.am 2010-11-02 16:01:27 UTC (rev 18)
@@ -7,9 +7,10 @@
MAINTAINERCLEANFILES = Makefile.in
# Binaries (batches)
-bin_PROGRAMS =
+bin_PROGRAMS = simfqt
-#simfqt_SOURCES = $(batches_h_sources) $(batches_cc_sources)
-#simfqt_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
-#simfqt_LDADD =
-#simfqt_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(STDAIR_LIBS) $(top_builddir)/simfqt/core/libsimfqt.la
+simfqt_SOURCES = $(simfqt_batches_h_sources) $(simfqt_batches_cc_sources)
+simfqt_CXXFLAGS = $(BOOST_CFLAGS) $(STDAIR_CFLAGS)
+simfqt_LDADD =
+simfqt_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(STDAIR_LIBS) \
+ $(top_builddir)/simfqt/core/libsimfqt.la
Added: trunk/simfqt/simfqt/batches/simfqt.cpp
===================================================================
--- trunk/simfqt/simfqt/batches/simfqt.cpp (rev 0)
+++ trunk/simfqt/simfqt/batches/simfqt.cpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -0,0 +1,212 @@
+// STL
+#include <cassert>
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <vector>
+#include <list>
+#include <string>
+// Boost (Extended STL)
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/tokenizer.hpp>
+#include <boost/program_options.hpp>
+// StdAir
+#include <stdair/STDAIR_Types.hpp>
+#include <stdair/STDAIR_Service.hpp>
+#include <stdair/service/Logger.hpp>
+// Simfqt
+#include <simfqt/SIMFQT_Service.hpp>
+
+// //////// Type definitions ///////
+typedef std::vector<std::string> WordList_T;
+
+
+// //////// Constants //////
+/** Default name and location for the log file. */
+const std::string K_SIMFQT_DEFAULT_LOG_FILENAME ("simfqt.log");
+
+/** Default name and location for the (CSV) input file. */
+const std::string K_SIMFQT_DEFAULT_INPUT_FILENAME ("../../test/samples/fare01.csv");
+
+/** Default query string. */
+const std::string K_SIMFQT_DEFAULT_QUERY_STRING ("my good old query");
+
+
+// //////////////////////////////////////////////////////////////////////
+void tokeniseStringIntoWordList (const std::string& iPhrase,
+ WordList_T& ioWordList) {
+ // Empty the word list
+ ioWordList.clear();
+
+ // Boost Tokeniser
+ typedef boost::tokenizer<boost::char_separator<char> > Tokeniser_T;
+
+ // Define the separators
+ const boost::char_separator<char> lSepatorList(" .,;:|+-*/_=!@#$%`~^&(){}[]?'<>\"");
+
+ // Initialise the phrase to be tokenised
+ Tokeniser_T lTokens (iPhrase, lSepatorList);
+ for (Tokeniser_T::const_iterator tok_iter = lTokens.begin();
+ tok_iter != lTokens.end(); ++tok_iter) {
+ const std::string& lTerm = *tok_iter;
+ ioWordList.push_back (lTerm);
+ }
+
+}
+
+// //////////////////////////////////////////////////////////////////////
+std::string createStringFromWordList (const WordList_T& iWordList) {
+ std::ostringstream oStr;
+
+ unsigned short idx = iWordList.size();
+ for (WordList_T::const_iterator itWord = iWordList.begin();
+ itWord != iWordList.end(); ++itWord, --idx) {
+ const std::string& lWord = *itWord;
+ oStr << lWord;
+ if (idx > 1) {
+ oStr << " ";
+ }
+ }
+
+ return oStr.str();
+}
+
+
+// ///////// Parsing of Options & Configuration /////////
+// A helper function to simplify the main part.
+template<class T> std::ostream& operator<< (std::ostream& os,
+ const std::vector<T>& v) {
+ std::copy (v.begin(), v.end(), std::ostream_iterator<T> (std::cout, " "));
+ return os;
+}
+
+/** Early return status (so that it can be differentiated from an error). */
+const int K_SIMFQT_EARLY_RETURN_STATUS = 99;
+
+/** Read and parse the command line options. */
+int readConfiguration (int argc, char* argv[],
+ std::string& ioQueryString,
+ stdair::Filename_T& ioInputFilename,
+ std::string& ioLogFilename) {
+
+ // Initialise the travel query string, if that one is empty
+ if (ioQueryString.empty() == true) {
+ ioQueryString = K_SIMFQT_DEFAULT_QUERY_STRING;
+ }
+
+ // Transform the query string into a list of words (STL strings)
+ WordList_T lWordList;
+ tokeniseStringIntoWordList (ioQueryString, lWordList);
+
+ // Declare a group of options that will be allowed only on command line
+ boost::program_options::options_description generic ("Generic options");
+ generic.add_options()
+ ("prefix", "print installation prefix")
+ ("version,v", "print version string")
+ ("help,h", "produce help message");
+
+ // Declare a group of options that will be allowed both on command
+ // line and in config file
+ boost::program_options::options_description config ("Configuration");
+ config.add_options()
+ ("input,i",
+ boost::program_options::value< std::string >(&ioInputFilename)->default_value(K_SIMFQT_DEFAULT_INPUT_FILENAME),
+ "(CVS) input file for the demand distributions")
+ ("log,l",
+ boost::program_options::value< std::string >(&ioLogFilename)->default_value(K_SIMFQT_DEFAULT_LOG_FILENAME),
+ "Filepath for the logs")
+ ("query,q",
+ boost::program_options::value< WordList_T >(&lWordList)->multitoken(),
+ "Query word list")
+ ;
+
+ // Hidden options, will be allowed both on command line and
+ // in config file, but will not be shown to the user.
+ boost::program_options::options_description hidden ("Hidden options");
+ hidden.add_options()
+ ("copyright",
+ boost::program_options::value< std::vector<std::string> >(),
+ "Show the copyright (license)");
+
+ boost::program_options::options_description cmdline_options;
+ cmdline_options.add(generic).add(config).add(hidden);
+
+ boost::program_options::options_description config_file_options;
+ config_file_options.add(config).add(hidden);
+
+ boost::program_options::options_description visible ("Allowed options");
+ visible.add(generic).add(config);
+
+ boost::program_options::positional_options_description p;
+ p.add ("copyright", -1);
+
+ boost::program_options::variables_map vm;
+ boost::program_options::
+ store (boost::program_options::command_line_parser (argc, argv).
+ options (cmdline_options).positional(p).run(), vm);
+
+ std::ifstream ifs ("simfqt.cfg");
+ boost::program_options::store (parse_config_file (ifs, config_file_options),
+ vm);
+ boost::program_options::notify (vm);
+
+ if (vm.count ("help")) {
+ std::cout << visible << std::endl;
+ return K_SIMFQT_EARLY_RETURN_STATUS;
+ }
+
+ if (vm.count ("input")) {
+ ioInputFilename = vm["input"].as< std::string >();
+ std::cout << "Input filename is: " << ioInputFilename << std::endl;
+ }
+
+ if (vm.count ("log")) {
+ ioLogFilename = vm["log"].as< std::string >();
+ std::cout << "Log filename is: " << ioLogFilename << std::endl;
+ }
+
+ ioQueryString = createStringFromWordList (lWordList);
+ std::cout << "The query string is: " << ioQueryString << std::endl;
+
+ return 0;
+}
+
+// /////////////// M A I N /////////////////
+int main (int argc, char* argv[]) {
+ try {
+
+ // Query
+ std::string lQuery;
+
+ // Input file name
+ stdair::Filename_T lInputFilename;
+
+ // Output log File
+ std::string lLogFilename;
+
+ // Call the command-line option parser
+ const int lOptionParserStatus =
+ readConfiguration (argc, argv, lQuery, lInputFilename, lLogFilename);
+
+ if (lOptionParserStatus == K_SIMFQT_EARLY_RETURN_STATUS) {
+ return 0;
+ }
+
+ // Set the log parameters
+ std::ofstream logOutputFile;
+ // Open and clean the log outputfile
+ logOutputFile.open (lLogFilename.c_str());
+ logOutputFile.clear();
+
+ // Initialise the Simfqt service object
+ const stdair::BasLogParams lLogParams (stdair::LOG::DEBUG, logOutputFile);
+ SIMFQT::SIMFQT_Service simfqtService (lLogParams, lInputFilename);
+
+ // Close the Log outputFile
+ logOutputFile.close();
+
+ } CATCH_ALL_EXCEPTIONS
+
+ return 0;
+}
Added: trunk/simfqt/simfqt/batches/simfqt.log
===================================================================
--- trunk/simfqt/simfqt/batches/simfqt.log (rev 0)
+++ trunk/simfqt/simfqt/batches/simfqt.log 2010-11-02 16:01:27 UTC (rev 18)
@@ -0,0 +1,2 @@
+[D]../../simfqt/command/FareParserHelper.cpp:530: Parsing fare input file: ../../test/samples/fare01.csv
+[D]../../simfqt/command/FareParserHelper.cpp:550: Parsing of fare input file: ../../test/samples/fare01.csv succeeded: read 417 characters. The input file has not been fully read. Stop point: 1
Modified: trunk/simfqt/simfqt/batches/sources.mk
===================================================================
--- trunk/simfqt/simfqt/batches/sources.mk 2010-11-01 10:54:47 UTC (rev 17)
+++ trunk/simfqt/simfqt/batches/sources.mk 2010-11-02 16:01:27 UTC (rev 18)
@@ -1,2 +1,2 @@
-batches_h_sources =
-batches_cc_sources =
+simfqt_batches_h_sources =
+simfqt_batches_cc_sources = $(top_srcdir)/simfqt/batches/simfqt.cpp
Deleted: trunk/simfqt/simfqt/bom/BomAbstract.cpp
===================================================================
--- trunk/simfqt/simfqt/bom/BomAbstract.cpp 2010-11-01 10:54:47 UTC (rev 17)
+++ trunk/simfqt/simfqt/bom/BomAbstract.cpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -1,9 +0,0 @@
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// SIMFQT
-#include <simfqt/bom/BomAbstract.hpp>
-
-namespace SIMFQT {
-
-}
Deleted: trunk/simfqt/simfqt/bom/BomAbstract.hpp
===================================================================
--- trunk/simfqt/simfqt/bom/BomAbstract.hpp 2010-11-01 10:54:47 UTC (rev 17)
+++ trunk/simfqt/simfqt/bom/BomAbstract.hpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -1,91 +0,0 @@
-#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 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 SIMFQT::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,
- SIMFQT::BomAbstract& ioBom) {
- // Fill Bom object with input stream
- ioBom.fromStream (ioIn);
- return ioIn;
-}
-
-#endif // __SIMFQT_BOM_BOMABSTRACT_HPP
Added: trunk/simfqt/simfqt/bom/FareRuleStruct.cpp
===================================================================
--- trunk/simfqt/simfqt/bom/FareRuleStruct.cpp (rev 0)
+++ trunk/simfqt/simfqt/bom/FareRuleStruct.cpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -0,0 +1,49 @@
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <cassert>
+#include <sstream>
+// StdAir
+#include <stdair/basic/BasConst_General.hpp>
+#include <stdair/service/Logger.hpp>
+// SIMFQT
+#include <simfqt/SIMFQT_Types.hpp>
+#include <simfqt/bom/FareRuleStruct.hpp>
+
+namespace SIMFQT {
+
+ // ////////////////////////////////////////////////////////////////////
+ FareRuleStruct::FareRuleStruct ()
+ :_fareId(0), _origin(""), _destination(""),
+ _dateRangeStart(stdair::DEFAULT_DATE),
+ _dateRangeEnd(stdair::DEFAULT_DATE),
+ _timeRangeStart(stdair::DEFAULT_EPSILON_DURATION),
+ _timeRangeEnd(stdair::DEFAULT_EPSILON_DURATION),
+ _pos (""), _advancePurchase(0), _saturdayStay("T"),
+ _changeFees("T"), _nonRefundable("T"),
+ _minimumStay(0), _fare(0),
+ _airlineCode(""), _classCode("") {
+ }
+
+ // ////////////////////////////////////////////////////////////////////
+ stdair::Date_T FareRuleStruct::getDate() const {
+ return stdair::Date_T (_itYear, _itMonth, _itDay);
+ }
+
+ // ////////////////////////////////////////////////////////////////////
+ stdair::Duration_T FareRuleStruct::getTime() const {
+ return boost::posix_time::hours (_itHours)
+ + boost::posix_time::minutes (_itMinutes)
+ + boost::posix_time::seconds (_itSeconds);
+ }
+
+
+ // ////////////////////////////////////////////////////////////////////
+ const std::string FareRuleStruct::describe () const {
+ std::ostringstream ostr;
+ return ostr.str();
+ }
+
+}
+
Added: trunk/simfqt/simfqt/bom/FareRuleStruct.hpp
===================================================================
--- trunk/simfqt/simfqt/bom/FareRuleStruct.hpp (rev 0)
+++ trunk/simfqt/simfqt/bom/FareRuleStruct.hpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -0,0 +1,108 @@
+#ifndef __SIMFQT_BOM_FARERULESTRUCT_HPP
+#define __SIMFQT_BOM_FARERULESTRUCT_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+#include <vector>
+// STDAIR
+#include <stdair/STDAIR_Types.hpp>
+#include <stdair/basic/StructAbstract.hpp>
+// SIMFQT
+#include <simfqt/SIMFQT_Types.hpp>
+
+namespace SIMFQT {
+
+ /** Utility Structure for the parsing of Flight-Period structures. */
+ struct FareRuleStruct : public stdair::StructAbstract {
+ public:
+
+ /** Default constructor. */
+ FareRuleStruct ();
+
+ /** Get the date from the staging details. */
+ stdair::Date_T getDate() const;
+
+ /** Get the time from the staging details. */
+ stdair::Duration_T getTime() const;
+
+ /** Display of the structure. */
+ const std::string describe() const;
+
+ // ////////////////// Attributes /////////////////
+ /** Staging Date. */
+ unsigned int _itYear;
+ unsigned int _itMonth;
+ unsigned int _itDay;
+
+ /** Staging Time. */
+ long _itHours;
+ long _itMinutes;
+ long _itSeconds;
+
+
+ unsigned long int _nbOfAirlines;
+
+ /** Fare ID. */
+ SIMFQT::FareQuoteID_T _fareId;
+
+ /** Origin. */
+ stdair::AirportCode_T _origin;
+
+ /** Destination. */
+ stdair::AirportCode_T _destination;
+
+ /** Start Range date available for this fare rule.*/
+ stdair::Date_T _dateRangeStart;
+
+ /** Start Range date available for this fare rule.*/
+ stdair::Date_T _dateRangeEnd;
+
+ /** Start time from the time range available for this fare rule.*/
+ stdair::Duration_T _timeRangeStart;
+
+ /** End time from the time range available for this fare rule.*/
+ stdair::Duration_T _timeRangeEnd;
+
+ /** Point-of-sale. */
+ stdair::AirlineCode_T _pos;
+
+ /** Channel distribution. */
+ stdair::ChannelLabel_T _channel;
+
+ /** Number of days that the ticket is sold before the flightDate.*/
+ stdair::DayDuration_T _advancePurchase;
+
+ /** Boolean saying whether a saturday is considered during the stay .*/
+ stdair::SaturdayStay_T _saturdayStay;
+
+ /** Boolean saying whether the change fees option is requested or not.*/
+ stdair::ChangeFees_T _changeFees;
+
+ /** Boolean saying whether the refundable option is requested or not.*/
+ stdair::NonRefundable_T _nonRefundable;
+
+ /** Number of days that the customer spent into the destination city.*/
+ stdair::DayDuration_T _minimumStay;
+
+ /** Price.*/
+ stdair::PriceValue_T _fare;
+
+ /** Airline code */
+ stdair::AirlineCode_T _airlineCode;
+
+ /** Code */
+ stdair::ClassCode_T _classCode;
+
+ /** Airline Code List*/
+ stdair::AirlineCodeList_T _airlineCodeList;
+
+ /** Class Code List*/
+ stdair::ClassCodeList_T _classCodeList;
+
+ };
+
+}
+#endif // __SIMFQT_BOM_FARERULESTRUCT_HPP
Modified: trunk/simfqt/simfqt/bom/Makefile.am
===================================================================
--- trunk/simfqt/simfqt/bom/Makefile.am 2010-11-01 10:54:47 UTC (rev 17)
+++ trunk/simfqt/simfqt/bom/Makefile.am 2010-11-02 16:01:27 UTC (rev 18)
@@ -6,7 +6,7 @@
noinst_LTLIBRARIES = libsimfqtbom.la
libsimfqtbom_la_SOURCES = $(simfqt_bom_h_sources) $(simfqt_bom_cc_sources)
-libsimfqtbom_la_CXXFLAGS =
+libsimfqtbom_la_CXXFLAGS = $(STDAIR_CFLAGS)
libsimfqtbom_la_LDFLAGS =
#
Modified: trunk/simfqt/simfqt/bom/sources.mk
===================================================================
--- trunk/simfqt/simfqt/bom/sources.mk 2010-11-01 10:54:47 UTC (rev 17)
+++ trunk/simfqt/simfqt/bom/sources.mk 2010-11-02 16:01:27 UTC (rev 18)
@@ -1,4 +1,2 @@
-simfqt_bom_h_sources = \
- $(top_srcdir)/simfqt/bom/BomAbstract.hpp
-simfqt_bom_cc_sources = \
- $(top_srcdir)/simfqt/bom/BomAbstract.cpp
+simfqt_bom_h_sources = $(top_srcdir)/simfqt/bom/FareRuleStruct.hpp
+simfqt_bom_cc_sources = $(top_srcdir)/simfqt/bom/FareRuleStruct.cpp
Added: trunk/simfqt/simfqt/command/FareParser.cpp
===================================================================
--- trunk/simfqt/simfqt/command/FareParser.cpp (rev 0)
+++ trunk/simfqt/simfqt/command/FareParser.cpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -0,0 +1,27 @@
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <cassert>
+#include <string>
+// StdAir
+//#include <stdair/bom/Inventory.hpp>
+// AirSched
+#include <simfqt/command/FareParserHelper.hpp>
+#include <simfqt/command/FareParser.hpp>
+
+namespace SIMFQT {
+
+ // //////////////////////////////////////////////////////////////////////
+ void FareParser::fareRuleGeneration (const stdair::Filename_T& iFilename,
+ stdair::BomRoot& ioBomRoot) {
+
+ // Initialise the Fare file parser.
+ FareRuleFileParser lFareRuleFileParser (ioBomRoot, iFilename);
+
+ // Parse the CSV-formatted fare input file generate the
+ // corresponding fare rules and fulfill the WorldSchedule.
+ lFareRuleFileParser.generateFareRules ();
+ }
+
+}
Added: trunk/simfqt/simfqt/command/FareParser.hpp
===================================================================
--- trunk/simfqt/simfqt/command/FareParser.hpp (rev 0)
+++ trunk/simfqt/simfqt/command/FareParser.hpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -0,0 +1,31 @@
+#ifndef __SIMFQT_CMD_FAREPARSER_HPP
+#define __SIMFQT_CMD_FAREPARSER_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+// StdAir
+#include <stdair/STDAIR_Types.hpp>
+#include <stdair/command/CmdAbstract.hpp>
+
+// Forward declarations.
+namespace stdair {
+ class BomRoot;
+}
+
+namespace SIMFQT {
+
+ /** Class wrapping the parser entry point. */
+ class FareParser : public stdair::CmdAbstract {
+ public:
+ /** Parses the CSV file describing the fares for the
+ simulator, and generates the inventories accordingly.
+ @param const stdair::Filename_T& The file-name of the CSV-formatted
+ schedule input file.
+ @param stdair::BomRoot& Root of the BOM tree. */
+ static void fareRuleGeneration (const stdair::Filename_T&, stdair::BomRoot&);
+ };
+}
+#endif // __SIMFQT_CMD_FAREPARSER_HPP
Added: trunk/simfqt/simfqt/command/FareParserHelper.cpp
===================================================================
--- trunk/simfqt/simfqt/command/FareParserHelper.cpp (rev 0)
+++ trunk/simfqt/simfqt/command/FareParserHelper.cpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -0,0 +1,563 @@
+ // //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <cassert>
+#include <vector>
+// StdAir
+#include <stdair/basic/BasFileMgr.hpp>
+#include <stdair/bom/BomRoot.hpp>
+#include <stdair/service/Logger.hpp>
+// SIMFQT
+#include <simfqt/command/FareParserHelper.hpp>
+#include <simfqt/command/FareRuleGenerator.hpp>
+
+namespace SIMFQT {
+
+ namespace FareParserHelper {
+
+ // //////////////////////////////////////////////////////////////////
+ // Semantic actions
+ // //////////////////////////////////////////////////////////////////
+
+ ParserSemanticAction::
+ ParserSemanticAction (FareRuleStruct& ioFareRule)
+ : _fareRule (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeFareId::
+ storeFareId (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeFareId::operator() (unsigned int iFareId) const {
+ _fareRule._fareId = iFareId;
+
+ //STDAIR_LOG_DEBUG ( "Fare Id: " << _fareRule._fareId);
+
+ _fareRule._nbOfAirlines = 0;
+ _fareRule._airlineCode = "";
+ _fareRule._classCode = "";
+ _fareRule._airlineCodeList.clear();
+ _fareRule._classCodeList.clear();
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeOrigin ::
+ storeOrigin (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeOrigin::operator() (iterator_t iStr,
+ iterator_t iStrEnd) const {
+ stdair::AirportCode_T lOrigin (iStr, iStrEnd);
+ //STDAIR_LOG_DEBUG ( "Origin: " << lOrigin);
+ _fareRule._origin = lOrigin;
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeDestination ::
+ storeDestination (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeDestination::operator() (iterator_t iStr,
+ iterator_t iStrEnd) const {
+ stdair::AirportCode_T lDestination (iStr, iStrEnd);
+ //STDAIR_LOG_DEBUG ( "Destination: " << lDestination);
+ _fareRule._destination = lDestination;
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeDateRangeStart::
+ storeDateRangeStart (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeDateRangeStart::operator() (iterator_t iStr,
+ iterator_t iStrEnd) const {
+ _fareRule._dateRangeStart = _fareRule.getDate();
+ //STDAIR_LOG_DEBUG ("Date Range Start: "<< _fareRule._dateRangeStart);
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeDateRangeEnd::
+ storeDateRangeEnd(FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeDateRangeEnd::operator() (iterator_t iStr,
+ iterator_t iStrEnd) const {
+ _fareRule._dateRangeEnd = _fareRule.getDate();
+ //STDAIR_LOG_DEBUG ("Date Range End: " << _fareRule._dateRangeEnd);
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeStartRangeTime::
+ storeStartRangeTime (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeStartRangeTime::operator() (iterator_t iStr,
+ iterator_t iStrEnd) const {
+ _fareRule._timeRangeStart = _fareRule.getTime();
+ //STDAIR_LOG_DEBUG ("Time Range Start: " << _fareRule._timeRangeStart);
+ // Reset the number of seconds
+ _fareRule._itSeconds = 0;
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeEndRangeTime::
+ storeEndRangeTime (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeEndRangeTime::operator() (iterator_t iStr,
+ iterator_t iStrEnd) const {
+ _fareRule._timeRangeEnd = _fareRule.getTime();
+ // STDAIR_LOG_DEBUG ("Time Range End: " << _fareRule._timeRangeEnd);
+ // Reset the number of seconds
+ _fareRule._itSeconds = 0;
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storePOS ::
+ storePOS (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storePOS::operator() (iterator_t iStr,
+ iterator_t iStrEnd) const {
+ stdair::AirlineCode_T lPOS (iStr, iStrEnd);
+ _fareRule._pos = lPOS;
+ //STDAIR_LOG_DEBUG ("POS: " << _fareRule._pos);
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeChannel ::
+ storeChannel (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeChannel::operator() (iterator_t iStr,
+ iterator_t iStrEnd) const {
+ stdair::ChannelLabel_T lChannel (iStr, iStrEnd);
+ _fareRule._channel = lChannel;
+ if (lChannel != "IN" && lChannel != "IF"
+ && lChannel != "DN" && lChannel != "DF") {
+ STDAIR_LOG_DEBUG ("Invalid channel " << lChannel);
+ }
+ // STDAIR_LOG_DEBUG ("Channel: " << _fareRule._channel);
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeAdvancePurchase ::
+ storeAdvancePurchase (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeAdvancePurchase::operator() (unsigned int iAdancePurchase) const {
+ _fareRule._advancePurchase = iAdancePurchase;
+ //STDAIR_LOG_DEBUG ( "Advance Purchase: " << _fareRule._advancePurchase);
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeSaturdayStay ::
+ storeSaturdayStay (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeSaturdayStay::operator() (char iSaturdayStay) const {
+ bool lBool = false;
+ if (iSaturdayStay == 'T') {
+ lBool = true;
+ } else {
+ if (iSaturdayStay != 'F') {
+ STDAIR_LOG_DEBUG ("Invalid saturdayStay char " << iSaturdayStay);
+ }
+ }
+ stdair::SaturdayStay_T lSaturdayStay (lBool);
+ _fareRule._saturdayStay = lSaturdayStay;
+ //STDAIR_LOG_DEBUG ("Saturday Stay: " << _fareRule._saturdayStay);
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeChangeFees ::
+ storeChangeFees (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeChangeFees::operator() (char iChangefees) const {
+
+ bool lBool = false;
+ if (iChangefees == 'T') {
+ lBool = true;
+ } else {
+ if (iChangefees != 'F') {
+ STDAIR_LOG_DEBUG ("Invalid change fees char " << iChangefees);
+ }
+ }
+ stdair::ChangeFees_T lChangefees (lBool);
+ _fareRule._changeFees = lChangefees;
+ //STDAIR_LOG_DEBUG ("Change fees: " << _fareRule._changeFees);
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeNonRefundable ::
+ storeNonRefundable (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeNonRefundable::operator() (char iNonRefundable) const {
+ bool lBool = false;
+ if (iNonRefundable == 'T') {
+ lBool = true;
+ } else {
+ if (iNonRefundable != 'F') {
+ STDAIR_LOG_DEBUG ("Invalid non refundable char " << iNonRefundable);
+ }
+ }
+ stdair::NonRefundable_T lNonRefundable (lBool);
+ _fareRule._nonRefundable = lNonRefundable;
+ // STDAIR_LOG_DEBUG ("Non refundable: " << _fareRule._nonRefundable);
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeMinimumStay ::
+ storeMinimumStay (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeMinimumStay::operator() (unsigned int iMinStay) const {
+ _fareRule._minimumStay = iMinStay;
+ //STDAIR_LOG_DEBUG ("Minimum Stay: " << _fareRule._minimumStay );
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeFare ::
+ storeFare (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeFare::operator() (double iFare) const {
+ _fareRule._fare = iFare;
+ // STDAIR_LOG_DEBUG ("Fare: " << _fareRule._fare);
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeAirlineCode ::
+ storeAirlineCode (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeAirlineCode::operator() (iterator_t iStr,
+ iterator_t iStrEnd) const {
+
+ bool lAlreadyInTheList = false;
+ stdair::AirlineCode_T lAirlineCode (iStr, iStrEnd);
+ // Update the airline code
+ _fareRule._airlineCode = lAirlineCode;
+ // Test if the FareRule Struct stands for interline products
+ if (_fareRule._airlineCodeList.size() > 0) {
+ // Update the number of airlines if necessary
+ std::vector<stdair::AirlineCode_T>::iterator Airline_iterator;
+ for (Airline_iterator = _fareRule._airlineCodeList.begin();
+ Airline_iterator != _fareRule._airlineCodeList.end();
+ ++Airline_iterator) {
+ stdair::AirlineCode_T lPreviousAirlineCode =
+ *Airline_iterator;
+ if (lPreviousAirlineCode == lAirlineCode) {
+ lAlreadyInTheList = true;
+ /*STDAIR_LOG_DEBUG ("Airline Code Already Existing: "
+ << lAirlineCode);*/
+ }
+ }
+ if (lAlreadyInTheList == false) {
+ /*STDAIR_LOG_DEBUG ("New Airline Code: "
+ << lAirlineCode);*/
+ _fareRule._airlineCodeList.push_back(lAirlineCode);
+ }
+ } else {
+ /*STDAIR_LOG_DEBUG ("First Airline Code: "
+ << lAirlineCode);*/
+ _fareRule._airlineCodeList.push_back (lAirlineCode);
+ }
+ // STDAIR_LOG_DEBUG ( "Airline code: " << lAirlineCode);
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ storeClass ::
+ storeClass (FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ void storeClass::operator() (char iChar) const {
+ std::ostringstream ostr;
+ ostr << iChar;
+ std::string classCodeStr = ostr.str();
+ const stdair::ClassCode_T lClassCode (classCodeStr);
+ _fareRule._classCodeList.push_back(lClassCode);
+ // Insertion of this class Code in the whole classCode name
+ std::ostringstream ostrr;
+ ostrr << _fareRule._classCode << classCodeStr;
+ _fareRule._classCode = ostrr.str();
+ //STDAIR_LOG_DEBUG ("Class Code: " << lClassCode << std::endl);
+
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ doEndFare::
+ doEndFare (stdair::BomRoot& ioBomRoot,
+ FareRuleStruct& ioFareRule)
+ : ParserSemanticAction (ioFareRule),
+ _bomRoot (ioBomRoot) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+
+ void doEndFare::operator() (iterator_t iStr,
+ iterator_t iStrEnd) const {
+
+ // Generation of the fare rule object.
+ FareRuleGenerator::createFareRule (_bomRoot, _fareRule);
+ }
+
+ // ///////////////////////////////////////////////////////////////////
+ //
+ // Utility Parsers
+ //
+ // ///////////////////////////////////////////////////////////////////
+
+ /** 2-digit-integer parser */
+ uint2_p_t uint2_p;
+
+ /** 4-digit-integer parser */
+ uint4_p_t uint4_p;
+
+ /** Up-to-4-digit-integer parser */
+ uint1_4_p_t uint1_4_p;
+
+ /** Sequence of (capital) alphabetic characters: chset_p("A-Z") */
+ chset_t alpha_cap_set_p ("A-Z");
+
+ /** Airport Parser: repeat_p(3)[chset_p("0-9A-Z")] */
+ repeat_p_t airport_p (chset_t("0-9A-Z").derived(), 3, 3);
+
+ /** Year Parser: limit_d(2000u, 2099u)[uint4_p] */
+ bounded4_p_t year_p (uint4_p.derived(), 2000u, 2099u);
+
+ /** Month Parser: limit_d(1u, 12u)[uint2_p] */
+ bounded2_p_t month_p (uint2_p.derived(), 1u, 12u);
+
+ /** Day Parser: limit_d(1u, 31u)[uint2_p] */
+ bounded2_p_t day_p (uint2_p.derived(), 1u, 31u);
+
+ /** Hour Parser: limit_d(0u, 23u)[uint2_p] */
+ bounded2_p_t hours_p (uint2_p.derived(), 0u, 23u);
+
+ /** Minute Parser: limit_d(0u, 59u)[uint2_p] */
+ bounded2_p_t minutes_p (uint2_p.derived(), 0u, 59u);
+
+ /** Second Parser: limit_d(0u, 59u)[uint2_p] */
+ bounded2_p_t seconds_p (uint2_p.derived(), 0u, 59u);
+
+ /** Airline Code Parser: repeat_p(2,3)[chset_p("0-9A-Z")] */
+ repeat_p_t airline_code_p (chset_t("0-9A-Z").derived(), 2, 3);
+
+ /** Channel type Parser: repeat_p(2,3)[chset_p("A-ZA-Z")] */
+ repeat_p_t channel_type_p (chset_t("A-Z").derived(), 2, 3);
+
+ // //////////////////////////////////////////////////////////////////
+ // (Boost Spirit) Grammar Definition
+ // //////////////////////////////////////////////////////////////////
+
+ // //////////////////////////////////////////////////////////////////
+ FareRuleParser::
+ FareRuleParser (stdair::BomRoot& ioBomRoot,
+ FareRuleStruct& ioFareRule)
+ : _bomRoot (ioBomRoot),
+ _fareRule (ioFareRule) {
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ template<typename ScannerT>
+ FareRuleParser::definition<ScannerT>::
+ definition (FareRuleParser const& self) {
+
+ fare_rule_list = *( comments | fare_rule )
+ ;
+
+ comments = boost::spirit::classic::comment_p("//")
+ | boost::spirit::classic::comment_p("/*", "*/")
+ ;
+
+ fare_rule = fare_key
+ >> +( ';' >> segment )
+ >> fare_rule_end[doEndFare(self._bomRoot, self._fareRule)]
+ ;
+
+ fare_rule_end = boost::spirit::classic::ch_p(';')
+ ;
+
+ fare_key = fare_id
+ >> ';' >> (airport_p)[storeOrigin(self._fareRule)]
+ >> ';' >> (airport_p)[storeDestination(self._fareRule)]
+ >> ';' >> date[storeDateRangeStart(self._fareRule)]
+ >> ';' >> date[storeDateRangeEnd(self._fareRule)]
+ >> ';' >> time[storeStartRangeTime(self._fareRule)]
+ >> ';' >> time[storeEndRangeTime(self._fareRule)]
+ >> ';' >> (airport_p)[storePOS(self._fareRule)]
+ >> ';' >> (channel_type_p)[storeChannel(self._fareRule)]
+ >> ';' >> (uint1_4_p)[storeAdvancePurchase(self._fareRule)]
+ >> ';' >> (alpha_cap_set_p)[storeSaturdayStay(self._fareRule)]
+ >> ';' >> (alpha_cap_set_p)[storeChangeFees(self._fareRule)]
+ >> ';' >> (alpha_cap_set_p)[storeNonRefundable(self._fareRule)]
+ >> ';' >> (uint1_4_p)[storeMinimumStay(self._fareRule)]
+ >> ';' >> (boost::spirit::classic::ureal_p)[storeFare(self._fareRule)]
+ ;
+
+ fare_id = boost::spirit::classic::lexeme_d[
+ (uint1_4_p)[storeFareId(self._fareRule)]]
+ ;
+
+ date = boost::spirit::classic::lexeme_d[
+ (year_p)[boost::spirit::classic::assign_a(self._fareRule._itYear)]
+ >> '-'
+ >> (month_p)[boost::spirit::classic::assign_a(self._fareRule._itMonth)]
+ >> '-'
+ >> (day_p)[boost::spirit::classic::assign_a(self._fareRule._itDay)]]
+ ;
+
+ time = boost::spirit::classic::lexeme_d[
+ (hours_p)[boost::spirit::classic::assign_a(self._fareRule._itHours)]
+ >> ':'
+ >> (minutes_p)[boost::spirit::classic::assign_a(self._fareRule._itMinutes)]
+ >> !(':' >> (seconds_p)[boost::spirit::classic::assign_a(self._fareRule._itSeconds)])]
+ ;
+
+ segment = boost::spirit::classic::lexeme_d[
+ (airline_code_p)[storeAirlineCode(self._fareRule)]]
+ >> ';' >> (alpha_cap_set_p)[storeClass(self._fareRule)]
+ ;
+
+ //BOOST_SPIRIT_DEBUG_NODE (FareRuleParser);
+ BOOST_SPIRIT_DEBUG_NODE (fare_rule_list);
+ BOOST_SPIRIT_DEBUG_NODE (comments);
+ BOOST_SPIRIT_DEBUG_NODE (fare_rule);
+ BOOST_SPIRIT_DEBUG_NODE (fare_id);
+ BOOST_SPIRIT_DEBUG_NODE (fare_key);
+ BOOST_SPIRIT_DEBUG_NODE (segment);
+ BOOST_SPIRIT_DEBUG_NODE (fare_rule_end);
+ BOOST_SPIRIT_DEBUG_NODE (date);
+ BOOST_SPIRIT_DEBUG_NODE (time);
+
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ template<typename ScannerT>
+ boost::spirit::classic::rule<ScannerT> const&
+ FareRuleParser::definition<ScannerT>::start() const {
+ return fare_rule_list;
+ }
+
+ }
+
+
+ /////////////////////////////////////////////////////////////////////////
+ //
+ // Entry class for the file parser
+ //
+ /////////////////////////////////////////////////////////////////////////
+
+ // //////////////////////////////////////////////////////////////////////
+ FareRuleFileParser::
+ FareRuleFileParser (stdair::BomRoot& ioBomRoot,
+ const stdair::Filename_T& iFilename)
+ : _filename (iFilename), _bomRoot (ioBomRoot) {
+ init();
+ }
+
+ // //////////////////////////////////////////////////////////////////////
+ void FareRuleFileParser::init() {
+ // Check that the file exists and is readable
+ const bool doesExistAndIsReadable =
+ stdair::BasFileMgr::doesExistAndIsReadable (_filename);
+
+ if (doesExistAndIsReadable == false) {
+ STDAIR_LOG_ERROR ("The fare schedule file " << _filename
+ << " does not exist or can not be read.");
+
+ throw FareInputFileNotFoundException ("The fare file " + _filename + " does not exist or can not be read");
+ }
+
+ // Open the file
+ _startIterator = iterator_t (_filename);
+
+ // Check the filename exists and can be open
+ if (!_startIterator) {
+ STDAIR_LOG_ERROR ("The fare file " << _filename << " can not be open."
+ << std::endl);
+
+ throw FareInputFileNotFoundException ("The file " + _filename + " does not exist or can not be read");
+ }
+
+ // Create an EOF iterator
+ _endIterator = _startIterator.make_end();
+ }
+
+ // //////////////////////////////////////////////////////////////////////
+ bool FareRuleFileParser::generateFareRules () {
+ bool oResult = false;
+
+ STDAIR_LOG_DEBUG ("Parsing fare input file: " << _filename);
+
+ // Initialise the parser (grammar) with the helper/staging structure.
+ FareParserHelper::FareRuleParser lFPParser (_bomRoot, _fareRule);
+
+ // Launch the parsing of the file and, thanks to the doEndFare
+ // call-back structure, the building of the whole BomRoot BOM
+ boost::spirit::classic::parse_info<iterator_t> info =
+ boost::spirit::classic::parse (_startIterator, _endIterator, lFPParser,
+ boost::spirit::classic::space_p);
+
+ // Retrieves whether or not the parsing was successful
+ oResult = info.hit;
+
+ const std::string hasBeenFullyReadStr = (info.full == true)?"":"not ";
+ if (oResult == true) {
+ STDAIR_LOG_DEBUG ("Parsing of fare input file: " << _filename
+ << " succeeded: read " << info.length
+ << " characters. The input file has "
+ << hasBeenFullyReadStr
+ << "been fully read. Stop point: " << info.stop);
+
+ } else {
+ // TODO: decide whether to throw an exception
+ STDAIR_LOG_ERROR ("Parsing of fare input file: " << _filename
+ << " failed: read " << info.length
+ << " characters. The input file has "
+ << hasBeenFullyReadStr
+ << "been fully read. Stop point: " << info.stop);
+ }
+ return oResult;
+ }
+
+}
Added: trunk/simfqt/simfqt/command/FareParserHelper.hpp
===================================================================
--- trunk/simfqt/simfqt/command/FareParserHelper.hpp (rev 0)
+++ trunk/simfqt/simfqt/command/FareParserHelper.hpp 2010-11-02 16:01:27 UTC (rev 18)
@@ -0,0 +1,328 @@
+#ifndef __SIMFQT_CMD_FAREPARSERHELPER_HPP
+#define __SIMFQT_CMD_FAREPARSERHELPER_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+// #define BOOST_SPIRIT_DEBUG
+// StdAir
+#include <stdair/command/CmdAbstract.hpp>
+// AirSched
+#include <simfqt/SIMFQT_Types.hpp>
+#include <simfqt/basic/BasParserTypes.hpp>
+#include <simfqt/bom/FareRuleStruct.hpp>
+
+// Forward declarations
+namespace stdair {
+ class BomRoot;
+}
+
+namespace SIMFQT {
+
+ namespace FareParserHelper {
+
+ // ///////////////////////////////////////////////////////////////////
+ // Semantic actions
+ // ////////////////////////////////////////////////////
+ ///////////////
+ /** Generic Semantic Action (Actor / Functor) for the Fare Parser. */
+ struct ParserSemanticAction {
+ /** Actor Constructor. */
+ ParserSemanticAction (FareRuleStruct&);
+ /** Actor Context. */
+ FareRuleStruct& _fareRule;
+ };
+
+ /** Store the parsed fare Id. */
+ struct storeFareId : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeFareId (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (unsigned int) const;
+ };
+
+ /** Store the parsed origin. */
+ struct storeOrigin : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeOrigin (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (iterator_t, iterator_t) const;
+ };
+
+ /** Store the parsed destination. */
+ struct storeDestination : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeDestination (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (iterator_t, iterator_t) const;
+ };
+
+ /** Store the parsed start of the date range. */
+ struct storeDateRangeStart : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeDateRangeStart (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (iterator_t, iterator_t) const;
+ };
+
+ /** Store the parsed end of the date range. */
+ struct storeDateRangeEnd : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeDateRangeEnd (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (iterator_t, iterator_t) const;
+ };
+
+ /** Store the parsed start range time. */
+ struct storeStartRangeTime : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeStartRangeTime (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (iterator_t iStr, iterator_t iStrEnd) const;
+ };
+
+ /** Store the parsed end start range time. */
+ struct storeEndRangeTime : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeEndRangeTime (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (iterator_t, iterator_t) const;
+ };
+
+ /** Store the parsed customer position. */
+ struct storePOS : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storePOS (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (iterator_t, iterator_t) const;
+ };
+
+ /** Store the channel distribution. */
+ struct storeChannel : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeChannel (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (iterator_t, iterator_t) const;
+ };
+
+ /** Store the parsed advance purchase days. */
+ struct storeAdvancePurchase : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeAdvancePurchase (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (unsigned int) const;
+ };
+
+ /** Store the parsed saturday night. */
+ struct storeSaturdayStay : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeSaturdayStay (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (char) const;
+ };
+
+ /** Store the parsed change fees. */
+ struct storeChangeFees : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeChangeFees (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (char) const;
+ };
+
+ /** Store the parsed refundable option */
+ struct storeNonRefundable : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeNonRefundable (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (char) const;
+ };
+
+ /** Store the parsed minimum stay. */
+ struct storeMinimumStay : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeMinimumStay (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (unsigned int) const;
+ };
+
+ /** Store the parsed fare value. */
+ struct storeFare : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeFare (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (double) const;
+ };
+
+ /** Store the parsed airline code. */
+ struct storeAirlineCode : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeAirlineCode (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (iterator_t, iterator_t) const;
+ };
+
+ /** Store the parsed class. */
+ struct storeClass : public ParserSemanticAction {
+ /** Actor Constructor. */
+ storeClass (FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (char) const;
+ };
+
+ /** Mark the end of the fare-rule parsing. */
+ struct doEndFare : public ParserSemanticAction {
+ /** Actor Constructor. */
+ doEndFare (stdair::BomRoot&, FareRuleStruct&);
+ /** Actor Function (functor). */
+ void operator() (iterator_t, iterator_t) const;
+ /** Actor Specific Context. */
+ stdair::BomRoot& _bomRoot;
+ };
+
+
+ /////////////////////////////////////////////////////////////////////////
+ //
+ // (Boost Spirit) Grammar Definition
+ //
+ /////////////////////////////////////////////////////////////////////////
+ /**
+
+ // Fare: fareID; OriginCity; DestinationCity; DateRangeStart;
+ DateRangeEnd; DepartureTimeRangeStart; DepartureTimeRangeEnd;
+ POS; AdvancePurchase; SaturdayNight; ChangeFees; NonRefundable;
+ MinimumStay; Price; AirlineCode; Class;
+
+ fareID
+ OriginCity (3-char airport code)
+ DestinationCity (3-char airport code)
+ DateRangeStart (yyyy-mm-dd)
+ DateRangeEnd (yyyy-mm-dd)
+ DepartureTimeRangeStart (hh:mm)
+ DepartureTimeRangeEnd (hh:mm)
+ POS (3-char position city)
+ Channel (D=direct, I=indirect, N=oNline, F=oFfline)
+ AdvancePurchase
+ SaturdayNight (T=True, F=False)
+ ChangeFees (T=True, F=False)
+ NonRefundable (T=True, F=False)
+ MinimumStay
+ Price
+ AirlineCode (2-char airline code)
+ Class (1-char class code)
+
+ Grammar:
+ Demand ::= PrefDepDate ';' Origin ';' Destination ';' PassengerType
+ ';' DemandParams ';' PosDist ';' ChannelDist ';' TripDist
+ ';' StayDist ';' FfDist ';' PrefDepTimeDist
+ ';' minWTP ';' TimeValueDist ';' DtdDist
+ EndOfDemand
+ PrefDepDate ::= date
+ PassengerType ::= 'T' | 'F'
+ DemandParams ::= DemandMean ';' DemandStdDev
+ PosDist ::= PosPair (',' PosPair)*
+ PosPair ::= PosCode ':' PosShare
+ PosCode ::= AirportCode | "row"
+ PosShare ::= real
+ ChannelDist ::= ChannelPair (',' ChannelPair)*
+ ChannelPair ::= Channel_Code ':' ChannelShare
+ ChannelCode ::= "DF" | "DN" | "IF" | "IN"
+ ChannelShare ::= real
+ TripDist ::= TripPair (',' TripPair)*
+ TripPair ::= TripCode ':' TripShare
+ TripCode ::= "RO" | "RI" | "OW"
+ TripShare ::= real
+ StayDist ::= StayPair (',' StayPair)*
+ StayPair ::= [0;3]-digit-integer ':' stay_share
+ StayShare ::= real
+ FFDist ::= FF_Pair (',' FF_Pair)*
+ FFPair ::= FFCode ':' FFShare
+ FFCode ::= 'P' | 'G' | 'S' | 'M' | 'N'
+ FFShare ::= real
+ PrefDepTimeDist ::= PrefDepTi...
[truncated message content] |