SAK-47892 Upgrading mXparser to 5.1.0 (sakaiproject#10996)

* SAK-47892 Upgrading mXparser to 5.1.0

* SAK-47892 Upgrading mXparser to 5.1.0

Author: jesusmmp

master/pom.xml

@@ -2381,7 +2381,7 @@
       <dependency>
         <groupId>org.mariuszgromada.math</groupId>
         <artifactId>MathParser.org-mXparser</artifactId>
-        <version>4.4.2</version>
+        <version>5.1.0</version>
         <scope>provided</scope>
       </dependency>
     </dependencies>

samigo/samigo-services/src/java/org/sakaiproject/tool/assessment/util/SamigoExpressionParser.java

@@ -84,7 +84,9 @@ public String parse(final String new_expr, final int decimals) throws SamigoExpr
       try {
           e = new Expression(expr);
           if (expr.contains("E")) {
+              mXparser.disableCanonicalRounding();
               mXparser.disableUlpRounding();
+              mXparser.disableAlmostIntRounding();
           }
           double d = e.calculate();
           ans = new BigDecimal(d, MathContext.DECIMAL64);
@@ -94,7 +96,9 @@ public String parse(final String new_expr, final int decimals) throws SamigoExpr
           throw new SamigoExpressionError(401, errorMessage);
       }
       finally {
+          mXparser.enableCanonicalRounding();
           mXparser.enableUlpRounding();
+          mXparser.enableAlmostIntRounding();
       }
 
       GradingService service = new GradingService();

samigo/samigo-services/src/test/org/sakaiproject/tool/assessment/services/GradingServiceTest.java

@@ -520,6 +520,39 @@ public void testCalculationsToValues() throws SamigoExpressionError {
         result = gradingService.processFormulaIntoValue("(5e-49) * (6E28)", 2);
         Assert.assertNotNull(result);
         Assert.assertEquals("3E-20", result);
+
+        // Chi-Squared Distribution
+        result = gradingService.processFormulaIntoValue("pChi2(1.2, 2)", 2);
+        Assert.assertNotNull(result);
+        Assert.assertEquals("0.27", result);
+        result = gradingService.processFormulaIntoValue("cChi2(1.2, 2)", 2);
+        Assert.assertNotNull(result);
+        Assert.assertEquals("0.45", result);
+        result = gradingService.processFormulaIntoValue("qChi2(0.8, 2)", 2);
+        Assert.assertNotNull(result);
+        Assert.assertEquals("3.22", result);
+
+        // Student's t-distribution
+        result = gradingService.processFormulaIntoValue("pStud(1.2, 2)", 2);
+        Assert.assertNotNull(result);
+        Assert.assertEquals("0.16", result);
+        result = gradingService.processFormulaIntoValue("cStud(1.2, 2)", 2);
+        Assert.assertNotNull(result);
+        Assert.assertEquals("0.82", result);
+        result = gradingService.processFormulaIntoValue("qStud(0.8, 2)", 2);
+        Assert.assertNotNull(result);
+        Assert.assertEquals("1.06", result);
+
+        // Snedecor's F distribution
+        result = gradingService.processFormulaIntoValue("pFSned(1.2, 2, 2)", 2);
+        Assert.assertNotNull(result);
+        Assert.assertEquals("0.21", result);
+        result = gradingService.processFormulaIntoValue("cFSned(1.2, 2, 2)", 2);
+        Assert.assertNotNull(result);
+        Assert.assertEquals("0.55", result);
+        result = gradingService.processFormulaIntoValue("qFSned(0.8, 2, 2)", 2);
+        Assert.assertNotNull(result);
+        Assert.assertEquals("4", result);
     }
 
     @Test(expected = SamigoExpressionError.class)