Reworked addition/subtraction to fix logic flaw for negative zero becoming zero

-Starting rework on formula evaluations
-All current addition/subtraction tests now succeed

Author: BlazesRus

ExprFormulaTester/ExprFormulaTester.cpp

@@ -231,19 +231,19 @@ int main()
     std::cout << targetVal.ToString() << " - " << rightVal.ToString() << " = " << altResult.ToString() << " FloatResult:" << floatingVal << std::endl;
 
     std::cout << "---------------Log Tests------------------------------" << std::endl;
-    //targetVal = "0.005";
-    //floatingVal = 0.005;
-    //double floatingRes;
-    //for (targetVal = MediumDec::FiveThousandth; targetVal<MediumDec::One; targetVal += MediumDec::FiveThousandth)
-    //{
-    //    floatingRes = log(floatingVal);
-    //    std::cout << "Builtin-Ln(" << floatingVal << ") = " << floatingRes;
-    //    floatingRes = BlazesFloatingCode::LnRef(floatingVal);
-    //    std::cout << " Ln(value) =" << floatingRes << std::endl;
-    //    floatingVal += 0.005;
-    //    altResult = BlazesRusDebug::LnTestRef(floatingVal,targetVal);
-    //    std::cout << "(MediumDec)Ln(" << targetVal.ToString()<<")= " << altResult.ToString() << std::endl;
-    //}
+    targetVal = "0.005";
+    floatingVal = 0.005;
+    double floatingRes;
+    for (targetVal = MediumDec::FiveThousandth; targetVal < MediumDec::One; targetVal += MediumDec::FiveThousandth)
+    {
+        floatingRes = log(floatingVal);
+        std::cout << "Builtin-Ln(" << floatingVal << ") = " << floatingRes;
+        floatingRes = BlazesFloatingCode::LnRef(floatingVal);
+        std::cout << " Ln(value) =" << floatingRes << std::endl;
+        floatingVal += 0.005;
+        altResult = BlazesRusDebug::LnTestRef(floatingVal, targetVal);
+        std::cout << "(MediumDec)Ln(" << targetVal.ToString() << ")= " << altResult.ToString() << std::endl;
+    }
 
     std::cout << "---------------Testing Formula Code-------------------" << std::endl;
     //std::cout << "-------------------------Formula Code Tests---------------------------------" << std::endl;
@@ -254,20 +254,23 @@ int main()
     //IntFormTest = "5+10x";
     //std::cout << IntFormTest.ToString() << " = " << IntFormTest.EvalValues(IntValueDefinitions) << std::endl;
 
-    MediumDecFormula AltFormTest = "5.5^(1.5+x)+6x";
+    MediumDecFormula AltFormTest = "5+5+x";
+    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;
 
-    //tsl::ordered_map<std::string, MediumDec> ValueDefinitions;
-    //ValueDefinitions.insert_or_assign("x", MediumDec::One);
-    //rootTest = AltFormTest.EvalValues(ValueDefinitions);
+    //
+
     std::cout << "(MediumDecFormula) "<< AltFormTest.ToString() <<std::endl;
+    AltFormTest = AltFormTest.SimplifyFormula(ValueDefinitions);
+    std::cout << " = " << AltFormTest.ToString() << std::endl;
     //std::cout << " = " << rootTest.ToString() << std::endl;
-    //AltFormTest = "5+5";
+    //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;

GlobalCode/AltNum/AltNumDebug.hpp

@@ -276,52 +276,52 @@ namespace BlazesRusDebug
         //if (value <= 0) {}else//Error if equal or less than 0
         if (value==MediumDec::One)
             return MediumDec::Zero;
-        if (value.IntValue==0)//Threshold between 0 and 2 based on Taylor code series from https://stackoverflow.com/questions/26820871/c-program-which-calculates-ln-for-a-given-variable-x-without-using-any-ready-f
-        {
-            double fthreshold = 0.000000005;
-            double fbase = fvalue - 1;        // Base of the numerator; exponent will be explicit
-            int den = 2;              // Denominator of the nth term
-            bool posSign = true;             // Used to swap the sign of each term
-            double fterm = fbase;       // First term
-            double fprev;          // Previous sum
-            double fresult = fterm;     // Kick it off
-            double fAddRes;
-
-            MediumDec threshold = MediumDec::FiveMillionth;
-            MediumDec base = value - 1;        // Base of the numerator; exponent will be explicit
-            MediumDec term = base;       // First term
-            MediumDec prev;          // Previous sum
-            MediumDec result = term;     // Kick it off
-            MediumDec AddRes;
-
-            do
-            {
-                posSign = !posSign;
-
-                fterm *= fbase;
-                term *= base;
-
-                fprev = fresult;
-                prev = result;
-
-                fAddRes = fterm / den;
-                AddRes = term / den;
-
-                if (posSign)
-                    fresult += fAddRes;
-                else
-                    fresult -= fAddRes;
-                if (posSign)
-                    result += term / den;
-                else
-                    result -= term / den;
-
-                den++;
-            } while (abs(fprev - fresult) > fthreshold);
-
-            return result;
-        }
-        else if(value.IntValue==1)
+        //if (value.IntValue==0)//Threshold between 0 and 2 based on Taylor code series from https://stackoverflow.com/questions/26820871/c-program-which-calculates-ln-for-a-given-variable-x-without-using-any-ready-f
+        //{
+        //    double fthreshold = 0.000000005;
+        //    double fbase = fvalue - 1;        // Base of the numerator; exponent will be explicit
+        //    int den = 2;              // Denominator of the nth term
+        //    bool posSign = true;             // Used to swap the sign of each term
+        //    double fterm = fbase;       // First term
+        //    double fprev;          // Previous sum
+        //    double fresult = fterm;     // Kick it off
+        //    double fAddRes;
+
+        //    MediumDec threshold = MediumDec::FiveMillionth;
+        //    MediumDec base = value - 1;        // Base of the numerator; exponent will be explicit
+        //    MediumDec term = base;       // First term
+        //    MediumDec prev;          // Previous sum
+        //    MediumDec result = term;     // Kick it off
+        //    MediumDec AddRes;
+
+        //    do
+        //    {
+        //        posSign = !posSign;
+
+        //        fterm *= fbase;
+        //        term *= base;
+
+        //        fprev = fresult;
+        //        prev = result;
+
+        //        fAddRes = fterm / den;
+        //        AddRes = term / den;
+
+        //        if (posSign)
+        //            fresult += fAddRes;
+        //        else
+        //            fresult -= fAddRes;
+        //        if (posSign)
+        //            result += term / den;
+        //        else
+        //            result -= term / den;
+
+        //        den++;
+        //    } while (abs(fprev - fresult) > fthreshold);
+
+        //    return result;
+        //} else
+        if(value.IntValue<2)
         {
             MediumDec threshold = MediumDec::FiveMillionth;
             MediumDec base = value - 1;        // Base of the numerator; exponent will be explicit