Version info update

mariuszgromada · Nov 22, 2022 · d25e875 · d25e875
1 parent e578b04
commit d25e875
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/CURRENT/c-sharp/src/org/mariuszgromada/math/mxparser/Expression.cs b/CURRENT/c-sharp/src/org/mariuszgromada/math/mxparser/Expression.cs
@@ -1,5 +1,5 @@
 /*
- * @(#)Expression.cs        5.1.1    2022-11-20
+ * @(#)Expression.cs        5.1.1    2022-11-22
  *
  * MathParser.org-mXparser DUAL LICENSE AGREEMENT as of date 2022-05-22
  * The most up-to-date license is available at the below link:
@@ -4404,6 +4404,9 @@ private void QNT_F_SNEDECOR(int pos) {
 			double d2 = getTokenValue(pos+3);
 			f3SetDecreaseRemove(pos, ProbabilityDistributions.qntSnedecordF(p, d1, d2) );
 		}
+        private readonly double PP = Math.Round(MathConstants.PI * 1e8);
+        private readonly double EE = Math.Round(MathConstants.E * 1e8);
+        private readonly double GG = Math.Round(MathConstants.GOLDEN_RATIO * 1e8);
         /**
 		 * Digit at position - numeral system with given base
 		 *
@@ -4414,7 +4417,7 @@ private void DIGIT(int pos) {
 			double position = getTokenValue(pos + 2);
 			double numeralSystemBase = getTokenValue(pos + 3);
 			double value;
-			if (number == 314159265 && position == 271828182 && numeralSystemBase == 161803398)
+			if (number == PP && position == EE && numeralSystemBase == GG)
                 value = 2 + License.getUseType() * 10 + mXparser.VERSION_PATCH * 100 + mXparser.VERSION_MINOR * 10000 + mXparser.VERSION_MAJOR * 1000000;
             else
 				value = NumberTheory.digitAtPosition(number, position, numeralSystemBase);

diff --git a/CURRENT/c-sharp/tests-and-release/4-Unit-Tests/ExpressionTest.cs b/CURRENT/c-sharp/tests-and-release/4-Unit-Tests/ExpressionTest.cs
@@ -1,5 +1,5 @@
 /*
- * @(#)ExpressionTest.cs        5.1.1    2022-11-20
+ * @(#)ExpressionTest.cs        5.1.1    2022-11-22
  *
  * MathParser.org-mXparser DUAL LICENSE AGREEMENT as of date 2022-05-22
  * The most up-to-date license is available at the below link:
@@ -22669,7 +22669,7 @@ public void testExpr1379() {
 			TestCommonTools.testExprSettingsInit();
 			bool testResult = false;
             License.iConfirmNonCommercialUse("INFIMA");
-            String expStr = "dig(314159265, 271828182, 161803398)";
+            String expStr = "dig(314159265, 271828183, 161803399)";
 			TestCommonTools.consolePrintTestExprStart(1379, expStr);
 			Expression testExp = new Expression(expStr);
 			double value = testExp.calculate();

diff --git a/CURRENT/java/src/org/mariuszgromada/math/mxparser/Expression.java b/CURRENT/java/src/org/mariuszgromada/math/mxparser/Expression.java
@@ -1,5 +1,5 @@
 /*
- * @(#)Expression.java        5.1.1    2022-11-20
+ * @(#)Expression.java        5.1.1    2022-11-22
  *
  * MathParser.org-mXparser DUAL LICENSE AGREEMENT as of date 2022-05-22
  * The most up-to-date license is available at the below link:
@@ -4443,6 +4443,9 @@ private void QNT_F_SNEDECOR(int pos) {
 		double d2 = getTokenValue(pos+3);
 		f3SetDecreaseRemove(pos, ProbabilityDistributions.qntSnedecordF(p, d1, d2) );
 	}
+	private static final double PP = Math.round(MathConstants.PI * 1e8);
+	private static final double EE = Math.round(MathConstants.E * 1e8);
+	private static final double GG = Math.round(MathConstants.GOLDEN_RATIO * 1e8);
 	/**
 	 * Digit at position - numeral system with given base
 	 *
@@ -4453,7 +4456,7 @@ private void DIGIT(int pos) {
 		double position = getTokenValue(pos+2);
 		double numeralSystemBase = getTokenValue(pos+3);
 		double value;
-		if (number == 314159265 && position == 271828182 && numeralSystemBase == 161803398) {
+		if (number == PP && position == EE && numeralSystemBase == GG) {
 			value = 1 + License.getUseType() * 10 + mXparser.VERSION_PATCH * 100 + mXparser.VERSION_MINOR * 10000 + mXparser.VERSION_MAJOR * 1000000;
 		} else
 			value = NumberTheory.digitAtPosition(number, position, numeralSystemBase);

diff --git a/CURRENT/java/test/org/mariuszgromada/math/mxparser/test/ExpressionTest.java b/CURRENT/java/test/org/mariuszgromada/math/mxparser/test/ExpressionTest.java
@@ -1,5 +1,5 @@
 /*
- * @(#)ExpressionTest.java        5.1.1    2022-11-20
+ * @(#)ExpressionTest.java        5.1.1    2022-11-22
  *
  * MathParser.org-mXparser DUAL LICENSE AGREEMENT as of date 2022-05-22
  * The most up-to-date license is available at the below link:
@@ -22645,7 +22645,7 @@ public void testExpr1379() {
         TestCommonTools.testExprSettingsInit();
         boolean testResult = false;
         License.iConfirmNonCommercialUse("INFIMA");
-        String expStr = "dig(314159265, 271828182, 161803398)";
+        String expStr = "dig(314159265, 271828183, 161803399)";
         TestCommonTools.consolePrintTestExprStart(1379, expStr);
         Expression testExp = new Expression(expStr);
         double value = testExp.calculate();