|
From: Giorgio F. <gi...@us...> - 2006-08-09 15:24:59
|
Update of /cvsroot/quantlibaddin/QuantLibAddin/qlo In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16142/qlo Modified Files: enumclassctors.cpp typefactory.hpp Log Message: enumeration EuriborSwapFixA Index: enumclassctors.cpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/enumclassctors.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** enumclassctors.cpp 7 Aug 2006 10:33:10 -0000 1.14 --- enumclassctors.cpp 9 Aug 2006 15:24:53 -0000 1.15 *************** *** 266,270 **** } boost::shared_ptr<QuantLib::Euribor> EURIBOR_6M() { ! return boost::shared_ptr<QuantLib::Euribor>( new QuantLib::Euribor6M( EuriborHandle::instance().handleYieldTermStructure())); --- 266,270 ---- } boost::shared_ptr<QuantLib::Euribor> EURIBOR_6M() { ! return boost::shared_ptr<QuantLib::Euribor>( new QuantLib::Euribor6M( EuriborHandle::instance().handleYieldTermStructure())); *************** *** 300,378 **** EuriborHandle::instance().handleYieldTermStructure())); } ! ! /* *** EuriborSwapFixA *** */ boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_1Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA1Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_2Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA2Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_3Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA3Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_4Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA4Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_5Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA5Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_6Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA6Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_7Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA7Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_8Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA8Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_9Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA9Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_10Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA10Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_12Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA12Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_15Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA15Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_20Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA20Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_25Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA25Y()); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_30Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA30Y()); } --- 300,392 ---- EuriborHandle::instance().handleYieldTermStructure())); } ! ///EuriborSwapFixA boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_1Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA1Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_2Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA2Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_3Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA3Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_4Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA4Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_5Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA5Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_6Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA6Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_7Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA7Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_8Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA8Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_9Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA9Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_10Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA10Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_12Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA12Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_15Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA15Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_20Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA20Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_25Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA25Y( ! EuriborHandle::instance().handleYieldTermStructure())); } boost::shared_ptr<QuantLib::EuriborSwapFixA> EURIBORSWAPFIXA_30Y() { return boost::shared_ptr<QuantLib::EuriborSwapFixA>( ! new QuantLib::EuriborSwapFixA30Y( ! EuriborHandle::instance().handleYieldTermStructure())); } Index: typefactory.hpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/qlo/typefactory.hpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** typefactory.hpp 7 Aug 2006 10:33:10 -0000 1.26 --- typefactory.hpp 9 Aug 2006 15:24:53 -0000 1.27 *************** *** 193,197 **** }; ! /* *** Euribor *** */ typedef boost::shared_ptr<QuantLib::Euribor>(*EuriborConstructor)( const std::string& handleYieldTermStructureID); --- 193,197 ---- }; ! ///* *** Euribor *** */ typedef boost::shared_ptr<QuantLib::Euribor>(*EuriborConstructor)( const std::string& handleYieldTermStructureID); *************** *** 212,216 **** /* *** EuriborSwapFixA *** */ ! typedef boost::shared_ptr<QuantLib::EuriborSwapFixA>(*EuriborSwapFixAConstructor)(); template<> --- 212,217 ---- /* *** EuriborSwapFixA *** */ ! typedef boost::shared_ptr<QuantLib::EuriborSwapFixA>(*EuriborSwapFixAConstructor)( ! const std::string& handleYieldTermStructureID); template<> *************** *** 219,226 **** public: boost::shared_ptr<QuantLib::EuriborSwapFixA> operator() ( ! const std::string& euriborSwapFixAID) { EuriborSwapFixAConstructor euriborSwapFixAConstructor = getType<std::string, EuriborSwapFixAConstructor>(euriborSwapFixAID); ! return euriborSwapFixAConstructor(); } using RegistryManager<QuantLib::EuriborSwapFixA, EnumClassRegistry>::checkType; --- 220,228 ---- public: boost::shared_ptr<QuantLib::EuriborSwapFixA> operator() ( ! const std::string& euriborSwapFixAID, ! const std::string& handleYieldTermStructureID = "") { EuriborSwapFixAConstructor euriborSwapFixAConstructor = getType<std::string, EuriborSwapFixAConstructor>(euriborSwapFixAID); ! return euriborSwapFixAConstructor(handleYieldTermStructureID); } using RegistryManager<QuantLib::EuriborSwapFixA, EnumClassRegistry>::checkType; *************** *** 283,287 **** --- 285,306 ---- } }; + + ///* *** InterestRateIndex *** */ + //typedef boost::shared_ptr<QuantLib::InterestRateIndex>(*InterestRateIndexConstructor)( + // const std::string& handleYieldTermStructureID); + //template<> + // class Create<boost::shared_ptr<QuantLib::InterestRateIndex> > : + // private RegistryManager<QuantLib::InterestRateIndex, EnumClassRegistry> { + //public: + // boost::shared_ptr<QuantLib::InterestRateIndex> operator() ( + // const std::string& InterestRateIndexID, + // const std::string& handleYieldTermStructureID = "") { + // InterestRateIndexConstructor interestRateIndexConstructor = + // getType<std::string, InterestRateIndexConstructor>(InterestRateIndexID); + // return interestRateIndexConstructor(handleYieldTermStructureID); + // } + // using RegistryManager<QuantLib::InterestRateIndex, EnumClassRegistry>::checkType; + //}; } |
