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

[solver] Fix EquationStore with variable-sized variables

Browse Source
This commit is contained in:
Émilie Feral
2018-09-27 14:23:05 +02:00
parent 7f72f820a0
commit 75a1de32ed
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/solver/equation_store.h
View File

@@ -32,8 +32,8 @@ public:
Type type() const {
return m_type;
}
char variableAtIndex(size_t i) {
assert(i < strlen(m_variables));
const char * variableAtIndex(size_t i) {
assert(i < Poincare::Expression::k_maxNumberOfVariables && m_variables[i][0] != 0);
return m_variables[i];
}
int numberOfSolutions() const {
@@ -84,7 +84,7 @@ private:
Equation m_equations[k_maxNumberOfEquations];
Type m_type;
char m_variables[Poincare::Expression::k_maxNumberOfVariables+1][Equation::k_maxVariableSize];
char m_variables[Poincare::Expression::k_maxNumberOfVariables][Equation::k_maxVariableSize];
int m_numberOfSolutions;
Poincare::Layout m_exactSolutionExactLayouts[k_maxNumberOfApproximateSolutions];
Poincare::Layout m_exactSolutionApproximateLayouts[k_maxNumberOfExactSolutions];

10
apps/solver/solutions_controller.cpp
View File

@@ -152,16 +152,16 @@ void SolutionsController::willDisplayCellAtLocation(HighlightCell * cell, int i,
deltaCell->setLayout(m_delta2Layout);
} else {
EvenOddBufferTextCell * symbolCell = static_cast<EvenOddBufferTextCell *>(cell);
symbolCell->setFont(KDFont::LargeFont);
char bufferSymbol[10]; // hold at maximum Delta = b^2-4ac
symbolCell->setFontSize(KDFont::LargeFont);
char bufferSymbol[Equation::k_maxVariableSize+1]; // Hold at maximum Delta = b^2-4ac or the variable name + a digit
switch (m_equationStore->type()) {
case EquationStore::Type::LinearSystem:
bufferSymbol[0] = m_equationStore->variableAtIndex(j);
bufferSymbol[1] = 0;
strlcpy(bufferSymbol, m_equationStore->variableAtIndex(j), Equation::k_maxVariableSize);
break;
default:
int length = strlcpy(bufferSymbol, m_equationStore->variableAtIndex(j), Equation::k_maxVariableSize);
bufferSymbol[0] = m_equationStore->variableAtIndex(0);
bufferSymbol[1] = j+'0';
bufferSymbol[length++] = j+'0';
bufferSymbol[2] = 0;
break;
}

48
apps/solver/test/equation_store.cpp
View File

@@ -11,7 +11,7 @@ using namespace Poincare;
namespace Solver {
void assert_equation_system_exact_solve_to(const char * equations[], EquationStore::Error error, EquationStore::Type type, const char * variables, const char * solutions[], int numberOfSolutions) {
void assert_equation_system_exact_solve_to(const char * equations[], EquationStore::Error error, EquationStore::Type type, const char * variables[], const char * solutions[], int numberOfSolutions) {
char buffer[200];
GlobalContext globalContext;
EquationStore equationStore;
@@ -34,10 +34,10 @@ void assert_equation_system_exact_solve_to(const char * equations[], EquationSto
}
if (type == EquationStore::Type::LinearSystem) {
for (int i = 0; i < numberOfSolutions; i++) {
quiz_assert(equationStore.variableAtIndex(i) == variables[i]);
quiz_assert(strcmp(equationStore.variableAtIndex(i),variables[i]) == 0);
}
} else {
quiz_assert(equationStore.variableAtIndex(0) == variables[0]);
quiz_assert(strcmp(equationStore.variableAtIndex(0), variables[0]) == 0);
}
int n = type == EquationStore::Type::PolynomialMonovariable ? numberOfSolutions+1 : numberOfSolutions; // Check Delta for PolynomialMonovariable
for (int i = 0; i < n; i++) {
@@ -47,7 +47,7 @@ void assert_equation_system_exact_solve_to(const char * equations[], EquationSto
}
}
void assert_equation_approximate_solve_to(const char * equations, double xMin, double xMax, const char variable, double solutions[], int numberOfSolutions, bool hasMoreSolutions) {
void assert_equation_approximate_solve_to(const char * equations, double xMin, double xMax, const char * variable, double solutions[], int numberOfSolutions, bool hasMoreSolutions) {
char buffer[200];
GlobalContext globalContext;
EquationStore equationStore;
@@ -61,7 +61,7 @@ void assert_equation_approximate_solve_to(const char * equations, double xMin, d
equationStore.setIntervalBound(1, xMax);
equationStore.approximateSolve(&globalContext);
quiz_assert(equationStore.numberOfSolutions() == numberOfSolutions);
quiz_assert(equationStore.variableAtIndex(0) == variable);
quiz_assert(strcmp(equationStore.variableAtIndex(0), variable)== 0);
for (int i = 0; i < numberOfSolutions; i++) {
quiz_assert(std::fabs(equationStore.approximateSolutionAtIndex(i) - solutions[i]) < 1E-5);
}
@@ -71,85 +71,85 @@ void assert_equation_approximate_solve_to(const char * equations, double xMin, d
QUIZ_CASE(equation_solve) {
// x+y+z+a+b+c+d = 0
const char * equations0[] = {"x+y+z+a+b+c+d=0", 0};
assert_equation_system_exact_solve_to(equations0, EquationStore::Error::TooManyVariables, EquationStore::Type::LinearSystem, nullptr, nullptr, 0);
assert_equation_system_exact_solve_to(equations0, EquationStore::Error::TooManyVariables, EquationStore::Type::LinearSystem, {""}, nullptr, 0);
// x^2+y = 0
const char * equations1[] = {"x^2+y=0", 0};
assert_equation_system_exact_solve_to(equations1, EquationStore::Error::NonLinearSystem, EquationStore::Type::LinearSystem, nullptr, nullptr, 0);
assert_equation_system_exact_solve_to(equations1, EquationStore::Error::NonLinearSystem, EquationStore::Type::LinearSystem, {""}, nullptr, 0);
// cos(x) = 0
const char * equations2[] = {"cos(x)=0", 0};
assert_equation_system_exact_solve_to(equations2, EquationStore::Error::RequireApproximateSolution, EquationStore::Type::LinearSystem, nullptr, nullptr, 0);
assert_equation_system_exact_solve_to(equations2, EquationStore::Error::RequireApproximateSolution, EquationStore::Type::LinearSystem, {""}, nullptr, 0);
// 2 = 0
const char * equations3[] = {"2=0", 0};
assert_equation_system_exact_solve_to(equations3, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, "", nullptr, 0);
assert_equation_system_exact_solve_to(equations3, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, {""}, nullptr, 0);
// 0 = 0
const char * equations4[] = {"0=0", 0};
assert_equation_system_exact_solve_to(equations4, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, "", nullptr, INT_MAX);
assert_equation_system_exact_solve_to(equations4, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, {""}, nullptr, INT_MAX);
// x-x+2 = 0
const char * equations5[] = {"x-x+2=0", 0};
assert_equation_system_exact_solve_to(equations5, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, "", nullptr, 0);
assert_equation_system_exact_solve_to(equations5, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, {""}, nullptr, 0);
// x-x= 0
const char * equations6[] = {"x-x=0", 0};
assert_equation_system_exact_solve_to(equations6, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, "", nullptr, INT_MAX);
assert_equation_system_exact_solve_to(equations6, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, {""}, nullptr, INT_MAX);
// 2x+3=4
const char * equations7[] = {"2x+3=4", 0};
const char * solutions7[] = {"(1)/(2)"};
assert_equation_system_exact_solve_to(equations7, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, "x", solutions7, 1);
assert_equation_system_exact_solve_to(equations7, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, {"x", ""}, solutions7, 1);
// 3x^2-4x+4=2
const char * equations8[] = {"3*x^2-4x+4=2", 0};
const char * solutions8[] = {"(2-R(2)*I)/(3)","(2+R(2)*I)/(3)", "-8"};
assert_equation_system_exact_solve_to(equations8, EquationStore::Error::NoError, EquationStore::Type::PolynomialMonovariable, "x", solutions8, 2);
assert_equation_system_exact_solve_to(equations8, EquationStore::Error::NoError, EquationStore::Type::PolynomialMonovariable, {"x", ""}, solutions8, 2);
// 2*x^2-4*x+4=3
const char * equations9[] = {"2*x^2-4*x+4=3", 0};
const char * solutions9[] = {"(2-R(2))/(2)","(2+R(2))/(2)", "8"};
assert_equation_system_exact_solve_to(equations9, EquationStore::Error::NoError, EquationStore::Type::PolynomialMonovariable, "x", solutions9, 2);
assert_equation_system_exact_solve_to(equations9, EquationStore::Error::NoError, EquationStore::Type::PolynomialMonovariable, {"x", ""}, solutions9, 2);
// 2*x^2-4*x+2=0
const char * equations10[] = {"2*x^2-4*x+2=0", 0};
const char * solutions10[] = {"1", "0"};
assert_equation_system_exact_solve_to(equations10, EquationStore::Error::NoError, EquationStore::Type::PolynomialMonovariable, "x", solutions10, 1);
assert_equation_system_exact_solve_to(equations10, EquationStore::Error::NoError, EquationStore::Type::PolynomialMonovariable, {"x", ""}, solutions10, 1);
// x^2+x+1=3*x^2+pi*x-R(5)
const char * equations11[] = {"x^2+x+1=3*x^2+P*x-R(5)", 0};
const char * solutions11[] = {"(1-P+R(9+8*R(5)-2*P+P^(2)))/(4)", "(1-P-R(9+8*R(5)-2*P+P^(2)))/(4)", "9+8*R(5)-2*P+P^(2)"};
assert_equation_system_exact_solve_to(equations11, EquationStore::Error::NoError, EquationStore::Type::PolynomialMonovariable, "x", solutions11, 2);
assert_equation_system_exact_solve_to(equations11, EquationStore::Error::NoError, EquationStore::Type::PolynomialMonovariable, {"x", ""}, solutions11, 2);
// TODO
// x^3 - 4x^2 + 6x - 24 = 0
//const char * equations10[] = {"2*x^2-4*x+4=3", 0};
//assert_equation_system_exact_solve_to(equations10, EquationStore::Error::NoError, EquationStore::Type::PolynomialMonovariable, "x", {"4", "I*R(6)", "-I*R(6)", "-11616"}, 3);
//assert_equation_system_exact_solve_to(equations10, EquationStore::Error::NoError, EquationStore::Type::PolynomialMonovariable, {"x", ""}, {"4", "I*R(6)", "-I*R(6)", "-11616"}, 3);
//x^3+x^2+1=0
// x^3-3x-2=0
// Linear System
const char * equations12[] = {"x+y=0", 0};
assert_equation_system_exact_solve_to(equations12, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, "", nullptr, INT_MAX);
assert_equation_system_exact_solve_to(equations12, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, {"x", ""}, nullptr, INT_MAX);
const char * equations13[] = {"x+y=0", "3x+y=-5", 0};
const char * solutions13[] = {"-(5)/(2)", "(5)/(2)"};
assert_equation_system_exact_solve_to(equations13, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, "xy", solutions13, 2);
assert_equation_system_exact_solve_to(equations13, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, {"x", "y", ""}, solutions13, 2);
const char * equations14[] = {"x+y=0", "3x+y+z=-5", "4z-P=0", 0};
const char * solutions14[] = {"(-20-P)/(8)", "(20+P)/(8)", "(P)/(4)"};
assert_equation_system_exact_solve_to(equations14, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, "xyz", solutions14, 3);
assert_equation_system_exact_solve_to(equations14, EquationStore::Error::NoError, EquationStore::Type::LinearSystem, {"x","y","z",""}, solutions14, 3);
// Monovariable non-polynomial equation
double solutions15[] = {-90.0, 90.0};
assert_equation_approximate_solve_to("cos(x)=0", -100.0, 100.0, 'x', solutions15, 2, false);
assert_equation_approximate_solve_to("cos(x)=0", -100.0, 100.0, "x", solutions15, 2, false);
double solutions16[] = {-810.0, -630.0, -450.0, -270.0, -90.0, 90.0, 270.0, 450.0, 630.0, 810.0};
assert_equation_approximate_solve_to("cos(x)=0", -900.0, 1000.0, 'x', solutions16, 10, true);
assert_equation_approximate_solve_to("cos(x)=0", -900.0, 1000.0, "x", solutions16, 10, true);
double solutions17[] = {0};
assert_equation_approximate_solve_to("R(y)=0", -900.0, 1000.0, 'y', solutions17, 1, false);
assert_equation_approximate_solve_to("R(y)=0", -900.0, 1000.0, "y", solutions17, 1, false);
}
}