Renaming functions to more accurate names

Author: BlazesRus

ExprFormulaTester/ExprFormulaTester.cpp

@@ -256,12 +256,12 @@ int main()
     //IntFormTest = "5+10x";
     //std::cout << IntFormTest.ToString() << " = " << IntFormTest.EvalValues(IntValueDefinitions) << std::endl;
 
-    MediumDecFormula AltFormTest = "5+5+x";
+    MediumDecFormula AltFormTest = "5+5+x+(x)";
     tsl::ordered_map<std::string, MediumDec> ValueDefinitions;
     ValueDefinitions.insert_or_assign("x", MediumDec::One);
 
     std::cout << "(MediumDecFormula) "<< AltFormTest.ToString() <<std::endl;
-    AltFormTest = AltFormTest.SimplifyFormula(ValueDefinitions);
+    AltFormTest = AltFormTest.EvaluateToSimplifiedForm(ValueDefinitions);
     std::cout << " = " << AltFormTest.ToString() << std::endl;
     //AltFormTest = "5.5^(1.5+x)+6x";
     //std::cout << "(MediumDecFormula) " << AltFormTest.ToString() << " = " << rootTest.ToString() << std::endl;

GlobalCode/Databases/MediumDecFormula.hpp

@@ -43,7 +43,7 @@ namespace BlazesRusCode
         /// <param name="FormCopy">The form copy.</param>
         /// <param name="ElementValues">The element values.</param>
         /// <param name="FormIndex">Index of the form.</param>
-        void SwapUpdatedFormData(ValueMap& ElementValues, size_t FormIndex = 0)
+        void ReplaceVariablesWithValues(ValueMap& ElementValues, size_t FormIndex = 0)
         {
             std::string CurString;
             MediumDec targetResult;
@@ -52,7 +52,7 @@ namespace BlazesRusCode
             {
                 if (CurrentVal->second.ElementCat == FormulaElementType::Formula)//FormulaDetected
                 {
-                    SwapUpdatedFormData(ElementValues, CurrentVal->second.Index);
+                    ReplaceVariablesWithValues(ElementValues, CurrentVal->second.Index);
                     //if (Data.at(FormIndex).size() == 1)
                     //{
                     //    FormData& ContainedFormulaElement = Data.at(CurrentVal->first);
@@ -89,10 +89,10 @@ namespace BlazesRusCode
         /// </summary>
         /// <param name="ElementValues">The element values.</param>
         /// <returns>BlazesRusCode.MediumDecFormula</returns>
-        MediumDecFormula SimplifyFormula(ValueMap ElementValues)
+        MediumDecFormula EvaluateToSimplifiedForm(ValueMap ElementValues)
         {
             MediumDecFormula FormCopy = *this;//Duplicate values so can erase parts when calculating
-            FormCopy.SwapUpdatedFormData(ElementValues);
+            FormCopy.ReplaceVariablesWithValues(ElementValues);
             return FormCopy;//EvaluateOrderOfOperations(FormCopy);
         }