Skip to content

C
core
Kaydet (Commit) 5cee9430 authored tarafından Winfried Donkers's avatar Winfried Donkers Kaydeden (comit) Eike Rathke
Dosyalara gözat
Seçenekler

tdf#117041 use correct expression in if statement. 

Follow up of commit e58b3f98.

Change-Id: Ia142ae401a8c86e3411830703794eedb351bca09
Reviewed-on: https://gerrit.libreoffice.org/53733Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
üst e56702c4
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 1 deletion
sc/qa/unit/data/functions/statistical/fods/hypgeomdist.fods
Dosyayı görüntüle @ 5cee9430
......@@ -4468,6 +4468,151 @@
<table:table-cell table:style-name="ce37"/>
<table:table-cell table:number-columns-repeated="2"/>
</table:table-row>
<table:table-row table:style-name="ro9">
<table:table-cell table:style-name="ce10" table:formula="of:=HYPGEOMDIST(2;4;1;10;1)" office:value-type="float" office:value="1" calcext:value-type="float">
<text:p>1</text:p>
</table:table-cell>
<table:table-cell office:value-type="float" office:value="1" calcext:value-type="float">
<text:p>1</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce54" table:formula="of:=ROUND([.A34];12)=ROUND([.B34];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
<text:p>TRUE</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A34])" office:value-type="string" office:string-value="=HYPGEOMDIST(2,4,1,10,1)" calcext:value-type="string">
<text:p>=HYPGEOMDIST(2,4,1,10,1)</text:p>
</table:table-cell>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>tdf117041</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="16"/>
<table:table-cell table:style-name="ce33"/>
<table:table-cell table:style-name="ce35"/>
<table:table-cell table:style-name="ce26"/>
<table:table-cell/>
<table:table-cell table:style-name="ce36"/>
<table:table-cell/>
<table:table-cell table:style-name="ce26" table:number-columns-repeated="2"/>
<table:table-cell table:number-columns-repeated="2"/>
<table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce37"/>
<table:table-cell table:number-columns-repeated="2"/>
</table:table-row>
<table:table-row table:style-name="ro9">
<table:table-cell table:style-name="ce10" table:formula="of:=HYPGEOMDIST(2;4;1;10;0)" office:value-type="float" office:value="0" calcext:value-type="float">
<text:p>0</text:p>
</table:table-cell>
<table:table-cell office:value-type="float" office:value="0" calcext:value-type="float">
<text:p>0</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce54" table:formula="of:=ROUND([.A35];12)=ROUND([.B35];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
<text:p>TRUE</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A35])" office:value-type="string" office:string-value="=HYPGEOMDIST(2,4,1,10,1)" calcext:value-type="string">
<text:p>=HYPGEOMDIST(2,4,1,10,1)</text:p>
</table:table-cell>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>tdf117041</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="16"/>
<table:table-cell table:style-name="ce33"/>
<table:table-cell table:style-name="ce35"/>
<table:table-cell table:style-name="ce26"/>
<table:table-cell/>
<table:table-cell table:style-name="ce36"/>
<table:table-cell/>
<table:table-cell table:style-name="ce26" table:number-columns-repeated="2"/>
<table:table-cell table:number-columns-repeated="2"/>
<table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce37"/>
<table:table-cell table:number-columns-repeated="2"/>
</table:table-row>
<table:table-row table:style-name="ro9">
<table:table-cell table:style-name="ce10" table:formula="of:=HYPGEOMDIST(1;4;1;10;0)" office:value-type="float" office:value="0.4" calcext:value-type="float">
<text:p>0.4</text:p>
</table:table-cell>
<table:table-cell office:value-type="float" office:value="0.4" calcext:value-type="float">
<text:p>0.4</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce54" table:formula="of:=ROUND([.A36];12)=ROUND([.B36];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
<text:p>TRUE</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A36])" office:value-type="string" office:string-value="=HYPGEOMDIST(1,4,1,10;0)" calcext:value-type="string">
<text:p>=HYPGEOMDIST(1,4,1,10,0)</text:p>
</table:table-cell>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>tdf117041</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="16"/>
<table:table-cell table:style-name="ce33"/>
<table:table-cell table:style-name="ce35"/>
<table:table-cell table:style-name="ce26"/>
<table:table-cell/>
<table:table-cell table:style-name="ce36"/>
<table:table-cell/>
<table:table-cell table:style-name="ce26" table:number-columns-repeated="2"/>
<table:table-cell table:number-columns-repeated="2"/>
<table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce37"/>
<table:table-cell table:number-columns-repeated="2"/>
</table:table-row>
<table:table-row table:style-name="ro9">
<table:table-cell table:style-name="ce10" table:formula="of:=HYPGEOMDIST(1;4;4;6;0)" office:value-type="float" office:value="0" calcext:value-type="float">
<text:p>0</text:p>
</table:table-cell>
<table:table-cell office:value-type="float" office:value="0" calcext:value-type="float">
<text:p>0</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce54" table:formula="of:=ROUND([.A37];12)=ROUND([.B37];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
<text:p>TRUE</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A37])" office:value-type="string" office:string-value="=HYPGEOMDIST(1,4,4,6,0)" calcext:value-type="string">
<text:p>=HYPGEOMDIST(1,4,4,6,0)</text:p>
</table:table-cell>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>tdf117041</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="16"/>
<table:table-cell table:style-name="ce33"/>
<table:table-cell table:style-name="ce35"/>
<table:table-cell table:style-name="ce26"/>
<table:table-cell/>
<table:table-cell table:style-name="ce36"/>
<table:table-cell/>
<table:table-cell table:style-name="ce26" table:number-columns-repeated="2"/>
<table:table-cell table:number-columns-repeated="2"/>
<table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce37"/>
<table:table-cell table:number-columns-repeated="2"/>
</table:table-row>
<table:table-row table:style-name="ro9">
<table:table-cell table:style-name="ce10" table:formula="of:=HYPGEOMDIST(2;4;4;6;1)" office:value-type="float" office:value="0.4" calcext:value-type="float">
<text:p>0.4</text:p>
</table:table-cell>
<table:table-cell office:value-type="float" office:value="0.4" calcext:value-type="float">
<text:p>0.4</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce54" table:formula="of:=ROUND([.A38];12)=ROUND([.B38];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
<text:p>TRUE</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce21" table:formula="of:=FORMULA([.A38])" office:value-type="string" office:string-value="=HYPGEOMDIST(2,4,4,6,0)" calcext:value-type="string">
<text:p>=HYPGEOMDIST(2,4,4,6,0)</text:p>
</table:table-cell>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>tdf117041</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="16"/>
<table:table-cell table:style-name="ce33"/>
<table:table-cell table:style-name="ce35"/>
<table:table-cell table:style-name="ce26"/>
<table:table-cell/>
<table:table-cell table:style-name="ce36"/>
<table:table-cell/>
<table:table-cell table:style-name="ce26" table:number-columns-repeated="2"/>
<table:table-cell table:number-columns-repeated="2"/>
<table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce37"/>
<table:table-cell table:number-columns-repeated="2"/>
</table:table-row>
<table:table-row table:style-name="ro9">
<table:table-cell table:number-columns-repeated="2"/>
<table:table-cell table:style-name="ce16"/>
......
sc/source/core/tool/interpr3.cxx
Dosyayı görüntüle @ 5cee9430
......@@ -1868,7 +1868,7 @@ void ScInterpreter::ScHypGeomDist( int nMinParamCount )
for ( int i = ( bCumulative ? 0 : x ); i <= x && nGlobalError == FormulaError::NONE; i++ )
{
if ( (i >= n - N + M) || (i >= M) )
if ( (n - i <= N - M) && (i <= M) )
fVal += GetHypGeomDist( i, n, M, N );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment