|
From: Eric E. <eri...@us...> - 2006-08-28 10:05:56
|
Update of /cvsroot/quantlibaddin/QuantLibAddin/Addins/Guile In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17144/Addins/Guile Modified Files: .cvsignore Makefile.am extra.cpp guileutils.hpp Added Files: conversions.cpp conversions.hpp Log Message: merge R000313f0-branch Index: .cvsignore =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Guile/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 19 May 2006 16:56:16 -0000 1.1 --- .cvsignore 28 Aug 2006 10:05:22 -0000 1.2 *************** *** 1,10 **** basic.* - date.* calendar.* - daycounter.* - mathf.* - prices.* capfloor.* couponvectors.* .deps exercise.* --- 1,9 ---- + basic.* calendar.* capfloor.* couponvectors.* + date.* + daycounter.* .deps exercise.* *************** *** 16,22 **** --- 15,25 ---- Makefile Makefile.in + mathf.* objecthandler.h ohfunctions.* options.* + payoffs.* + prices.* + pricingengines.* processes.* qladdin.c *************** *** 30,32 **** volatilities.* xibor.* - --- 33,34 ---- --- NEW FILE: conversions.hpp --- /* Copyright (C) 2006 Eric Ehlers This file is part of QuantLib, a free-software/open-source library for financial quantitative analysts and developers - http://quantlib.org/ QuantLib is free software: you can redistribute it and/or modify it under the terms of the QuantLib license. You should have received a copy of the license along with this program; if not, please email qua...@li... The license is also available online at http://quantlib.org/html/license.html 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 license for more details. */ #ifndef qla_guile_conversions_hpp #define qla_guile_conversions_hpp #include <ql/date.hpp> void cppToLib(QuantLib::Date &, const long &); #endif Index: guileutils.hpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Guile/guileutils.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** guileutils.hpp 19 May 2006 16:56:16 -0000 1.1 --- guileutils.hpp 28 Aug 2006 10:05:22 -0000 1.2 *************** *** 21,28 **** #include <guile/gh.h> - #include <boost/any.hpp> #include <ql/errors.hpp> #include <oh/objhandler.hpp> SCM anyToPairValue(const boost::any& a); --- 21,28 ---- #include <guile/gh.h> #include <boost/any.hpp> #include <ql/errors.hpp> #include <oh/objhandler.hpp> + #include <string> SCM anyToPairValue(const boost::any& a); --- NEW FILE: conversions.cpp --- /* Copyright (C) 2006 Eric Ehlers This file is part of QuantLib, a free-software/open-source library for financial quantitative analysts and developers - http://quantlib.org/ QuantLib is free software: you can redistribute it and/or modify it under the terms of the QuantLib license. You should have received a copy of the license along with this program; if not, please email qua...@li... The license is also available online at http://quantlib.org/html/license.html 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 license for more details. */ #include <Addins/Guile/conversions.hpp> void cppToLib(QuantLib::Date &ret, const long &in) { ret = QuantLib::Date(in); } Index: Makefile.am =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Guile/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 19 May 2006 16:56:16 -0000 1.1 --- Makefile.am 28 Aug 2006 10:05:22 -0000 1.2 *************** *** 2,6 **** AM_CPPFLAGS = -I${top_srcdir} AM_LDFLAGS = -release $(PACKAGE_VERSION) ! includedir = $(prefix)/include/qla/Addins/Guile if BUILD_GUILE --- 2,6 ---- AM_CPPFLAGS = -I${top_srcdir} AM_LDFLAGS = -release $(PACKAGE_VERSION) ! includedir = $(prefix)/include/qlo/Addins/Guile if BUILD_GUILE *************** *** 10,73 **** endif ! libQuantLibAddinGuile_la_LIBADD = ../../qla/libQuantLibAddin.la if BUILD_GUILE noinst_HEADERS = \ ! calendar.h \ ! capfloor.h \ ! couponvectors.h \ ! date.h \ ! daycounter.h \ exercise.h \ extra.h \ ! instruments.h \ ! interpolation.h \ ! mathf.h \ ohfunctions.h \ options.h \ ! prices.h \ processes.h \ ! randomsequencegenerator.h \ ! schedule.h \ ! shortratemodels.h \ ! simpleswap.h \ ! swap.h \ ! termstructures.h \ ! utilities.h \ ! volatilities.h \ ! xibor.h ! ! include_HEADERS = \ ! guileutils.hpp endif if BUILD_GUILE libQuantLibAddinGuile_la_SOURCES = \ ! calendar.cpp \ ! capfloor.cpp \ ! couponvectors.cpp \ ! date.cpp \ ! daycounter.cpp \ exercise.cpp \ extra.cpp \ guileutils.cpp \ - instruments.cpp \ - interpolation.cpp \ - mathf.cpp \ ohfunctions.cpp \ options.cpp \ ! prices.cpp \ processes.cpp \ qladdin.c \ - randomsequencegenerator.cpp \ - schedule.cpp \ session.cpp \ ! shortratemodels.cpp \ ! simpleswap.cpp \ ! swap.cpp \ ! termstructures.cpp \ ! utilities.cpp \ ! volatilities.cpp \ ! xibor.cpp endif --- 10,43 ---- endif ! libQuantLibAddinGuile_la_LIBADD = ../../qlo/libQuantLibAddin.la if BUILD_GUILE noinst_HEADERS = \ ! conversions.hpp \ exercise.h \ extra.h \ ! guileutils.hpp \ ohfunctions.h \ options.h \ ! payoffs.h \ ! pricingengines.h \ processes.h \ ! volatilities.h endif if BUILD_GUILE libQuantLibAddinGuile_la_SOURCES = \ ! conversions.cpp \ exercise.cpp \ extra.cpp \ guileutils.cpp \ ohfunctions.cpp \ options.cpp \ ! payoffs.cpp \ ! pricingengines.cpp \ processes.cpp \ qladdin.c \ session.cpp \ ! volatilities.cpp endif Index: extra.cpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Guile/extra.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extra.cpp 19 May 2006 16:56:16 -0000 1.1 --- extra.cpp 28 Aug 2006 10:05:22 -0000 1.2 *************** *** 17,25 **** #include <ql/date.hpp> ! #include <qla/qladdin.hpp> #include <Addins/Guile/guileutils.hpp> extern "C" { #include <Addins/Guile/extra.h> - #include <Addins/Guile/utilities.h> } --- 17,25 ---- #include <ql/date.hpp> ! #include <ql/Utilities/strings.hpp> ! #include <qlo/qladdin.hpp> #include <Addins/Guile/guileutils.hpp> extern "C" { #include <Addins/Guile/extra.h> } |
