+ * Compute a mathematical expression and store the calculation details and results in the numerical result set. * - * @param BinaryFormula 公式 例如 1 + 2 - * @return 计算结果数值 + * @param Formula 被计算的表达式，要求返回值是一个数值。 + *
+ * The returned value of the evaluated expression is required to be a numeric value. + * @param formatRequired 是否需要被格式化，用于确保公式格式正确。 + *
+ * Whether it needs to be formatted to ensure that the formula format is correct. + * @return 数值结果集对象，其中保存着每一步的操作数据，以及最终结果数值 + *
+ * Numerical result set object, which stores the operation data of each step and the final result value */ - static double calculation2(std::string Formula); + CalculationNumberResults calculation(std::string Formula, bool formatRequired) = 0; }; } diff --git a/include/BracketsCalculationTwo.h b/include/BracketsCalculationTwo.h new file mode 100644 index 0000000..2e265cb --- /dev/null +++ b/include/BracketsCalculationTwo.h @@ -0,0 +1,30 @@ +// +// Created by Liming on 2023/6/20. +// + +#ifndef MATHEMATICAL_EXPRESSION_CPP_BRACKETSCALCULATIONTWO_H +#define MATHEMATICAL_EXPRESSION_CPP_BRACKETSCALCULATIONTWO_H + +#include "regex" +#include "BracketsCalculation.h" + +namespace ME { + class BracketsCalculationTwo : public BracketsCalculation { + + public: + string formatStr(std::string string) override; + + void check(std::string string) override; + + ME::CalculationNumberResults operator>>(std::string &format); + + ME::CalculationNumberResults operator<<(std::string &format); + + string getName() override; + + CalculationNumberResults calculation(std::string Formula, bool formatRequired) override; + }; +} + + +#endif //MATHEMATICAL_EXPRESSION_CPP_BRACKETSCALCULATIONTWO_H diff --git a/include/CalculationResults.h b/include/CalculationResults.h index 51f4b29..ed8ce80 100644 --- a/include/CalculationResults.h +++ b/include/CalculationResults.h @@ -202,10 +202,6 @@ namespace ME { size_t operator()(const CalculationBooleanResults &person) const; }; - ostream &operator<<(ostream &out, const CalculationBooleanResults *rhs); - - ostream &operator<<(ostream &out, const CalculationBooleanResults &rhs); - CalculationNumberResults operator+(CalculationNumberResults v1, CalculationNumberResults v2); CalculationNumberResults operator-(CalculationNumberResults v1, CalculationNumberResults v2); @@ -217,10 +213,14 @@ namespace ME { CalculationNumberResults operator<<(CalculationNumberResults v1, CalculationNumberResults v2); CalculationNumberResults operator>>(CalculationNumberResults v1, CalculationNumberResults v2); +} - ostream &operator<<(ostream &out, const CalculationNumberResults *rhs); +ostream &operator<<(ostream &out, const ME::CalculationBooleanResults *rhs); - ostream &operator<<(ostream &out, const CalculationNumberResults &rhs); -} +ostream &operator<<(ostream &out, const ME::CalculationBooleanResults &rhs); + +ostream &operator<<(ostream &out, const ME::CalculationNumberResults *rhs); + +ostream &operator<<(ostream &out, const ME::CalculationNumberResults &rhs); #endif //MATHEMATICAL_EXPRESSION_CPP_CALCULATIONRESULTS_H diff --git a/include/NumberCalculation.h b/include/NumberCalculation.h index 3cedef3..a4110cd 100644 --- a/include/NumberCalculation.h +++ b/include/NumberCalculation.h @@ -26,6 +26,8 @@ class NumberCalculation : public Calculation { */ virtual ME::CalculationNumberResults calculation(std::string Formula, bool formatRequired) = 0; +private: + virtual /** * 计算一个数学表达式，并将计算细节与计算结果存储到数值结果集中。 *
diff --git a/include/mathematical_expression.h b/include/mathematical_expression.h
index 4c2300f..eb2c954 100644
--- a/include/mathematical_expression.h
+++ b/include/mathematical_expression.h
@@ -6,11 +6,47 @@
#define MATHEMATICAL_EXPRESSION_CPP_MATHEMATICAL_EXPRESSION_H
#include "PrefixExpressionOperation.h"
+#include "BracketsCalculationTwo.h"
-namespace ME {
- PrefixExpressionOperation prefixExpressionOperation;
+#define VERSION "1.0.0-mathematical_expression-C++";
-}
+/**
+ * 数学表达式解析计算库中的门户类，由该类获取到数学表达式计算库中的相关数据对象。
+ *
+ * The portal class in the mathematical expression analysis and calculation library, which obtains the relevant data objects in the mathematical expression calculation library.
+ */
+class mathematical_expression {
+protected:
+ ME::PrefixExpressionOperation prefixExpressionOperation;
+ ME::BracketsCalculationTwo bracketsCalculation2;
+public:
+
+ /**
+ *
+ * @return 此库的版本信息。
+ *
+ * The version information of this library.
+ */
+ static string getVERSION() {
+ return VERSION
+ }
+
+ /**
+ *
+ * @return 无括号表达式计算组件对象。
+ *
+ * An expression without parentheses evaluates a component object.
+ */
+ ME::PrefixExpressionOperation getPrefixExpressionOperation();
+
+ /**
+ *
+ * @return 数学表达式计算组件，该组件能够解析并计算一个带有括号的表达式。
+ *
+ * Mathematical expression calculation component, which can parse and evaluate an expression with parentheses.
+ */
+ ME::BracketsCalculationTwo getBracketsCalculation2();
+};
#endif //MATHEMATICAL_EXPRESSION_CPP_MATHEMATICAL_EXPRESSION_H
diff --git a/src/core/calculation/BracketsCalculation.cpp b/src/core/calculation/BracketsCalculation.cpp
index 60dedb0..9661327 100644
--- a/src/core/calculation/BracketsCalculation.cpp
+++ b/src/core/calculation/BracketsCalculation.cpp
@@ -13,31 +13,70 @@ namespace ME {
return std::regex_replace(string, ME::ALL_INVISIBLE_CHARACTERS_PATTERN, NO_CHAR);
}
- double BracketsCalculation::calculation2(std::string Formula) {
- std::string a;
- std::string b;
- bool isOk = false;
- char Operator = 0;
- for (const auto &c: Formula) {
- if (!isOk) {
- if (StrUtils::IsAnOperator(c)) {
- Operator = c;
- isOk = true;
+ string BracketsCalculation::getName() {
+ return "BracketsCalculation";
+ }
+
+ void BracketsCalculation::check(std::string string) {
+ if (string.empty()) {
+ throw ME::WrongFormat("您传入的表达式为null 无法进行计算。");
+ }
+ unsigned int lastIndex = string.length() - 1;
+ // 左括号出现数量
+ int LeftCount = 0;
+ // 右括号出现数量
+ int RightCount = 0;
+ {
+ char lastChar = string[lastIndex];
+ while (lastChar == EMPTY) {
+ lastChar = string[--lastIndex];
+ }
+ if (!StrUtils::IsANumber(lastChar)) {
+ if (lastChar != RIGHT_BRACKET) {
+ throw ME::WrongFormat(
+ &"您传入的表达式格式有误，最后一个字符不是一个数值！！！\nThe format of the expression you passed in is incorrect. The last character is not a numeric value!!!\nERROR => "[lastChar]
+ );
+ }
+ }
+ }
+ // 上一个字符是否是运算符
+ bool is = false;
+ int index = 0;
+ for (const auto &c: string) {
+ if (c == LEFT_BRACKET) {
+ ++LeftCount;
+ } else if (c == RIGHT_BRACKET) {
+ ++RightCount;
+ } else if (!(StrUtils::IsANumber(c) || c == DECIMAL_POINT || c == EMPTY)) {
+ if (!StrUtils::IsAnOperator(c)) {
+ std::string data = "解析表达式的时候出现了未知符号!!!\nUnknown symbol appears when parsing expression!!!\nWrong format => [";
+ data += c;
+ throw ME::WrongFormat(data.append("] from " + string));
} else {
- b += c;
+ if (is && c != MINUS_SIGN && c != PLUS_SIGN)
+ throw ME::WrongFormat(
+ "您的数学表达式不正确，缺失了一个运算数值或多出了一个运算符。ERROR => " + string);
+ is = true;
+ continue;
}
- } else {
- a += c;
}
+ if (++index > lastIndex) {
+ break;
+ }
+ is = false;
}
- if (Operator != 0) {
- return NumberUtils::calculation(
- Operator, StrUtils::stringToDouble(a), StrUtils::stringToDouble(b)
- );
- } else {
- throw ME::AbnormalOperation("您的公式格式错误，未解析成功，请您检查您的格式哦！\n" +
- "The format of your formula is wrong, and it was not parsed successfully. Please check your format!\n" +
- "error format => " + Formula);
+ if (LeftCount != RightCount) {
+ int absV = abs(LeftCount - RightCount);
+ std::string data =
+ "您的格式不正确，出现了数学表达式中不正确的括号对数，请您检查是否缺少或者多出了[" +
+ to_string(absV);
+ data
+ .append(data + "]个括号。\n")
+ .append("Your format is incorrect. There are incorrect parenthesis logarithms in the mathematical expression. Please check whether [")
+ .append(to_string(absV))
+ .append("] parentheses are missing or extra.\n")
+ .append("Wrong from [" + string + "]");
+ throw ME::WrongFormat(data);
}
}
}
diff --git a/src/core/calculation/BracketsCalculationTwo.cpp b/src/core/calculation/BracketsCalculationTwo.cpp
new file mode 100644
index 0000000..34a9cf7
--- /dev/null
+++ b/src/core/calculation/BracketsCalculationTwo.cpp
@@ -0,0 +1,70 @@
+//
+// Created by Liming on 2023/6/20.
+//
+
+#include "BracketsCalculationTwo.h"
+#include "ConstantRegion.h"
+
+static ME::PrefixExpressionOperation operation;
+
+ME::CalculationNumberResults ME::BracketsCalculationTwo::calculation(std::string Formula, bool formatRequired) {
+ unsigned int length = Formula.length();
+ // 公式存储区
+ std::string stringBuilder;
+ // 括号内数据的起始索引
+ int start = 0;
+ bool setok = false;
+ int layer = 0;
+ // 括号内的括号均衡数量，为了确定是一对括号
+ int count = 0;
+ for (int i = 0; i < length; i++) {
+ char aChar = Formula[i];
+ if (aChar == LEFT_BRACKET) {
+ // 如果当前字符是一个左括号，那么说明括号开始了，这个时候需要将起始点记录
+ if (!setok) {
+ setok = true;
+ start = i + 1;
+ }
+ ++count;
+ } else if (aChar == RIGHT_BRACKET && --count == 0) {
+ setok = false;
+ // 如果当前字符是一个右括号，那么就将括号中的字符进行递归计算，计算之后将该参数作为公式的一部分
+ CalculationNumberResults calculation = operation.calculation(
+ Formula.substr(start, i - start + 1), formatRequired
+ );
+ stringBuilder.append(to_string(calculation.getResult()));
+ ++layer;
+ } else if (!setok && aChar != EMPTY) {
+ // 如果不是一个括号就将字符提供给字符串缓冲区
+ stringBuilder += aChar;
+ }
+ }
+ // 将此字符串的结果计算出来
+ CalculationNumberResults calculationNumberResults = operation.calculation(stringBuilder,
+ formatRequired);
+ return {
+ calculationNumberResults.getResultLayers() + layer,
+ calculationNumberResults.getResult(),
+ this->getName()
+ };
+}
+
+string ME::BracketsCalculationTwo::formatStr(std::string string) {
+ return BracketsCalculation::formatStr(string);
+}
+
+void ME::BracketsCalculationTwo::check(std::string string) {
+ BracketsCalculation::check(string);
+}
+
+string ME::BracketsCalculationTwo::getName() {
+ return BracketsCalculation::getName();
+}
+
+ME::CalculationNumberResults ME::BracketsCalculationTwo::operator>>(string &format) {
+ return this->calculation(format, true);
+}
+
+ME::CalculationNumberResults ME::BracketsCalculationTwo::operator<<(string &format) {
+ return this->calculation(format, true);
+}
diff --git a/src/core/calculation/NumberCalculation.cpp b/src/core/calculation/NumberCalculation.cpp
index 9dc9e6d..d4ab3ce 100644
--- a/src/core/calculation/NumberCalculation.cpp
+++ b/src/core/calculation/NumberCalculation.cpp
@@ -2,3 +2,5 @@
// Created by Liming on 2023/6/19.
//
+#include