1.0.1 版本小修复 (#2)

更新版本号冲突，并且增加注释
BeardedManZhao · Jun 23, 2023 · f05f5d3 · f05f5d3
1 parent cc8072f
commit f05f5d3
Show file tree

Hide file tree

Showing 63 changed files with 1,038 additions and 914 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,6 @@ add_library(
         src/core/container/CalculationResults.cpp include/CalculationResults.h
         include/Utils.h
         include/ConstantRegion.h
-        src/core/manager/CalculationManagement.cpp include/CalculationManagement.h
         src/core/calculation/PrefixExpressionOperation.cpp
         src/exceptional/MExceptional.cpp include/MExceptional.h
         src/utils/NumberUtils.cpp src/utils/StrUtils.cpp src/dataContainer/MEStack.cpp include/MEStack.h include/PrefixExpressionOperation.h
@@ -22,5 +21,8 @@ add_library(
         src/core/calculation/BooleanCalculation.cpp include/BooleanCalculation.h
         src/core/calculation/BooleanCalculationTwo.cpp include/BooleanCalculationTwo.h
         src/core/calculation/FunctionManager.cpp include/FunctionManager.h
-        src/core/calculation/FunctionFormulaCalculation.cpp include/FunctionFormulaCalculation.h src/core/calculation/CalculationConstant.cpp include/CalculationConstant.h src/core/calculation/CumulativeCalculation.cpp include/CumulativeCalculation.h)
+        src/core/calculation/FunctionFormulaCalculation.cpp include/FunctionFormulaCalculation.h
+        src/core/calculation/CalculationConstant.cpp include/CalculationConstant.h
+        src/core/calculation/CumulativeCalculation.cpp include/CumulativeCalculation.h
+)
 
diff --git a/.../reply/cache-v2-4db6c752e78f6aa22f84.json → .../reply/cache-v2-96b496f63facb2cc201e.json b/.../reply/cache-v2-4db6c752e78f6aa22f84.json → .../reply/cache-v2-96b496f63facb2cc201e.json
@@ -15,7 +15,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/addr2line.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/addr2line.exe"
 		},
 		{
 			"name" : "CMAKE_AR",
@@ -31,7 +31,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/ar.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/ar.exe"
 		},
 		{
 			"name" : "CMAKE_BUILD_TYPE",
@@ -55,7 +55,7 @@
 				}
 			],
 			"type" : "INTERNAL",
-			"value" : "d:/MyGitHub/mathematical-expression-cpp/cmake-build-debug"
+			"value" : "d:/MyGithub/mathematical-expression-cpp/cmake-build-debug"
 		},
 		{
 			"name" : "CMAKE_CACHE_MAJOR_VERSION",
@@ -155,7 +155,7 @@
 				}
 			],
 			"type" : "INTERNAL",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/cmake/win/bin/cmake.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/cmake/win/bin/cmake.exe"
 		},
 		{
 			"name" : "CMAKE_CPACK_COMMAND",
@@ -167,7 +167,7 @@
 				}
 			],
 			"type" : "INTERNAL",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/cmake/win/bin/cpack.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/cmake/win/bin/cpack.exe"
 		},
 		{
 			"name" : "CMAKE_CTEST_COMMAND",
@@ -179,7 +179,7 @@
 				}
 			],
 			"type" : "INTERNAL",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/cmake/win/bin/ctest.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/cmake/win/bin/ctest.exe"
 		},
 		{
 			"name" : "CMAKE_CXX_COMPILER",
@@ -195,7 +195,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/g++.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/g++.exe"
 		},
 		{
 			"name" : "CMAKE_CXX_COMPILER_AR",
@@ -211,7 +211,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/gcc-ar.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/gcc-ar.exe"
 		},
 		{
 			"name" : "CMAKE_CXX_COMPILER_RANLIB",
@@ -227,7 +227,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/gcc-ranlib.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/gcc-ranlib.exe"
 		},
 		{
 			"name" : "CMAKE_CXX_FLAGS",
@@ -339,7 +339,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/gcc.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/gcc.exe"
 		},
 		{
 			"name" : "CMAKE_C_COMPILER_AR",
@@ -355,7 +355,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/gcc-ar.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/gcc-ar.exe"
 		},
 		{
 			"name" : "CMAKE_C_COMPILER_RANLIB",
@@ -371,7 +371,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/gcc-ranlib.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/gcc-ranlib.exe"
 		},
 		{
 			"name" : "CMAKE_C_FLAGS",
@@ -483,7 +483,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/dlltool.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/dlltool.exe"
 		},
 		{
 			"name" : "CMAKE_EXECUTABLE_FORMAT",
@@ -611,7 +611,7 @@
 				}
 			],
 			"type" : "INTERNAL",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++;D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++/x86_64-w64-mingw32;D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++/backward;D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include;D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../include;D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include-fixed;D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../x86_64-w64-mingw32/include"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++;D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++/x86_64-w64-mingw32;D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++/backward;D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include;D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../include;D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include-fixed;D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../x86_64-w64-mingw32/include"
 		},
 		{
 			"name" : "CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS",
@@ -635,7 +635,7 @@
 				}
 			],
 			"type" : "INTERNAL",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include;D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../include;D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include-fixed;D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../x86_64-w64-mingw32/include"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include;D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../include;D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/include-fixed;D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/../lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../x86_64-w64-mingw32/include"
 		},
 		{
 			"name" : "CMAKE_GENERATOR",
@@ -707,7 +707,7 @@
 				}
 			],
 			"type" : "INTERNAL",
-			"value" : "D:/MyGitHub/mathematical-expression-cpp"
+			"value" : "D:/MyGithub/mathematical-expression-cpp"
 		},
 		{
 			"name" : "CMAKE_INSTALL_PREFIX",
@@ -735,7 +735,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/ld.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/ld.exe"
 		},
 		{
 			"name" : "CMAKE_MAKE_PROGRAM",
@@ -751,7 +751,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/mingw32-make.exe"
+			"value" : "D:/liming/CX/Clion/CLION2~1.1/bin/mingw/bin/mingw32-make.exe"
 		},
 		{
 			"name" : "CMAKE_MODULE_LINKER_FLAGS",
@@ -847,7 +847,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/nm.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/nm.exe"
 		},
 		{
 			"name" : "CMAKE_NUMBER_OF_MAKEFILES",
@@ -875,7 +875,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/objcopy.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/objcopy.exe"
 		},
 		{
 			"name" : "CMAKE_OBJDUMP",
@@ -891,7 +891,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/objdump.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/objdump.exe"
 		},
 		{
 			"name" : "CMAKE_PLATFORM_INFO_INITIALIZED",
@@ -955,7 +955,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/ranlib.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/ranlib.exe"
 		},
 		{
 			"name" : "CMAKE_RC_COMPILER",
@@ -971,7 +971,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/windres.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/windres.exe"
 		},
 		{
 			"name" : "CMAKE_RC_COMPILER_WORKS",
@@ -1079,7 +1079,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/readelf.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/readelf.exe"
 		},
 		{
 			"name" : "CMAKE_ROOT",
@@ -1091,7 +1091,7 @@
 				}
 			],
 			"type" : "INTERNAL",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/cmake/win/share/cmake-3.23"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/cmake/win/share/cmake-3.23"
 		},
 		{
 			"name" : "CMAKE_SHARED_LINKER_FLAGS",
@@ -1299,7 +1299,7 @@
 				}
 			],
 			"type" : "FILEPATH",
-			"value" : "D:/Liming/MyApplication/CLion/CLion 2022.2.1/bin/mingw/bin/strip.exe"
+			"value" : "D:/liming/CX/Clion/CLion 2022.2.1/bin/mingw/bin/strip.exe"
 		},
 		{
 			"name" : "CMAKE_VERBOSE_MAKEFILE",
@@ -1327,7 +1327,7 @@
 				}
 			],
 			"type" : "STATIC",
-			"value" : "D:/MyGitHub/mathematical-expression-cpp/cmake-build-debug"
+			"value" : "D:/MyGithub/mathematical-expression-cpp/cmake-build-debug"
 		},
 		{
 			"name" : "mathematical_expression_cpp_IS_TOP_LEVEL",
@@ -1351,7 +1351,7 @@
 				}
 			],
 			"type" : "STATIC",
-			"value" : "D:/MyGitHub/mathematical-expression-cpp"
+			"value" : "D:/MyGithub/mathematical-expression-cpp"
 		}
 	],
 	"kind" : "cache",