diff --git a/CURRENT/c-sharp/src/org/mariuszgromada/math/mxparser/SerializationUtils.cs b/CURRENT/c-sharp/src/org/mariuszgromada/math/mxparser/SerializationUtils.cs index 76bbc058..b13f0943 100644 --- a/CURRENT/c-sharp/src/org/mariuszgromada/math/mxparser/SerializationUtils.cs +++ b/CURRENT/c-sharp/src/org/mariuszgromada/math/mxparser/SerializationUtils.cs @@ -178,7 +178,7 @@ * - online store: https://mathparser.org/order-commercial-license * - online store: https://payhip.com/infima */ -#if !NET7_0 +#if !NET7_0_OR_GREATER using System; using System.IO; using System.Runtime.Serialization; diff --git a/CURRENT/c-sharp/src/org/mariuszgromada/math/mxparser/mXparser.cs b/CURRENT/c-sharp/src/org/mariuszgromada/math/mxparser/mXparser.cs index 7d9f6e9e..276c637f 100644 --- a/CURRENT/c-sharp/src/org/mariuszgromada/math/mxparser/mXparser.cs +++ b/CURRENT/c-sharp/src/org/mariuszgromada/math/mxparser/mXparser.cs @@ -1,5 +1,5 @@ /* - * @(#)mXparser.cs 5.1.0 2022-11-11 + * @(#)mXparser.cs 5.1.0 2022-11-12 * * MathParser.org-mXparser DUAL LICENSE AGREEMENT as of date 2022-05-22 * The most up-to-date license is available at the below link: @@ -296,10 +296,6 @@ public sealed class mXparser { public const String BUIT_FOR = "NETCOREAPP1_1"; #elif NETCOREAPP1_0 public const String BUIT_FOR = "NETCOREAPP1_0"; -#elif NET - public const String BUIT_FOR = "NET"; -#elif PCL - public const String BUIT_FOR = ".NET PCL"; #elif IOS public const String BUIT_FOR = "Xamarin.iOS"; #elif ANDROID @@ -310,8 +306,12 @@ public sealed class mXparser { public const String BUIT_FOR = ".NET Standard"; #elif NETCOREAPP public const String BUIT_FOR = ".NET Core"; +#elif NET + public const String BUIT_FOR = "NET"; +#elif PCL + public const String BUIT_FOR = ".NET PCL"; #else - public const String BUIT_FOR = ".NET"; + public const String BUIT_FOR = ".NET"; #endif /** * FOUND / NOT_FOUND @@ -1576,7 +1576,10 @@ public static void consolePrint(Object o) { } } public static void consolePrintSettings(String prefix) { - mXparser.consolePrintln(prefix + "checkIfCanonicalRounding = " + mXparser.checkIfCanonicalRounding()); + mXparser.consolePrintln(prefix + "mXparser.VERSION = " + mXparser.VERSION); + mXparser.consolePrintln(prefix + "mXparser.BUIT_FOR = " + mXparser.BUIT_FOR); + mXparser.consolePrintln(prefix + "Environment.Version = " + Environment.Version); + mXparser.consolePrintln(prefix + "checkIfCanonicalRounding = " + mXparser.checkIfCanonicalRounding()); mXparser.consolePrintln(prefix + "checkIfAlmostIntRounding = " + mXparser.checkIfAlmostIntRounding()); mXparser.consolePrintln(prefix + "checkIfUlpRounding = " + mXparser.checkIfUlpRounding()); mXparser.consolePrintln(prefix + "checkIfRadiansMode = " + mXparser.checkIfRadiansMode()); diff --git a/CURRENT/c-sharp/tests-and-release/2-Release-Net-Stand-Core/2-Release-Net-Stand-Core.csproj b/CURRENT/c-sharp/tests-and-release/2-Release-Net-Stand-Core/2-Release-Net-Stand-Core.csproj index ed3afeb6..20f45a6b 100644 --- a/CURRENT/c-sharp/tests-and-release/2-Release-Net-Stand-Core/2-Release-Net-Stand-Core.csproj +++ b/CURRENT/c-sharp/tests-and-release/2-Release-Net-Stand-Core/2-Release-Net-Stand-Core.csproj @@ -1,7 +1,7 @@  - net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;netstandard2.0;netstandard2.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net50;net60;net70 + net35;net40;net45;net461;net47;net48;netstandard2.0;netstandard2.1;netcoreapp3.1;net50;net60 MathParser.org-mXparser mxparser MathParser.org-mXparser diff --git a/CURRENT/c-sharp/tests-and-release/4-Unit-Tests/ApiTest.cs b/CURRENT/c-sharp/tests-and-release/4-Unit-Tests/ApiTest.cs index f5d6f417..18dd5ae3 100644 --- a/CURRENT/c-sharp/tests-and-release/4-Unit-Tests/ApiTest.cs +++ b/CURRENT/c-sharp/tests-and-release/4-Unit-Tests/ApiTest.cs @@ -4037,22 +4037,19 @@ public void testApi0163() { TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } - [TestMethod] private static String commentTestDescriptionAsMockup(String descr) { -#if NET7_0 +#if NET8_0 return descr + " - this is just a Mockup as Binary Serialization is not support since .NET7.0"; #else return descr; #endif } - public void testApi0164() { + [TestMethod] + public void testApi0164() { TestCommonTools.testApiSettingsInit(); bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Serialization / Deserialization: Argument x Bytes"); TestCommonTools.consolePrintTestApiStart(164, testDescr); -#if NET7_0 - testResult = true; -#else Argument x = new Argument("x = 3"); Argument y = new Argument("y = 2*x", x); SerializationUtils.enableBinarySerializationIamAwareOfSecurityRisks(); @@ -4065,7 +4062,6 @@ public void testApi0164() { if (ys != null) if (y.getArgumentName().Equals(ys.getArgumentName()) && y.getArgumentValue() == ys.getArgumentValue()) testResult = true; -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4075,9 +4071,6 @@ public void testApi0165() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Serialization / Deserialization: Function x String"); TestCommonTools.consolePrintTestApiStart(165, testDescr); -#if NET7_0 - testResult = true; -#else Constant c = new Constant("c = 3"); Function g = new Function("g(x) = 2*x + c", c); Function f = new Function("f(x,y) = g(x)*g(y)", g); @@ -4091,7 +4084,6 @@ public void testApi0165() { if (fs != null) if (f.getFunctionName().Equals(fs.getFunctionName()) && f.calculate(2,3) == fs.calculate(2, 3)) testResult = true; -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4101,9 +4093,6 @@ public void testApi0166() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Serialization / Deserialization: RecursiveArgument x Bytes"); TestCommonTools.consolePrintTestApiStart(166, testDescr); -#if NET7_0 - testResult = true; -#else RecursiveArgument fib = new RecursiveArgument("fib(n)= fib(n-1)+fib(n-2)"); SerializationUtils.enableBinarySerializationIamAwareOfSecurityRisks(); byte[] data = SerializationUtils.serializeToBytes(fib); @@ -4120,7 +4109,6 @@ public void testApi0166() { if (fib.getArgumentName().Equals(fibs.getArgumentName()) && fib.getArgumentValue(10) == fibs.getArgumentValue(10)) testResult = true; } -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4130,9 +4118,6 @@ public void testApi0167() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Serialization / Deserialization: Extended Argument x String"); TestCommonTools.consolePrintTestApiStart(167, testDescr); -#if NET7_0 - testResult = true; -#else Argument x = new Argument("x", new PiMultArgExt()); SerializationUtils.enableBinarySerializationIamAwareOfSecurityRisks(); String s = SerializationUtils.serializeToString(x); @@ -4145,7 +4130,6 @@ public void testApi0167() { if (x.getArgumentName().Equals(xs.getArgumentName()) && x.getArgumentValue() == xs.getArgumentValue()) testResult = true; } -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4155,9 +4139,6 @@ public void testApi0168() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Serialization / Deserialization: Extended Function x Bytes"); TestCommonTools.consolePrintTestApiStart(168, testDescr); -#if NET7_0 - testResult = true; -#else Function f = new Function("f", new FunExt()); SerializationUtils.enableBinarySerializationIamAwareOfSecurityRisks(); byte[] data = SerializationUtils.serializeToBytes(f); @@ -4170,7 +4151,6 @@ public void testApi0168() { if (f.getFunctionName().Equals(fs.getFunctionName()) && f.calculate(2, 3) == fs.calculate(2, 3)) testResult = true; } -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4180,9 +4160,6 @@ public void testApi0169() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Serialization / Deserialization: Extended Function Variadic x String"); TestCommonTools.consolePrintTestApiStart(168, testDescr); -#if NET7_0 - testResult = true; -#else Function f = new Function("f", new FunExtVar()); SerializationUtils.enableBinarySerializationIamAwareOfSecurityRisks(); String data = SerializationUtils.serializeToString(f); @@ -4195,7 +4172,6 @@ public void testApi0169() { if (f.getFunctionName().Equals(fs.getFunctionName()) && f.calculate(2, 3, 4, 5) == fs.calculate(2, 3, 4, 5)) testResult = true; } -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4205,9 +4181,6 @@ public void testApi0170() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Serialization / Deserialization: Constant x Bytes"); TestCommonTools.consolePrintTestApiStart(170, testDescr); -#if NET7_0 - testResult = true; -#else Constant b = new Constant("b = 5"); Constant a = new Constant("a = 2*b", b); SerializationUtils.enableBinarySerializationIamAwareOfSecurityRisks(); @@ -4221,7 +4194,6 @@ public void testApi0170() { if (a.getConstantName().Equals(acs.getConstantName()) && a.getConstantValue() == acs.getConstantValue()) testResult = true; } -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4231,9 +4203,6 @@ public void testApi0171() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Serialization / Deserialization: Expression x Bytes"); TestCommonTools.consolePrintTestApiStart(171, testDescr); -#if NET7_0 - testResult = true; -#else Constant a = new Constant("a = 0.0001"); Function s = new Function("s(x) = if( abs(x) < a, x, 2*s(x/2)*c(x/2) )", a); Function c = new Function("c(x) = if( abs(x) < a, 1, c(x/2)^2-s(x/2)^2 )", a); @@ -4268,7 +4237,6 @@ public void testApi0171() { if (e1.getExpressionString().Equals(es1.getExpressionString()) && e2.getExpressionString().Equals(es2.getExpressionString()) && v1 == vs1 && v2 == vs2) testResult = true; } -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4278,9 +4246,6 @@ public void testApi0172() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Serialization / Deserialization: Expression x File"); TestCommonTools.consolePrintTestApiStart(171, testDescr); -#if NET7_0 - testResult = true; -#else Argument x = new Argument("x = 5"); Function f = new Function("f(x,y) = x + 2*y"); Expression e = new Expression("f(2,3)*x", f, x); @@ -4305,7 +4270,6 @@ public void testApi0172() { mXparser.consolePrintln(ex.StackTrace); } SerializationUtils.disableBinarySerialization(); -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4315,15 +4279,11 @@ public void testApi0173() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Disabled serialization: serializeToBytes"); TestCommonTools.consolePrintTestApiStart(173, testDescr); -#if NET7_0 - testResult = true; -#else Argument x = new Argument("x = 5"); SerializationUtils.disableBinarySerialization(); byte[] data = SerializationUtils.serializeToBytes(x); if (data == null && !SerializationUtils.checkLastOperationWasSuccessful()) testResult = true; -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4333,15 +4293,11 @@ public void testApi0174() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Disabled serialization: serializeToString"); TestCommonTools.consolePrintTestApiStart(174, testDescr); -#if NET7_0 - testResult = true; -#else Argument x = new Argument("x = 5"); SerializationUtils.disableBinarySerialization(); String data = SerializationUtils.serializeToString(x); if (data == null && !SerializationUtils.checkLastOperationWasSuccessful()) testResult = true; -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4351,9 +4307,6 @@ public void testApi0175() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Disabled serialization: serializeToFile"); TestCommonTools.consolePrintTestApiStart(175, testDescr); -#if NET7_0 - testResult = true; -#else Argument x = new Argument("x = 5"); SerializationUtils.disableBinarySerialization(); try { @@ -4366,7 +4319,6 @@ public void testApi0175() { mXparser.consolePrintln(ex.Message); mXparser.consolePrintln(ex.StackTrace); } -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4376,9 +4328,6 @@ public void testApi0176() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Disabled serialization: deserializeFromBytes"); TestCommonTools.consolePrintTestApiStart(176, testDescr); -#if NET7_0 - testResult = true; -#else SerializationUtils.enableBinarySerializationIamAwareOfSecurityRisks(); Argument x = new Argument("x = 5"); byte[] data = SerializationUtils.serializeToBytes(x); @@ -4386,7 +4335,6 @@ public void testApi0176() { Argument xs = SerializationUtils.deserializeFromBytes(data); if (data != null && xs == null && !SerializationUtils.checkLastOperationWasSuccessful()) testResult = true; -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4396,9 +4344,6 @@ public void testApi0177() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Disabled serialization: deserializeFromString"); TestCommonTools.consolePrintTestApiStart(177, testDescr); -#if NET7_0 - testResult = true; -#else SerializationUtils.enableBinarySerializationIamAwareOfSecurityRisks(); Argument x = new Argument("x = 5"); String data = SerializationUtils.serializeToString(x); @@ -4406,7 +4351,6 @@ public void testApi0177() { Argument xs = SerializationUtils.deserializeFromString(data); if (data != null && xs == null && !SerializationUtils.checkLastOperationWasSuccessful()) testResult = true; -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } @@ -4416,9 +4360,6 @@ public void testApi0178() { bool testResult = false; String testDescr = commentTestDescriptionAsMockup("Disabled serialization: deserializeFromFile"); TestCommonTools.consolePrintTestApiStart(177, testDescr); -#if NET7_0 - testResult = true; -#else Argument x = new Argument("x = 5"); try { String filePath = Path.GetTempFileName(); @@ -4434,7 +4375,6 @@ public void testApi0178() { mXparser.consolePrintln(ex.StackTrace); } SerializationUtils.disableBinarySerialization(); -#endif TestCommonTools.consolePrintTestApiEnd(testResult); Assert.IsTrue(testResult); } diff --git a/CURRENT/java/src/org/mariuszgromada/math/mxparser/mXparser.java b/CURRENT/java/src/org/mariuszgromada/math/mxparser/mXparser.java index 69c44307..b56d1629 100644 --- a/CURRENT/java/src/org/mariuszgromada/math/mxparser/mXparser.java +++ b/CURRENT/java/src/org/mariuszgromada/math/mxparser/mXparser.java @@ -1,5 +1,5 @@ /* - * @(#)mXparser.java 5.1.0 2022-09-04 + * @(#)mXparser.java 5.1.0 2022-11-12 * * MathParser.org-mXparser DUAL LICENSE AGREEMENT as of date 2022-05-22 * The most up-to-date license is available at the below link: @@ -1477,6 +1477,9 @@ public static void consolePrint(Object o) { } } public static void consolePrintSettings(String prefix) { + mXparser.consolePrintln(prefix + "mXparser.VERSION = " + mXparser.VERSION); + mXparser.consolePrintln(prefix + "mXparser.BUIT_FOR = " + mXparser.BUIT_FOR); + mXparser.consolePrintln(prefix + "java.version = " + System.getProperty("java.version")); mXparser.consolePrintln(prefix + "checkIfCanonicalRounding = " + mXparser.checkIfCanonicalRounding()); mXparser.consolePrintln(prefix + "checkIfAlmostIntRounding = " + mXparser.checkIfAlmostIntRounding()); mXparser.consolePrintln(prefix + "checkIfUlpRounding = " + mXparser.checkIfUlpRounding());