Autocommit at 30.05.2022 @ 18:02

2 files changed, 16 insertions, 17 deletions

diff --git a/src/Models/CellFormula.cpp b/src/Models/CellFormula.cpp
index 915c38d..5cc3ae5 100644
--- a/src/Models/CellFormula.cpp
+++ b/src/Models/CellFormula.cpp
@@ -4,8 +4,8 @@
 #include <iostream>
 #include <stdexcept>
 
-const Cell* CellFormula::ptrByInd(int firstInd, int secondInd) const {
-	return (firstInd < 0) ? &localCells[secondInd] : (*tableCells)[firstInd][secondInd];
+const Cell* CellFormula::ptrByInd(Pair<int, int> loc) const {
+	return (loc.left < 0) ? &localCells[loc.right] : (*tableCells)[loc.left][loc.right];
 }
 
 double pow(double x, unsigned y) {
@@ -17,31 +17,30 @@ double pow(double x, unsigned y) {
 	return res;
 }
 
-double CellFormula::calculate(unsigned index) {
-	Cell* currCell = ptrByInd(formula[index].left);
-	double lval = (c.firstInd == -1) ? localCells[c.secondInd].getNumeralValue() : (*tableCells)[c.firstInd][c.secondInd]->getNumeralValue();
+double CellFormula::calculate(unsigned index) const {
+	const Cell* currCell = ptrByInd(formula[index].left);
+	double numVal = currCell->getNumeralValue();
 
 	while (formula[index].right < 0) {
-		double secondLval = (c.firstInd == -1) ? localCells[c.secondInd].getNumeralValue() : (*tableCells)[c.firstInd][c.secondInd]->getNumeralValue();
 		switch (-formula[index].right) {
-			case '+' : lval += secondLval; break;
-			case '*' : lval *= secondLval; break;
-			case '/' : if (secondLval == 0) throw std::logic_error("");
-					   lval /= secondLval; break;
-			case '^' : lval  = pow(lval, secondLval); break;
+			case '+' : numVal += ptrByInd(formula[index].left)->getNumeralValue(); break;
+			case '*' : numVal *= ptrByInd(formula[index].left)->getNumeralValue(); break;
+			case '/' : if (ptrByInd(formula[index].left)->getNumeralValue() == 0) throw std::logic_error("");
+					   numVal /= ptrByInd(formula[index].left)->getNumeralValue(); break;
+			case '^' : numVal  = pow(numVal, ptrByInd(formula[index].left)->getNumeralValue()); break;
 		}
 	}
 
 	double temp;
 	switch(formula[index].right) {
-		case '+'  : return lval + calculate(++index);
-		case '*'  : return lval * calculate(++index);
+		case '+'  : return numVal + calculate(++index);
+		case '*'  : return numVal * calculate(++index);
 		case '/'  : temp = calculate(++index);
 					if (temp == 0) throw std::logic_error("");
-					return lval / temp;
-		case '^'  : return pow(lval, calculate(++index));
+					return numVal / temp;
+		case '^'  : return pow(numVal, calculate(++index));
 		case '\0' :
-		default   : return lval;
+		default   : return numVal;
 	}
 }
 
diff --git a/src/Models/CellFormula.h b/src/Models/CellFormula.h
index 9fd07a5..61867b5 100644
--- a/src/Models/CellFormula.h
+++ b/src/Models/CellFormula.h
@@ -13,7 +13,7 @@ class CellFormula : public Cell {
 	List<Pair<Pair<int, int>, char>> formula;
 	String rawFormula;
 
-	const Cell* ptrByInd(int firstInd, int secondInd) const;
+	const Cell* ptrByInd(Pair<int, int> loc) const;
 	double calculate(unsigned index = 0) const;
 
 public: