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

[apps/solver] Do not use symbol context if no solution found

Browse Source 
Still replace the functions
This commit is contained in:
Léa Saviot
2020-01-17 11:10:49 +01:00
parent 844a28db7b
commit 0e64e89496
20 changed files with 97 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/solver/list_controller.cpp
View File

@@ -1,6 +1,7 @@
#include "list_controller.h"
#include "app.h"
#include <poincare/code_point_layout.h>
#include <poincare/variable_context.h>
#include <assert.h>
using namespace Shared;
@@ -166,12 +167,12 @@ bool ListController::layoutFieldDidFinishEditing(LayoutField * layoutField, Poin
return true;
}
void ListController::resolveEquations() {
void ListController::resolveEquations(bool secondTry) {
if (modelStore()->numberOfDefinedModels() == 0) {
Container::activeApp()->displayWarning(I18n::Message::EnterEquation);
return;
}
EquationStore::Error e = modelStore()->exactSolve(textFieldDelegateApp()->localContext());
EquationStore::Error e = modelStore()->exactSolve(textFieldDelegateApp()->localContext(), secondTry);
switch (e) {
case EquationStore::Error::EquationUndefined:
Container::activeApp()->displayWarning(I18n::Message::UndefinedEquation);
@@ -187,14 +188,20 @@ void ListController::resolveEquations() {
return;
case EquationStore::Error::RequireApproximateSolution:
{
StackViewController * stack = stackController();
stack->push(App::app()->intervalController(), KDColorWhite, Palette::PurpleBright, Palette::PurpleBright);
App::app()->solutionsController()->setShouldReplaceFuncionsButNotSymbols(secondTry);
stackController()->push(App::app()->intervalController(), KDColorWhite, Palette::PurpleBright, Palette::PurpleBright);
return;
}
default:
{
assert(e == EquationStore::Error::NoError);
if (modelStore()->numberOfSolutions() == 0 && !secondTry) {
modelStore()->tidy();
resolveEquations(true);
return;
}
StackViewController * stack = stackController();
App::app()->solutionsController()->setShouldReplaceFuncionsButNotSymbols(secondTry);
stack->push(App::app()->solutionsControllerStack(), KDColorWhite, Palette::PurpleBright, Palette::PurpleBright);
}
}