Variable to number code now working(still haven't reapplied the operations code etc)

Author: BlazesRus

ExprFormulaTester/ExprFormulaTester.cpp

@@ -260,24 +260,21 @@ int main()
     tsl::ordered_map<std::string, MediumDec> ValueDefinitions;
     ValueDefinitions.insert_or_assign("x", MediumDec::One);
 
-    //tsl::ordered_map<std::string, MediumDec&> RefDefinitions;
-    //MediumDec XReference = MediumDec::One;
-    //RefDefinitions.insert_or_assign("x", XReference);
-    //rootTest = AltFormTest.EvalValueRefs(RefDefinitions);
-    //std::cout << AltFormTest.ToString() << " = " << rootTest.ToString()<< std::endl;
-
-    //
-
     std::cout << "(MediumDecFormula) "<< AltFormTest.ToString() <<std::endl;
-    //AltFormTest = AltFormTest.SimplifyFormula(ValueDefinitions);
-    //std::cout << " = " << AltFormTest.ToString() << std::endl;
+    AltFormTest = AltFormTest.SimplifyFormula(ValueDefinitions);
+    std::cout << " = " << AltFormTest.ToString() << std::endl;
     //AltFormTest = "5.5^(1.5+x)+6x";
     //std::cout << "(MediumDecFormula) " << AltFormTest.ToString() << " = " << rootTest.ToString() << std::endl;
     //AltFormTest = "5+(5/4)";
     //std::cout << "(MediumDecFormula) " << AltFormTest.ToString() << " = " << rootTest.ToString() << std::endl;
     //AltFormTest = "(4/3)/2";
     //std::cout << "(MediumDecFormula) " << AltFormTest.ToString() << " = " << rootTest.ToString() << std::endl;
 
+    //tsl::ordered_map<std::string, MediumDec&> RefDefinitions;
+    //MediumDec XReference = MediumDec::One;
+    //RefDefinitions.insert_or_assign("x", XReference);
+    //rootTest = AltFormTest.EvalValueRefs(RefDefinitions);
+    //std::cout << AltFormTest.ToString() << " = " << rootTest.ToString()<< std::endl;
 
     //DoubleFormula DoubleFormTest = "5.5+(5.5+2)";
     //std::cout << "(DoubleFormula) " << DoubleFormTest.ToString() << std::endl;

GlobalCode/Databases/MediumDecFormula.hpp

@@ -7,6 +7,7 @@
 #include "VariableFormula.hpp"
 #include "..\AltNum\MediumDec.hpp"
 #include "ElementType.hpp"
+#include "tsl\ordered_map.h"
 
 //Preprocessor Switches
 /*
@@ -46,16 +47,40 @@ namespace BlazesRusCode
         {
             std::string CurString;
             MediumDec targetResult;
-            for (FormData::iterator CurrentVal = Data.at(FormIndex).begin(), LastVal = Data.at(FormIndex).end(); CurrentVal != LastVal; ++CurrentVal)
+            FormData& FormDRef = Data.at(FormIndex);
+            for (FormData::iterator CurrentVal = FormDRef.begin(), LastVal = FormDRef.end(); CurrentVal != LastVal; ++CurrentVal)
             {
                 if (CurrentVal->second.ElementCat == FormulaElementType::Formula)//FormulaDetected
                 {
                     SwapUpdatedFormData(ElementValues, CurrentVal->second.Index);
-                    //if(Data.at(FormIndex).size() == 1)
-                    //    ReplaceFormVal(CurrentVal->first, targetResult);
+                    //if (Data.at(FormIndex).size() == 1)
+                    //{
+                    //    FormData& ContainedFormulaElement = Data.at(CurrentVal->first);
+                    //    auto FirstElement = ContainedFormulaElement.front();
+                    //    /*
+                    //    if(ContainedFormulaElement.ElementCat == FormulaElementType::Num)
+                    //    {
+                    //    }
+                    //    */
+                    //    //targetResult = ContainedFormulaElement.;
+                    //    //FormDRef.ReplaceFormVal(CurrentVal->first, targetResult);
+                    //}
                 }
                 else if (CurrentVal->second.ElementCat == FormulaElementType::Variable)//Swap Variable with values
-                    Data.at(FormIndex).ReplaceFormVal(CurrentVal->first, ElementValues.at(CurString));
+                {
+                    CurString = FormDRef.VariableMap.at(CurrentVal->first).Name;
+                    tsl::ordered_map<std::string, MediumDec>::iterator KeyedElemVal = ElementValues.find(CurString);
+                    if(KeyedElemVal!= ElementValues.end())//Only attempt to replace variable if matching variable is found
+                    {
+                        FormDRef.at(CurrentVal->first).ElementCat = FormulaElementType::Num;
+                        targetResult = KeyedElemVal.value();
+                        FormDRef.NumMap.insert_or_assign(CurrentVal->first, targetResult);//ElementValues.at(CurString));
+                    }
+                    else
+                    {
+                        std::cout << "Failed to replace variable named " << CurString << " with value data" << std::endl;
+                    }
+                }
             }
         }
 

GlobalCode/Databases/VariableFormula.hpp

@@ -161,7 +161,7 @@ namespace BlazesRusCode
             /// <summary>
             /// The map that stores the Variable Names and potential pointers to the referenced variable
             /// </summary>
-            ParallelIntVariable VariableMap;
+            ParallelIntVariable VariableMap;//To-Do later place since map of this inside main formula code
 
             /// <summary>
             /// The variable storage map with Variable Name linked to related Index(shortcut)
@@ -229,14 +229,13 @@ namespace BlazesRusCode
             }
 
             /// <summary>
-            /// Replaces the non-number based form value (and add to number map).
+            /// Replaces the non-(number/Variable-Storage) based form value (and add to number map).
             /// </summary>
             /// <param name="Key">The key.</param>
             /// <param name="Value">The value.</param>
             void ReplaceFormVal(int Key, VarType Value)
             {
-                FormElement& KeyedVal = this->at(Key);
-                KeyedVal.ElementCat = FormulaElementType::Num;
+                this->at(Key).ElementCat = FormulaElementType::Num;
                 NumMap.insert_or_assign(Key, Value);
             }