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

[poincare] Change getLinearCoefficients to take a variable-sized

Browse Source 
variables as paramaters
This commit is contained in:
Émilie Feral
2018-09-27 10:14:16 +02:00
parent 05ce2386cd
commit cc9995d4c2
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ public:
* the variables hold in 'variables'. Otherwise, it fills 'coefficients' with
* the coefficients of the variables hold in 'variables' (following the same
* order) and 'constant' with the constant of the expression. */
bool getLinearCoefficients(char * variables, Expression coefficients[], Expression constant[], Context & context, Preferences::AngleUnit angleUnit) const;
bool getLinearCoefficients(char variables[][], Expression coefficients[], Expression constant[], Context & context, Preferences::AngleUnit angleUnit) const;
/* getPolynomialCoefficients fills the table coefficients with the expressions
* of the first 3 polynomial coefficients and return polynomialDegree.
* coefficients has up to 3 entries. It supposed to be called on Reduced

18
poincare/src/expression.cpp
View File

@@ -101,24 +101,21 @@ bool Expression::IsMatrix(const Expression e, Context & context) {
return e.type() == ExpressionNode::Type::Matrix || e.type() == ExpressionNode::Type::ConfidenceInterval || e.type() == ExpressionNode::Type::MatrixDimension || e.type() == ExpressionNode::Type::PredictionInterval || e.type() == ExpressionNode::Type::MatrixInverse || e.type() == ExpressionNode::Type::MatrixTranspose || (e.type() == ExpressionNode::Type::Symbol && Symbol::isMatrixSymbol(static_cast<const Symbol&>(e).name()));
}
bool Expression::getLinearCoefficients(char * variables, Expression coefficients[], Expression constant[], Context & context, Preferences::AngleUnit angleUnit) const {
bool Expression::getLinearCoefficients(char variables[], Expression coefficients[], Expression constant[], Context & context, Preferences::AngleUnit angleUnit) const {
assert(!recursivelyMatches(IsMatrix, context));
char * x = variables;
while (*x != 0) {
const char symbol[] = {*x, 0};
int degree = polynomialDegree(context, symbol);
int index = 0;
while (variables[index][0] != 0) {
int degree = polynomialDegree(context, variables[index]);
if (degree > 1 || degree < 0) {
return false;
}
x++;
index++;
}
Expression equation = *this;
x = variables;
int index = 0;
Expression polynomialCoefficients[k_maxNumberOfPolynomialCoefficients];
while (*x != 0) {
const char symbol[] = {*x, 0};
int degree = equation.getPolynomialReducedCoefficients(symbol, polynomialCoefficients, context, angleUnit);
while (variables[index][0] != 0) {
int degree = equation.getPolynomialReducedCoefficients(variables[index], polynomialCoefficients, context, angleUnit);
switch (degree) {
case 0:
coefficients[index] = Rational(0);
@@ -137,7 +134,6 @@ bool Expression::getLinearCoefficients(char * variables, Expression coefficients
* The equation supposed to be linear in all variables, so we can look for
* the coefficients linked to the other variables in a_0. */
equation = polynomialCoefficients[0];
x++;
index++;
}
constant[0] = Opposite(equation.clone()).deepReduce(context, angleUnit);