UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Better simplification of sequences

Browse Source
This commit is contained in:
Laury
2022-02-24 18:48:10 +01:00
parent 23af100ed5
commit f95f9ebb2d
10 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
poincare/include/poincare/addition.h
View File

@@ -24,6 +24,7 @@ public:
// Properties
Type type() const override { return Type::Addition; }
virtual ExpressionNode::IntegerStatus integerStatus(Context * context) const override;
int polynomialDegree(Context * context, const char * symbolName) const override;
int getPolynomialCoefficients(Context * context, const char * symbolName, Expression coefficients[], ExpressionNode::SymbolicComputation symbolicComputation) const override;

1
poincare/include/poincare/expression.h
View File

@@ -152,6 +152,7 @@ public:
bool isOfType(ExpressionNode::Type * types, int length) const { return node()->isOfType(types, length); }
ExpressionNode::Sign sign(Context * context) const { return node()->sign(context); }
ExpressionNode::NullStatus nullStatus(Context * context) const { return node()->nullStatus(context); }
ExpressionNode::IntegerStatus integerStatus(Context * context) const { return node()->integerStatus(context); }
bool isStrictly(ExpressionNode::Sign s, Context * context) const { return s == node()->sign(context) && node()->nullStatus(context) == ExpressionNode::NullStatus::NonNull; }
bool isUndefined() const { return node()->type() == ExpressionNode::Type::Undefined || node()->type() == ExpressionNode::Type::Unreal; }
bool isNumber() const { return node()->isNumber(); }

6
poincare/include/poincare/expression_node.h
View File

@@ -162,7 +162,10 @@ public:
NonNull = 0,
Null = 1,
};
enum class IntegerStatus {
Unknown = -1,
Integer = 1,
};
class ComputationContext {
public:
ComputationContext(
@@ -233,6 +236,7 @@ public:
virtual Sign sign(Context * context) const { return Sign::Unknown; }
virtual NullStatus nullStatus(Context * context) const { return NullStatus::Unknown; }
virtual IntegerStatus integerStatus(Context * context) const { return IntegerStatus::Unknown; }
virtual bool isNumber() const { return false; }
virtual bool isRandom() const { return false; }
virtual bool isParameteredExpression() const { return false; }

1
poincare/include/poincare/multiplication.h
View File

@@ -21,6 +21,7 @@ public:
// Properties
Type type() const override { return Type::Multiplication; }
virtual IntegerStatus integerStatus(Context * context) const override;
Sign sign(Context * context) const override;
int polynomialDegree(Context * context, const char * symbolName) const override;
int getPolynomialCoefficients(Context * context, const char * symbolName, Expression coefficients[], ExpressionNode::SymbolicComputation symbolicComputation) const override;

1
poincare/include/poincare/rational.h
View File

@@ -18,6 +18,7 @@ public:
void setNegative(bool negative) { m_negative = negative; }
bool isInteger() const { return denominator().isOne(); }
NullStatus nullStatus(Context * context) const override { return isZero() ? NullStatus::Null : NullStatus::NonNull; }
virtual IntegerStatus integerStatus(Context * context) const { return isInteger() ? IntegerStatus::Integer : IntegerStatus::Unknown; }
// TreeNode
size_t size() const override;

1
poincare/include/poincare/symbol.h
View File

@@ -21,6 +21,7 @@ public:
// Expression Properties
Type type() const override { return Type::Symbol; }
virtual IntegerStatus integerStatus(Context * context) const { return context->expressionTypeForIdentifier(m_name, strlen(m_name)) == Context::SymbolAbstractType::Integer ? IntegerStatus::Integer : IntegerStatus::Unknown; }
Expression replaceSymbolWithExpression(const SymbolAbstract & symbol, const Expression & expression) override;
int polynomialDegree(Context * context, const char * symbolName) const override;
int getPolynomialCoefficients(Context * context, const char * symbolName, Expression coefficients[], ExpressionNode::SymbolicComputation symbolicComputation) const override;