[GR-2798] Fix tests of naivebayes.

PullRequest: fastr/1536

Author: steve-s

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java

@@ -31,6 +31,7 @@
 import com.oracle.truffle.r.ffi.impl.nodes.AttributesAccessNodes.GetAttrib;
 import com.oracle.truffle.r.ffi.impl.nodes.AttributesAccessNodes.SetAttribNode;
 import com.oracle.truffle.r.ffi.impl.nodes.AttributesAccessNodes.TAG;
+import com.oracle.truffle.r.ffi.impl.nodes.CoerceNodes.AsCharacterFactor;
 import com.oracle.truffle.r.ffi.impl.nodes.CoerceNodes.CoerceVectorNode;
 import com.oracle.truffle.r.ffi.impl.nodes.CoerceNodes.VectorToPairListNode;
 import com.oracle.truffle.r.ffi.impl.nodes.DoMakeClassNode;
@@ -879,7 +880,7 @@ public interface StdUpCallsRFFI {
     @RFFIUpCallNode(VectorToPairListNode.class)
     Object Rf_VectorToPairList(Object x);
 
-    @RFFIUpCallNode(CADDRNode.class)
+    @RFFIUpCallNode(AsCharacterFactor.class)
     Object Rf_asCharacterFactor(Object x);
 
     @RFFIUpCallNode(MatchNodes.MatchNode.class)

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/EdgeDetection.java

@@ -128,9 +128,9 @@ static Point rectEdge(double xmin, double ymin, double xmax, double ymax, double
     static Point polygonEdge(double[] x, double[] y, int n, double theta) {
         // centre of the polygon
         double xmin = fmin(Double.MAX_VALUE, x);
-        double xmax = fmax(Double.MIN_VALUE, x);
+        double xmax = fmax(-Double.MAX_VALUE, x);
         double ymin = fmin(Double.MAX_VALUE, y);
-        double ymax = fmax(Double.MIN_VALUE, y);
+        double ymax = fmax(-Double.MAX_VALUE, y);
         double xm = (xmin + xmax) / 2;
         double ym = (ymin + ymax) / 2;
 

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/GridTextNode.java

@@ -120,9 +120,9 @@ public Object gridText(RAbstractStringVector textVec, RAbstractVector x, RAbstra
         int boundsCount = 0;
         Point edge = null;
         double xmin = Double.MAX_VALUE;
-        double xmax = Double.MIN_VALUE;
+        double xmax = -Double.MAX_VALUE;
         double ymin = Double.MAX_VALUE;
-        double ymax = Double.MIN_VALUE;
+        double ymax = -Double.MAX_VALUE;
         int ntxt = 0;   // number of texts that were actually used for bounds computation
         EdgeDetection.Rectangle[] bounds = null;
         if (checkOverlap || !draw) {

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastrGrid/Unit.java

@@ -296,7 +296,7 @@ protected Double visitArithmeticUnit(ArithmeticUnit expr, Integer index) {
                         case "min":
                             return fmin(Double.MAX_VALUE, values);
                         case "max":
-                            return fmax(Double.MIN_VALUE, values);
+                            return fmax(-Double.MAX_VALUE, values);
                         case "sum":
                             return sum(values);
                     }
@@ -580,7 +580,7 @@ protected Double visitArithmeticUnit(ArithmeticUnit expr, UnitConversionArgs arg
                 case "min":
                     return GridUtils.fmin(Double.MAX_VALUE, values);
                 case "max":
-                    return GridUtils.fmax(Double.MIN_VALUE, values);
+                    return GridUtils.fmax(-Double.MAX_VALUE, values);
                 case "sum":
                     return GridUtils.sum(values);
                 default:

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/MaxCol.java

@@ -76,7 +76,7 @@ RAbstractIntVector findMaxCol(RAbstractContainer x, int tieArg,
         boolean tieLast = tie == TIE_LAST;
         boolean tieRandom = tie == TIE_RANDOM;
         double[] maxVals = new double[nrows];
-        Arrays.fill(maxVals, Double.MIN_VALUE);
+        Arrays.fill(maxVals, -Double.MAX_VALUE);
         int[] cols = new int[nrows];
         int resultIdx = 0;
         int colIdx = 1; // R indexing

com.oracle.truffle.r.test.packages/gated

@@ -7,3 +7,4 @@ rjson
 RSclient
 rstudioapi
 assertthat
+naivebayes