diff options
| Commit | e8f80d969c9280fbb13a9f8a62391e9f211f7786 (patch) | |
|---|---|---|
| Author | 2022-05-29 14:35:08 +0300 | |
| Committer | 2022-05-29 14:35:08 +0300 | |
| Files | 9759a9d637d7c3193d3ca1104f4e8dfc11969ce6 /src | |
| FMI-OOP-P2_Tables-e8f80d969c9280fbb13a9f8a62391e9f211f7786.tar FMI-OOP-P2_Tables-e8f80d969c9280fbb13a9f8a62391e9f211f7786.tar.gz FMI-OOP-P2_Tables-e8f80d969c9280fbb13a9f8a62391e9f211f7786.zip | ||
| Parent | d8702e3f599bf3a4179c7196ad95649ac40c1f1e (diff) | |
Autocommit at 29.05.2022 @ 14:35
2 files changed, 2 insertions, 4 deletions
| -rw-r--r-- | src/Models/CellFormula.cpp | 4 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
diff --git a/src/Models/CellFormula.cpp b/src/Models/CellFormula.cpp index b85d790..6aaeefd 100644 --- a/src/Models/CellFormula.cpp +++ b/src/Models/CellFormula.cpp @@ -17,7 +17,6 @@ double CellFormula::calculate(unsigned index) { while (formula[index].right < 0) { switch (-formula[index++].right) { case '+' : lval += formula[index].left->getNumeralValue(); break; - case '-' : lval -= formula[index].left->getNumeralValue(); break; case '*' : lval *= formula[index].left->getNumeralValue(); break; case '/' : lval /= formula[index].left->getNumeralValue(); break; case '^' : lval = pow(lval, formula[index].left->getNumeralValue()); break; @@ -26,7 +25,6 @@ double CellFormula::calculate(unsigned index) { switch(formula[index].right) { case '+' : return lval + calculate(++index); - case '-' : return lval - calculate(++index); case '*' : return lval * calculate(++index); case '/' : return lval / calculate(++index); case '^' : return pow(lval, calculate(++index)); @@ -89,7 +87,7 @@ void CellFormula::parseAndSetValue(const char* str) { if (currOp == '-') { formula.add({cellToAdd, '+'}); localCells.add(CellDouble(-1.0)); - formula.add({&localCells[localCells.get_count() - 1], '*'}); + formula.add({&localCells[localCells.get_count() - 1], '*' * -1}); } else formula.add({cellToAdd, currOp}); } diff --git a/src/main.cpp b/src/main.cpp index 624d54e..ed0582f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,7 +5,7 @@ int main() { table.putCell(0, 0, "8.6"); table.putCell(0, 1, "3"); table.putCell(0, 2, "String"); - table.putCell(0, 3, "= 3 * R0C1 + R0C0 ^ R0C1 * 9 - 2 * 10 + 1"); + table.putCell(0, 3, "= 3 * R0C1 + R0C0 ^ R0C1 * 9 - 2 * 2 * 2 * 2 + 1"); // table.putCell(0, 3, "= 1 + 2 * 3 + 4 + 5"); UserInterface ui(&table); ui.run(); |