mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-18 16:27:34 +01:00
Merge pull request #254 from RedGl0w/additional_result_trigo
Changes to the trigonometry additional result
This commit is contained in:
@@ -183,7 +183,7 @@ public:
|
||||
bool isRationalOne() const;
|
||||
bool isRandom() const { return node()->isRandom(); }
|
||||
bool isParameteredExpression() const { return node()->isParameteredExpression(); }
|
||||
bool isDefinedCosineOrSine(Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit) const;
|
||||
bool isDefinedCosineOrSineOrTangent(Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit) const;
|
||||
bool isBasedIntegerCappedBy(const char * integerString) const;
|
||||
bool isDivisionOfIntegers() const;
|
||||
bool hasDefinedComplexApproximation(Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit) const;
|
||||
|
||||
@@ -292,9 +292,9 @@ bool Expression::getLinearCoefficients(char * variables, int maxVariableSize, Ex
|
||||
return !isMultivariablePolynomial;
|
||||
}
|
||||
|
||||
bool Expression::isDefinedCosineOrSine(Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit) const {
|
||||
bool Expression::isDefinedCosineOrSineOrTangent(Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit) const {
|
||||
ExpressionNode::Type t = type();
|
||||
if (t == ExpressionNode::Type::Cosine || t == ExpressionNode::Type::Sine) {
|
||||
if (t == ExpressionNode::Type::Cosine || t == ExpressionNode::Type::Sine || t == ExpressionNode::Type::Tangent) {
|
||||
float r = childAtIndex(0).approximateToScalar<float>(context, complexFormat, angleUnit);
|
||||
if (!std::isnan(r)) {
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user