SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

version 2.14.1

Browse Source
This commit is contained in:
Пелипенко Иван
2020-11-03 12:00:27 +03:00
parent 3e7344c95f
commit 24d9d66c24
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/main/math/pievaluator.cpp
View File

@@ -330,8 +330,10 @@ void PIEvaluator::makeOutput(PIString & string) {
void PIEvaluator::findUnknownVariables() {
PIString cvar;
unknownVars.clear();
usedVars.clear();
for (int i = 0; i < currentString.length(); i++) {
if (elements[i].var_num == -666) cvar += currentString[i];
if (elements[i].var_num >= 0) usedVars << content.variable(elements[i].var_num).name;
else if (elements[i].var_num == -666) cvar += currentString[i];
else {
if (cvar.length() == 0) continue;
unknownVars << cvar;
@@ -340,6 +342,7 @@ void PIEvaluator::findUnknownVariables() {
}
if (cvar.length() > 0) unknownVars << cvar;
unknownVars.removeDuplicates();
usedVars.removeDuplicates();
}
@@ -1196,7 +1199,7 @@ complexd PIEvaluator::evaluate() {
PIByteArray PIEvaluator::save() const {
PIByteArray ret;
ret << content << currentVariables << unknownVars << instructions << currentString << lastError << out << correct;
ret << content << currentVariables << unknownVars << instructions << currentString << lastError << out << correct << usedVars;
return ret;
}
@@ -1204,5 +1207,6 @@ PIByteArray PIEvaluator::save() const {
void PIEvaluator::load(PIByteArray ba) {
if (ba.size() <= 4) return;
ba >> content >> currentVariables >> unknownVars >> instructions >> currentString >> lastError >> out >> correct;
if (ba.size() >= 4) ba >> usedVars;
variables = currentVariables;
}