UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-20 14:20:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare/normcdf2] Fix shallowReduce (mu and var indexes were wrong)

Browse Source
This commit is contained in:
Léa Saviot
2019-09-19 10:48:12 +02:00
committed by EmilieNumworks
parent 39093b0aa9
commit 3911dc89b7
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/include/poincare/norm_cdf2.h
View File

@@ -22,6 +22,8 @@ public:
Type type() const override { return Type::NormCDF2; }
Sign sign(Context * context) const override { return Sign::Positive; }
Expression setSign(Sign s, ReductionContext reductionContext) override;
int muIndex() const override { return 2; }
int varIndex() const override { return 3; }
private:
// Layout

7
poincare/include/poincare/normal_distribution_function.h
View File

@@ -8,6 +8,9 @@ namespace Poincare {
// NormalDistributionFunctions are NormCDF, NormCDF2, InvNorm and NormPDF
class NormalDistributionFunctionNode : public ExpressionNode {
public:
virtual int muIndex() const { return 1; }
virtual int varIndex() const { return 2; }
private:
// Simplication
Expression shallowReduce(ReductionContext reductionContext) override;
@@ -19,6 +22,10 @@ class NormalDistributionFunction : public Expression {
public:
NormalDistributionFunction(const NormalDistributionFunctionNode * n) : Expression(n) {}
Expression shallowReduce(Context * context, bool * stopReduction = nullptr);
private:
int muIndex() const { return node()->muIndex(); }
int varIndex() const { return node()->varIndex(); }
NormalDistributionFunctionNode * node() const { return static_cast<NormalDistributionFunctionNode *>(Expression::node()); }
};
}

4
poincare/src/normal_distribution_function.cpp
View File

@@ -19,8 +19,8 @@ Expression NormalDistributionFunction::shallowReduce(Context * context, bool * s
}
}
Expression mu = childAtIndex(1);
Expression var = childAtIndex(2);
Expression mu = childAtIndex(muIndex());
Expression var = childAtIndex(varIndex());
// Check mu and var
bool muAndVarOK = false;

3
poincare/test/simplification.cpp
View File

@@ -1082,4 +1082,7 @@ QUIZ_CASE(poincare_probability) {
assert_parsed_expression_simplify_to("invnorm(3/4,2,random())", "invnorm(3/4,2,random())"); // random can be 0
assert_parsed_expression_simplify_to("invnorm(0.5,2,0)", Undefined::Name());
assert_parsed_expression_simplify_to("invnorm(0.5,2,-1)", Undefined::Name());
assert_parsed_expression_simplify_to("normcdf(2,0,1)", "normcdf(2,0,1)");
assert_parsed_expression_simplify_to("normcdf2(1,2,0,1)", "normcdf2(1,2,0,1)");
assert_parsed_expression_simplify_to("normpdf(2,0,1)", "normpdf(2,0,1)");
}