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] Delta discriminant is counted as a solution to clear the code

Browse Source
This commit is contained in:
Émilie Feral
2019-01-09 10:25:38 +01:00
committed by Léa Saviot
parent fbb1fbd138
commit 4ccf1f08a9
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/solver/equation_store.cpp
View File

@@ -43,7 +43,7 @@ void EquationStore::tidy() {
}
Poincare::Layout EquationStore::exactSolutionLayoutAtIndex(int i, bool exactLayout) {
assert(m_type != Type::Monovariable && i >= 0 && (i < m_numberOfSolutions || (i == m_numberOfSolutions && m_type == Type::PolynomialMonovariable)));
assert(m_type != Type::Monovariable && i >= 0 && (i < m_numberOfSolutions));
if (exactLayout) {
return m_exactSolutionExactLayouts[i];
} else {
@@ -177,20 +177,14 @@ EquationStore::Error EquationStore::exactSolve(Poincare::Context * context) {
// Create the results' layouts
int solutionIndex = 0;
int initialNumberOfSolutions = m_numberOfSolutions <= k_maxNumberOfExactSolutions ? m_numberOfSolutions : -1;
int maxNumberSolutions = initialNumberOfSolutions + (initialNumberOfSolutions >= k_maxNumberOfExactSolutions - 1 ? 0 : 1);
// We iterate through the solutions and the potential delta
for (int i = 0; i < maxNumberSolutions; i++) {
for (int i = 0; i < initialNumberOfSolutions; i++) {
if (!exactSolutions[i].isUninitialized()) {
assert(!exactSolutionsApproximations[i].isUninitialized());
if (exactSolutionsApproximations[i].type() == ExpressionNode::Type::Unreal) {
// Discard unreal solutions.
if (i < initialNumberOfSolutions) {
// Discard the solution
m_numberOfSolutions--;
continue;
}
// Delta is not real
assert(i == initialNumberOfSolutions);
m_numberOfSolutions--;
continue;
}
m_exactSolutionExactLayouts[solutionIndex] = PoincareHelpers::CreateLayout(exactSolutions[i]);
m_exactSolutionApproximateLayouts[solutionIndex] = PoincareHelpers::CreateLayout(exactSolutionsApproximations[i]);
@@ -271,16 +265,16 @@ EquationStore::Error EquationStore::oneDimensialPolynomialSolve(Expression exact
if (delta.isRationalZero()) {
// if delta = 0, x0=x1= -b/(2a)
exactSolutions[0] = Division(Opposite(coefficients[1]), Multiplication(Rational(2), coefficients[2]));
m_numberOfSolutions = 1;
m_numberOfSolutions = 2;
} else {
// x0 = (-b-sqrt(delta))/(2a)
exactSolutions[0] = Division(Subtraction(Opposite(coefficients[1].clone()), SquareRoot::Builder(delta.clone())), Multiplication(Rational(2), coefficients[2].clone()));
// x1 = (-b+sqrt(delta))/(2a)
exactSolutions[1] = Division(Addition(Opposite(coefficients[1]), SquareRoot::Builder(delta.clone())), Multiplication(Rational(2), coefficients[2]));
m_numberOfSolutions = 2;
m_numberOfSolutions = 3;
}
exactSolutions[m_numberOfSolutions] = delta;
for (int i = 0; i <= m_numberOfSolutions; i++) {
exactSolutions[m_numberOfSolutions-1] = delta;
for (int i = 0; i < m_numberOfSolutions; i++) {
exactSolutions[i].simplifyAndApproximate(&exactSolutions[i], &exactSolutionsApproximations[i], *context, updatedComplexFormat(), Poincare::Preferences::sharedPreferences()->angleUnit());
}
return Error::NoError;

7
apps/solver/solutions_controller.cpp
View File

@@ -136,9 +136,6 @@ Responder * SolutionsController::defaultController() {
/* TableViewDataSource */
int SolutionsController::numberOfRows() {
if (m_equationStore->type() == EquationStore::Type::PolynomialMonovariable) {
return m_equationStore->numberOfSolutions() + 1; // add the delta row
}
return m_equationStore->numberOfSolutions();
}
@@ -149,7 +146,7 @@ int SolutionsController::numberOfColumns() {
void SolutionsController::willDisplayCellAtLocation(HighlightCell * cell, int i, int j) {
if (i == 0) {
// Name of the variable or discriminant
if (m_equationStore->type() == EquationStore::Type::PolynomialMonovariable && j == m_equationStore->numberOfSolutions()) {
if (m_equationStore->type() == EquationStore::Type::PolynomialMonovariable && j == m_equationStore->numberOfSolutions()-1) {
// Discriminant
EvenOddExpressionCell * deltaCell = static_cast<EvenOddExpressionCell *>(cell);
deltaCell->setLayout(m_delta2Layout);
@@ -265,7 +262,7 @@ int SolutionsController::reusableCellCount(int type) {
int SolutionsController::typeAtLocation(int i, int j) {
if (i == 0) {
if (m_equationStore->type() == EquationStore::Type::PolynomialMonovariable && j == m_equationStore->numberOfSolutions()) {
if (m_equationStore->type() == EquationStore::Type::PolynomialMonovariable && j == m_equationStore->numberOfSolutions()-1) {
return 1;
}
return 0;