Re: Adding new functions to blackcalculator

Posted by Dimathematician on Jun 07, 2010; 4:05pm
URL: http://quantlib.414.s1.nabble.com/Adding-new-functions-to-blackcalculator-tp13518p13530.html

I feel kind of bad since I needed so much time to check! Anyways, I
checked and everything seems to be ok. I've attached an example project
which uses the contributed class, similar to the other example projects.
You might want to add it to the trunk. Anyways, I appologize for such a slow
response time! Bad bad. Meanwhile I've extended the class...

2010/3/3 Dima <[hidden email]>

I see, thanks. Will get back to you

2010/3/3 Luigi Ballabio <[hidden email]>

On Wed, 2010-03-03 at 09:47 +0100, Dima wrote:
> Thanks Luigi and sorry for not having answered earlier. I'm busy. I
> tried to build QL from the latest trunk
> but was not sucessfull. And the stuff you added is not in the official
> 1.0 version, so I couldn't really check.
> Don't know what happened to the trunk files, they seem to be
> corrupted. For example, in smilesection.hpp
> I find
>
> <<<<<<<<<<.mine
>
> in the code. Its either a problem here or in the trunk.

The trunk is clean.  You modified the code on your machine, made a svn
update, and got a conflict between your local changes and the changes
pulled in by the update. Subversion doesn't know how to merge them and
keeps both sets of changes between markers such as the one above. You'll
have to resolve the conflict manually. You can see
<http://svnbook.red-bean.com/en/1.5/svn.tour.cycle.html#svn.tour.cycle.resolve> for more details.

Luigi


--

The box said "Use Windows 95 or better," so I got a Macintosh.

------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit.  See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
QuantLib-dev mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-dev