source/text/scalc/01/func_opt_barrier.xhp | 6 +++---
source/text/scalc/01/func_opt_prob_hit.xhp | 6 +++---
source/text/scalc/01/func_opt_prob_inmoney.xhp | 14 +++++++-------
source/text/scalc/01/func_opt_touch.xhp | 18 +++++++++---------
4 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 6707900d671ea0fec291453f034188132ae43547
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Wed Dec 18 22:49:15 2019 +0100
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Fri Dec 20 10:52:21 2019 +0100
Proper use of ; in OPT_* examples
Change-Id: Iec0e1b4112f9d91a397566c8ff51969b6c15f8a7
Reviewed-on: https://gerrit.libreoffice.org/85439
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/scalc/01/func_opt_barrier.xhp
b/source/text/scalc/01/func_opt_barrier.xhp
index 805baef58..5b0a90086 100644
--- a/source/text/scalc/01/func_opt_barrier.xhp
+++ b/source/text/scalc/01/func_opt_barrier.xhp
@@ -27,7 +27,7 @@
<embed href="text/scalc/01/func_opt_touch.xhp#opttip"/>
<embed href="text/scalc/00/avail_release.xhp#4.0"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph role="code" id="par_id371575067051846">OPT_BARRIER(Spot;
Volatility; Rate; Foreign Rate; Maturity; Strike; Lower Barrier; Upper Barrier;
Rebate; Put or Call; In or Out; Barrier Monitoring; Greek)</paragraph>
+ <paragraph role="code" id="par_id371575067051846">OPT_BARRIER(Spot;
Volatility; Rate; Foreign Rate; Maturity; Strike; LowerBarrier; UpperBarrier;
Rebate; PutCall; InOut; BarrierMonitoring; Greek)</paragraph>
<paragraph role="paragraph" id="par_id641575073609823"
localize="false"><embedvar href="text/scalc/01/func_opt_touch.xhp#optspot"
markup="keep"/></paragraph>
<paragraph role="paragraph" id="par_id731575073617425"
localize="false"><embedvar href="text/scalc/01/func_opt_touch.xhp#optvolat"
markup="keep"/></paragraph>
<paragraph role="paragraph" id="par_id341575073621215"
localize="false"><embedvar href="text/scalc/01/func_opt_touch.xhp#optrate"
markup="keep"/></paragraph>
@@ -42,8 +42,8 @@
<paragraph role="paragraph" id="par_id211575073645423"
localize="false"><embedvar href="text/scalc/01/func_opt_touch.xhp#optbarmon"
markup="keep"/></paragraph>
<embed href="text/scalc/01/func_opt_touch.xhp#optgreek"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
- <paragraph role="paragraph"
id="par_id651575073773761"><input>=OPT_BARRIER(30,0.2,0.06,0,1,40,25,0,0,"c","o","c")</input>
returns the value 0.4243.</paragraph>
- <paragraph role="paragraph"
id="par_id401575073777593"><input>=OPT_BARRIER(50,0.4,0.05,0,0.5,65,0,80,0,"p","o","c","e")</input>
returns the value 10.1585.</paragraph>
+ <paragraph role="paragraph"
id="par_id651575073773761"><input>=OPT_BARRIER(30;0.2;0.06;0;1;40;25;0;0;"c";"o";"c")</input>
returns the value 0.4243.</paragraph>
+ <paragraph role="paragraph"
id="par_id401575073777593"><input>=OPT_BARRIER(50;0.4;0.05;0;0.5;65;0;80;0;"p";"o";"c";"e")</input>
returns the value 10.1585.</paragraph>
<section id="relatedtopics">
<embed href="text/scalc/01/func_opt_barrier.xhp#optbrarrierh1"/>
<embed href="text/scalc/01/func_opt_touch.xhp#opttouchh1"/>
diff --git a/source/text/scalc/01/func_opt_prob_hit.xhp
b/source/text/scalc/01/func_opt_prob_hit.xhp
index a6d861cd4..fd2f6477b 100644
--- a/source/text/scalc/01/func_opt_prob_hit.xhp
+++ b/source/text/scalc/01/func_opt_prob_hit.xhp
@@ -31,7 +31,7 @@
<embed href="text/scalc/01/func_opt_touch.xhp#opttip"/>
<embed href="text/scalc/00/avail_release.xhp#4.0"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph role="code" id="par_id211575074192954">OPT_PROB_HIT(Spot;
Volatility; Drift; Maturity; Lower Barrier; Upper Barrier)</paragraph>
+ <paragraph role="code" id="par_id211575074192954">OPT_PROB_HIT(Spot;
Volatility; Drift; Maturity; LowerBarrier; UpperBarrier)</paragraph>
<paragraph role="paragraph" id="par_id641575073609823"
localize="false"><embedvar href="text/scalc/01/func_opt_touch.xhp#optspot"
markup="keep"/></paragraph>
<paragraph role="paragraph" id="par_id731575073617425"
localize="false"><embedvar href="text/scalc/01/func_opt_touch.xhp#optvolat"
markup="keep"/></paragraph>
<paragraph role="paragraph" id="par_id901575074339820"><variable
id="optdrift"><emph>Drift</emph> is the annual stock price percentage drift
rate (µ in the above formula). The value is expressed as a decimal (for
example, enter 15% as 0.15).</variable></paragraph>
@@ -40,8 +40,8 @@
<paragraph role="paragraph" id="par_id321575073632473"
localize="false"><embedvar href="text/scalc/01/func_opt_touch.xhp#optlowbar"
markup="keep"/></paragraph>
<paragraph role="paragraph" id="par_id541575073636017"
localize="false"><embedvar href="text/scalc/01/func_opt_touch.xhp#optupbar"
markup="keep"/></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
- <paragraph role="paragraph"
id="par_id971575074431070"><input>=OPT_PROB_HIT(30,0.2,0.3,1,0,40)</input>
returns the value 0.6119.</paragraph>
- <paragraph role="paragraph"
id="par_id171575074434932"><input>=OPT_PROB_HIT(70,0.3,0.1,0.5,60,0)</input>
returns the value 0.4239.</paragraph>
+ <paragraph role="paragraph"
id="par_id971575074431070"><input>=OPT_PROB_HIT(30;0.2;0.3;1;0;40)</input>
returns the value 0.6119.</paragraph>
+ <paragraph role="paragraph"
id="par_id171575074434932"><input>=OPT_PROB_HIT(70;0.3;0.1;0.5;60;0)</input>
returns the value 0.4239.</paragraph>
<section id="relatedtopics">
<embed href="text/scalc/01/func_opt_barrier.xhp#optbrarrierh1"/>
<embed href="text/scalc/01/func_opt_touch.xhp#opttouchh1"/>
diff --git a/source/text/scalc/01/func_opt_prob_inmoney.xhp
b/source/text/scalc/01/func_opt_prob_inmoney.xhp
index 763b2e871..0cbedf6dd 100644
--- a/source/text/scalc/01/func_opt_prob_inmoney.xhp
+++ b/source/text/scalc/01/func_opt_prob_inmoney.xhp
@@ -20,20 +20,20 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id961575065633373">
<bookmark_value>OPT_PROB_INMONEY function</bookmark_value>
</bookmark>
- <bookmark id="bm_id971575063929082" xml-lang="en-US"
branch="hid/SC_HID_FUNC_OPT_PRON_INMONEY" localize="false"/>
+ <bookmark id="bm_id971575063929082" xml-lang="en-US"
branch="hid/SC_HID_FUNC_OPT_PROB_INMONEY" localize="false"/>
<h2 id="hd_id941575063929082"><variable id="optprobinmoneyh1"><link
href="text/scalc/01/func_opt_prob_inmoney.xhp"
name="OPT_PROB_INMONEY">OPT_PROB_INMONEY</link></variable></h2>
<paragraph id="par_id941575063929083" role="paragraph"
xml-lang="en-US"><variable id="variable name"><ahelp hid=".">Returns the
probability that an asset will end up between two barrier levels at maturity,
assuming that the stock price can be modeled as a process S that follows the
stochastic differential equation</ahelp></variable>, as follows.</paragraph>
<paragraph role="paragraph" id="par_id21575078735992" xml-lang="en-US">
<image src="media/helpimg/sc_func_opt01.svg"
id="img_id211575078735993" width="197.38334px" height="51.2125px"><alt
xml-lang="en-US" id="alt_id401575078735994">OPT_PROB_INMONEY
equation</alt></image>
</paragraph>
<paragraph role="paragraph"
id="par_id941575074893788"><literal>µ</literal> is the asset’s percentage
drift, <literal>vol</literal> is the percentage volatility of the stock, and
<literal>dW</literal> is a random sample drawn from a normal distribution with
a zero mean. <literal>W</literal> is a Wiener process or Brownian
motion.</paragraph>
- <paragraph role="paragraph" id="par_id241575075282150">If the optional
<emph>Strike</emph> and <emph>Put or Call</emph> arguments are included,
then</paragraph>
+ <paragraph role="paragraph" id="par_id241575075282150">If the optional
<emph>Strike</emph> and <emph>PutCall</emph> arguments are included,
then</paragraph>
<list type="unordered">
<listitem>
- <paragraph id="par_id931575075314553" role="listitem">For a
call option, the function returns the probability that the asset will end up
between <emph>Strike</emph> and <emph>Upper Barrier</emph>.</paragraph>
+ <paragraph id="par_id931575075314553" role="listitem">For a
call option, the function returns the probability that the asset will end up
between <emph>Strike</emph> and <emph>UpperBarrier</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id531575075321659" role="listitem">For a
put option, the function returns the probability that the asset will end up
between <emph>Lower Barrier</emph> and <emph>Strike</emph>.</paragraph>
+ <paragraph id="par_id531575075321659" role="listitem">For a
put option, the function returns the probability that the asset will end up
between <emph>LowerBarrier</emph> and <emph>Strike</emph>.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id191575075304900">The function
ignores the possibility of knock-out before maturity.</paragraph>
@@ -41,7 +41,7 @@
<embed href="text/scalc/01/func_opt_touch.xhp#opttip"/>
<embed href="text/scalc/00/avail_release.xhp#4.0"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph role="code" id="par_id761575075027094">OPT_PROB_INMONEY(Spot;
Volatility; Drift; Maturity; Lower Barrier; Upper Barrier; Strike; Put or
Call)</paragraph>
+ <paragraph role="code" id="par_id761575075027094">OPT_PROB_INMONEY(Spot;
Volatility; Drift; Maturity; LowerBarrier; UpperBarrier; Strike;
PutCall)</paragraph>
<paragraph role="paragraph" id="par_id641575073609823"
localize="false"><embedvar href="text/scalc/01/func_opt_touch.xhp#optspot"
markup="keep"/></paragraph>
<paragraph role="paragraph" id="par_id731575073617425"
localize="false"><embedvar href="text/scalc/01/func_opt_touch.xhp#optvolat"
markup="keep"/></paragraph>
<paragraph role="paragraph" id="par_id281575079343439"
localize="false"><embedvar href="text/scalc/01/func_opt_prob_hit.xhp#optdrift"
markup="keep"/></paragraph>
@@ -49,8 +49,8 @@
<paragraph role="paragraph" id="par_id851575079506442"
localize="false"><embedvar href="text/scalc/01/func_opt_prob_hit.xhp#optstrike"
markup="keep"/></paragraph>
<paragraph role="paragraph" id="par_id861575082252126"
localize="false"><embedvar href="text/scalc/01/func_opt_barrier.xhp#optputcall"
markup="keep"/></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
- <paragraph role="paragraph"
id="par_id601575074993334"><input>=OPT_PROB_INMONEY(30,0.2,0.1,1,0,50)</input>
returns the value 0.9844.</paragraph>
- <paragraph role="paragraph"
id="par_id261575074997216"><input>=OPT_PROB_INMONEY(70,0.3,0.15,1,60,0,80,"p")</input>
returns the value 0.3440.</paragraph>
+ <paragraph role="paragraph"
id="par_id601575074993334"><input>=OPT_PROB_INMONEY(30;0.2;0.1;1;0;50)</input>
returns the value 0.9844.</paragraph>
+ <paragraph role="paragraph"
id="par_id261575074997216"><input>=OPT_PROB_INMONEY(70;0.3;0.15;1;60;0;80;"p")</input>
returns the value 0.3440.</paragraph>
<section id="relatedtopics">
<embed href="text/scalc/01/func_opt_barrier.xhp#optbrarrierh1"/>
<embed href="text/scalc/01/func_opt_touch.xhp#opttouchh1"/>
diff --git a/source/text/scalc/01/func_opt_touch.xhp
b/source/text/scalc/01/func_opt_touch.xhp
index 86b79fe1f..0bdd844ee 100644
--- a/source/text/scalc/01/func_opt_touch.xhp
+++ b/source/text/scalc/01/func_opt_touch.xhp
@@ -30,18 +30,18 @@
<paragraph role="paragraph" id="par_id571575080642652">Further information
about touch / no-touch options may be found on many financial
websites.</paragraph>
<embed href="text/scalc/00/avail_release.xhp#4.0"/>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
- <paragraph role="code" id="par_id151575063296819">OPT_TOUCH(Spot;
Volatility; Rate; Foreign Rate; Maturity; Lower Barrier; Upper Barrier;
Domestic or Foreign; In or Out; Barrier Monitoring; Greek)</paragraph>
+ <paragraph role="code" id="par_id151575063296819">OPT_TOUCH(Spot;
Volatility; Rate; ForeignRate; Maturity; LowerBarrier; UpperBarrier;
ForeignDomestic; InOut; BarrierMonitoring; Greek)</paragraph>
<paragraph role="paragraph" id="par_id321575066304659"><variable
id="optspot"><emph>Spot</emph> is the price / value of the underlying asset and
should be greater than 0.0.</variable></paragraph>
<paragraph role="paragraph" id="par_id31575066315078"><variable
id="optvolat"><emph>Volatility</emph> is the annual percentage volatility of
the underlying asset expressed as a decimal (for example, enter 30% as 0.3).
The value should be greater than 0.0.</variable></paragraph>
<paragraph role="paragraph" id="par_id681575066324254"><variable
id="optrate"><emph>Rate</emph> is the continuously compounded interest rate.
This is a percentage expressed as a decimal (for example, enter 40% as
0.4).</variable></paragraph>
- <paragraph role="paragraph" id="par_id71575066333773"><variable
id="optfrate"><emph>Foreign Rate</emph> is the continuously compounded foreign
interest rate. This is a percentage expressed as a decimal (for example, enter
50% as 0.5).</variable></paragraph>
+ <paragraph role="paragraph" id="par_id71575066333773"><variable
id="optfrate"><emph>ForeignRate</emph> is the continuously compounded foreign
interest rate. This is a percentage expressed as a decimal (for example, enter
50% as 0.5).</variable></paragraph>
<paragraph role="paragraph" id="par_id21575066338734"><variable
id="optmaturity"><emph>Maturity</emph> is the time to maturity of the option,
in years, and should be non-negative.</variable></paragraph>
- <paragraph role="paragraph" id="par_id671575066343182"><variable
id="optlowbar"><emph>Lower Barrier</emph> is the predetermined lower barrier
price; set to zero for no lower barrier.</variable></paragraph>
- <paragraph role="paragraph" id="par_id301575066347357"><variable
id="optupbar"><emph>Upper Barrier</emph> is the predetermined upper barrier
price; set to zero for no upper barrier.</variable></paragraph>
- <paragraph role="paragraph" id="par_id561575066355924"><variable
id="optdomestic"><emph>Domestic or Foreign</emph> is a string that defines
whether the option pays domestic (“d”) or foreign (“f”)
currency.</variable></paragraph>
- <paragraph role="paragraph" id="par_id251575066360596"><variable
id="optinout"><emph>In or Out</emph> is a string that defines whether the
option is knock-in (“i”) or knock-out (“o”).</variable></paragraph>
- <paragraph role="paragraph" id="par_id861575066366861"><variable
id="optbarmon"><emph>Barrier Monitoring</emph> is a string that defines whether
the barrier is monitored continuously (“c”) or only at the end / maturity
(“e”).</variable></paragraph>
+ <paragraph role="paragraph" id="par_id671575066343182"><variable
id="optlowbar"><emph>LowerBarrier</emph> is the predetermined lower barrier
price; set to zero for no lower barrier.</variable></paragraph>
+ <paragraph role="paragraph" id="par_id301575066347357"><variable
id="optupbar"><emph>UpperBarrier</emph> is the predetermined upper barrier
price; set to zero for no upper barrier.</variable></paragraph>
+ <paragraph role="paragraph" id="par_id561575066355924"><variable
id="optdomestic"><emph>ForeignDomestic</emph> is a string that defines whether
the option pays domestic (“d”) or foreign (“f”) currency.</variable></paragraph>
+ <paragraph role="paragraph" id="par_id251575066360596"><variable
id="optinout"><emph>InOut</emph> is a string that defines whether the option is
knock-in (“i”) or knock-out (“o”).</variable></paragraph>
+ <paragraph role="paragraph" id="par_id861575066366861"><variable
id="optbarmon"><emph>BarrierMonitoring</emph> is a string that defines whether
the barrier is monitored continuously (“c”) or only at the end / maturity
(“e”).</variable></paragraph>
<section id="optgreek">
<paragraph role="paragraph"
id="par_id721575066374340"><emph>Greek</emph> (optional) is a string argument.
If omitted or set to “value”, “v”, “price”, or “p”, then the function simply
returns the option price. If another valid string is entered, the function
returns price sensitivities (Greeks) to one of the input parameters. The valid
options in this case are as follows.</paragraph>
<list type="unordered">
@@ -72,8 +72,8 @@
</list>
</section>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
- <paragraph role="paragraph"
id="par_id181575063666675"><input>=OPT_TOUCH(50,0.25,0.05,0,1,0,55,"d","i","c")</input>
returns the value 0.6876.</paragraph>
- <paragraph role="paragraph"
id="par_id811575063677250"><input>=OPT_TOUCH(80,0.2,0.05,0,0.5,60,0,"f","o","c","r")</input>
returns the value 15.5516.</paragraph>
+ <paragraph role="paragraph"
id="par_id181575063666675"><input>=OPT_TOUCH(50;0.25;0.05;0;1;0;55;"d";"i";"c")</input>
returns the value 0.6876.</paragraph>
+ <paragraph role="paragraph"
id="par_id811575063677250"><input>=OPT_TOUCH(80;0.2;0.05;0;0.5;60;0;"f";"o";"c";"r")</input>
returns the value 15.5516.</paragraph>
<section id="relatedtopics">
<embed href="text/scalc/01/func_opt_barrier.xhp#optbrarrierh1"/>
<embed href="text/scalc/01/func_opt_touch.xhp#opttouchh1"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
