Author: andy
Date: Sat May 5 20:37:38 2012
New Revision: 1334491
URL: http://svn.apache.org/viewvc?rev=1334491&view=rev
Log:
Rename XSDFuncOps for add and subtract.
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Add.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Divide.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Multiply.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggAvg.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggAvgDistinct.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSumDistinct.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/expr/TestXSDFuncOp.java
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Add.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Add.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Add.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Add.java
Sat May 5 20:37:38 2012
@@ -35,7 +35,7 @@ public class E_Add extends ExprFunction2
public NodeValue eval(NodeValue x, NodeValue y)
{
if ( ARQ.isStrictMode() )
- return XSDFuncOp.add(x, y) ;
+ return XSDFuncOp.numAdd(x, y) ;
if ( true )
{
@@ -44,7 +44,7 @@ public class E_Add extends ExprFunction2
if ( ! x.isNumber() || ! y.isNumber() )
throw new ExprEvalTypeException("Operator '+' requires two
numbers or two strings: got: "+x+" and "+y) ;
}
- return XSDFuncOp.add(x, y) ;
+ return XSDFuncOp.numAdd(x, y) ;
}
@Override
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Divide.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Divide.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Divide.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Divide.java
Sat May 5 20:37:38 2012
@@ -31,7 +31,7 @@ public class E_Divide extends ExprFuncti
}
@Override
- public NodeValue eval(NodeValue x, NodeValue y) { return
XSDFuncOp.divide(x, y) ; }
+ public NodeValue eval(NodeValue x, NodeValue y) { return
XSDFuncOp.numDivide(x, y) ; }
@Override
public Expr copy(Expr e1, Expr e2) { return new E_Divide(e1 , e2 ) ; }
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Multiply.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Multiply.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Multiply.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Multiply.java
Sat May 5 20:37:38 2012
@@ -31,7 +31,7 @@ public class E_Multiply extends ExprFunc
}
@Override
- public NodeValue eval(NodeValue x, NodeValue y) { return
XSDFuncOp.multiply(x, y) ; }
+ public NodeValue eval(NodeValue x, NodeValue y) { return
XSDFuncOp.numMultiply(x, y) ; }
@Override
public Expr copy(Expr e1, Expr e2) { return new E_Multiply(e1 , e2 ) ; }
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_Subtract.java
Sat May 5 20:37:38 2012
@@ -31,7 +31,7 @@ public class E_Subtract extends ExprFunc
}
@Override
- public NodeValue eval(NodeValue x, NodeValue y) { return
XSDFuncOp.subtract(x, y) ; }
+ public NodeValue eval(NodeValue x, NodeValue y) { return
XSDFuncOp.numSubtract(x, y) ; }
@Override
public Expr copy(Expr e1, Expr e2) { return new E_Subtract(e1 , e2 ) ; }
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
Sat May 5 20:37:38 2012
@@ -277,6 +277,9 @@ public abstract class NodeValue extends
public static NodeValue makeDuration(String lexicalForm)
{ return NodeValue.makeNode(lexicalForm, XSDduration) ; }
+ public static NodeValue makeDuration(Duration duration)
+ { return new NodeValueDuration(duration); }
+
public static NodeValue makeBoolean(boolean b)
{ return b ? NodeValue.TRUE : NodeValue.FALSE ; }
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggAvg.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggAvg.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggAvg.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggAvg.java
Sat May 5 20:37:38 2012
@@ -93,7 +93,7 @@ public class AggAvg extends AggregatorBa
if ( total == noValuesToAvg )
total = nv ;
else
- total = XSDFuncOp.add(nv, total) ;
+ total = XSDFuncOp.numAdd(nv, total) ;
}
else
{
@@ -116,7 +116,7 @@ public class AggAvg extends AggregatorBa
//throw new ExprEvalException("avg: error in group") ;
return null ;
NodeValue nvCount = NodeValue.makeInteger(count) ;
- return XSDFuncOp.divide(total, nvCount) ;
+ return XSDFuncOp.numDivide(total, nvCount) ;
}
}
}
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggAvgDistinct.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggAvgDistinct.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggAvgDistinct.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggAvgDistinct.java
Sat May 5 20:37:38 2012
@@ -89,7 +89,7 @@ public class AggAvgDistinct extends Aggr
if ( total == noValuesToAvg )
total = nv ;
else
- total = XSDFuncOp.add(nv, total) ;
+ total = XSDFuncOp.numAdd(nv, total) ;
}
else
throw new ExprEvalException("avg: not a number: "+nv) ;
@@ -102,7 +102,7 @@ public class AggAvgDistinct extends Aggr
{
if ( count == 0 ) return noValuesToAvg ;
NodeValue nvCount = NodeValue.makeInteger(count) ;
- return XSDFuncOp.divide(total, nvCount) ;
+ return XSDFuncOp.numDivide(total, nvCount) ;
}
@Override
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java
Sat May 5 20:37:38 2012
@@ -83,7 +83,7 @@ public class AggSum extends AggregatorB
if ( total == null )
total = nv ;
else
- total = XSDFuncOp.add(nv, total) ;
+ total = XSDFuncOp.numAdd(nv, total) ;
}
else
throw new ExprEvalException("Not a number: "+nv) ;
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSumDistinct.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSumDistinct.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSumDistinct.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSumDistinct.java
Sat May 5 20:37:38 2012
@@ -84,7 +84,7 @@ public class AggSumDistinct extends Agg
if ( total == null )
total = nv ;
else
- total = XSDFuncOp.add(nv, total) ;
+ total = XSDFuncOp.numAdd(nv, total) ;
}
else
throw new ExprEvalException("Not a number: "+nv) ;
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java
Sat May 5 20:37:38 2012
@@ -45,27 +45,29 @@ public class NodeValueDT extends NodeVal
{ throw new ARQInternalErrorException("Can't create a javax.xml
DatatypeFactory") ; }
}
- final XMLGregorianCalendar datatime ;
+ final private XMLGregorianCalendar datetime ;
public NodeValueDT(String lex, Node n)
{
super(n) ;
// Java bug : Java6 gMonth with a timezone of Z causes
IllegalArgumnentException
- if ( isGMonth() )
+ if ( XSDgMonth.equals(getNode().getLiteralDatatype()) )
{
if ( lex.endsWith("Z") )
{
lex = lex.substring(0, lex.length()-1) ;
- datatime = datatypefactory.newXMLGregorianCalendar(lex) ;
- datatime.setTimezone(0) ;
+ datetime = datatypefactory.newXMLGregorianCalendar(lex) ;
+ datetime.setTimezone(0) ;
return ;
}
}
- datatime = datatypefactory.newXMLGregorianCalendar(lex) ;
+ datetime = datatypefactory.newXMLGregorianCalendar(lex) ;
}
// Look at datatype.
// By doing this here, the check of valid lexical form must have been done
to create the node.
+
+
@Override
public boolean isDateTime() { return
XSDdateTime.equals(getNode().getLiteralDatatype()) ; }
@Override
@@ -84,7 +86,7 @@ public class NodeValueDT extends NodeVal
public boolean isGDay() { return
XSDgDay.equals(getNode().getLiteralDatatype()) ; }
@Override
- public XMLGregorianCalendar getDateTime() { return
(XMLGregorianCalendar)datatime.clone() ; }
+ public XMLGregorianCalendar getDateTime() { return
(XMLGregorianCalendar)datetime.clone() ; }
@Override
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
Sat May 5 20:37:38 2012
@@ -60,7 +60,7 @@ public class XSDFuncOp
// http://www.w3.org/TR/xpath-functions/#op.numeric
// http://www.w3.org/TR/xpath-functions/#comp.numeric
- public static NodeValue add(NodeValue nv1, NodeValue nv2) // F&O
numeric-add
+ public static NodeValue numAdd(NodeValue nv1, NodeValue nv2) // F&O
numeric-add
{
switch (classifyNumeric("add", nv1, nv2))
{
@@ -77,7 +77,7 @@ public class XSDFuncOp
}
}
- public static NodeValue subtract(NodeValue nv1, NodeValue nv2) // F&O
numeric-subtract
+ public static NodeValue numSubtract(NodeValue nv1, NodeValue nv2) // F&O
numeric-subtract
{
switch (classifyNumeric("subtract", nv1, nv2))
{
@@ -94,7 +94,7 @@ public class XSDFuncOp
}
}
- public static NodeValue multiply(NodeValue nv1, NodeValue nv2) // F&O
numeric-multiply
+ public static NodeValue numMultiply(NodeValue nv1, NodeValue nv2) // F&O
numeric-multiply
{
switch (classifyNumeric("multiply", nv1, nv2))
{
@@ -119,7 +119,7 @@ public class XSDFuncOp
Also, INF or -INF divided by INF or -INF returns NaN.
*/
- public static NodeValue divide(NodeValue nv1, NodeValue nv2) // F&O
numeric-divide
+ public static NodeValue numDivide(NodeValue nv1, NodeValue nv2) // F&O
numeric-divide
{
switch (classifyNumeric("divide", nv1, nv2))
{
Modified:
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/expr/TestXSDFuncOp.java
URL:
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/expr/TestXSDFuncOp.java?rev=1334491&r1=1334490&r2=1334491&view=diff
==============================================================================
---
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/expr/TestXSDFuncOp.java
(original)
+++
incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/expr/TestXSDFuncOp.java
Sat May 5 20:37:38 2012
@@ -60,7 +60,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeInteger(5) ;
NodeValue nv2 = NodeValue.makeInteger(7) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not an integer: "+r, r.isInteger()) ;
assertTrue("Not a NodeValueInteger: "+r, r instanceof
NodeValueInteger) ;
assertEquals("Wrong result", 12, r.getInteger().longValue()) ;
@@ -70,7 +70,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDecimal(4.3) ;
NodeValue nv2 = NodeValue.makeDecimal(3.7) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a decimal: "+r, r.isDecimal()) ;
assertTrue("Not a NodeValueDecimal: "+r, r instanceof
NodeValueDecimal) ;
assertEquals("Wrong result", 8, r.getDecimal().doubleValue(),
accuracyExact_D ) ;
@@ -80,7 +80,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeFloat(7.5f) ;
NodeValue nv2 = NodeValue.makeFloat(2.5f) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a float: "+r, r.isDouble()) ;
assertTrue("Not a NodeValueFloat: "+r, r instanceof NodeValueFloat) ;
assertEquals("Wrong result", 10, r.getFloat(), accuracyExact_F ) ;
@@ -91,7 +91,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDouble(7.5) ;
NodeValue nv2 = NodeValue.makeDouble(2.5) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a NodeValueDouble: "+r, r instanceof NodeValueDouble) ;
assertEquals("Wrong result", 10, r.getDouble(), accuracyExact_D ) ;
@@ -102,7 +102,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeInteger(5) ;
NodeValue nv2 = NodeValue.makeDecimal(7) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a decimal: "+r, r.isDecimal()) ;
assertTrue("Not a NodeValueDecimal: "+r, r instanceof
NodeValueDecimal) ;
assertEquals("Wrong result", 12, r.getDecimal().longValue()) ;
@@ -112,7 +112,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDecimal(7) ;
NodeValue nv2 = NodeValue.makeInteger(5) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a decimal: "+r, r.isDecimal()) ;
assertTrue("Not a NodeValueDecimal: "+r, r instanceof
NodeValueDecimal) ;
assertEquals("Wrong result", 12, r.getDecimal().longValue()) ;
@@ -122,7 +122,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeInteger(5) ;
NodeValue nv2 = NodeValue.makeFloat(7) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a float: "+r, r.isFloat()) ;
assertTrue("Not a NodeValueFloat: "+r, r instanceof NodeValueFloat) ;
assertEquals("Wrong result", 12, r.getDouble(), accuracyExact_F ) ;
@@ -132,7 +132,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeFloat(7) ;
NodeValue nv2 = NodeValue.makeInteger(5) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a float: "+r, r.isFloat()) ;
assertTrue("Not a NodeValueFloat: "+r, r instanceof NodeValueFloat) ;
assertEquals("Wrong result", 12, r.getDouble(), accuracyExact_F ) ;
@@ -142,7 +142,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeInteger(5) ;
NodeValue nv2 = NodeValue.makeDouble(7) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a NodeValueDouble: "+r, r instanceof NodeValueDouble) ;
assertEquals("Wrong result", 12, r.getDouble(), accuracyExact_D ) ;
@@ -152,7 +152,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDouble(7) ;
NodeValue nv2 = NodeValue.makeInteger(5) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a NodeValueDouble: "+r, r instanceof NodeValueDouble) ;
assertEquals("Wrong result", 12, r.getDouble(), accuracyExact_D ) ;
@@ -162,7 +162,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDecimal(3.5) ;
NodeValue nv2 = NodeValue.makeFloat(4.5f) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a Float: "+r, r.isFloat()) ;
assertTrue("Not a NodeValueFloat: "+r, r instanceof NodeValueFloat) ;
assertEquals("Wrong result", 8, r.getFloat(), accuracyExact_F) ;
@@ -172,7 +172,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeFloat(4.5f) ;
NodeValue nv2 = NodeValue.makeDecimal(3.5) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a Float: "+r, r.isFloat()) ;
assertTrue("Not a NodeValueFloat: "+r, r instanceof NodeValueFloat) ;
assertEquals("Wrong result", 8, r.getFloat(), accuracyExact_F) ;
@@ -181,7 +181,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDecimal(3.5) ;
NodeValue nv2 = NodeValue.makeDouble(4.5) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a NodeValueDouble: "+r, r instanceof NodeValueDouble) ;
assertEquals("Wrong result", 8, r.getDouble(), accuracyExact_D) ;
@@ -191,7 +191,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDouble(4.5) ;
NodeValue nv2 = NodeValue.makeDecimal(3.5) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a NodeValueDouble: "+r, r instanceof NodeValueDouble) ;
assertEquals("Wrong result", 8, r.getDouble(), accuracyExact_D ) ;
@@ -201,7 +201,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDouble(4.5) ;
NodeValue nv2 = NodeValue.makeFloat(3.5f) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a NodeValueDouble: "+r, r instanceof NodeValueDouble) ;
assertEquals("Wrong result", 8, r.getDouble(), accuracyExact_D ) ;
@@ -211,7 +211,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeFloat(4.5f) ;
NodeValue nv2 = NodeValue.makeDouble(3.5d) ;
- NodeValue r = XSDFuncOp.add(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numAdd(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a NodeValueDouble: "+r, r instanceof NodeValueDouble) ;
assertEquals("Wrong result", 8, r.getDouble(), accuracyExact_D ) ;
@@ -222,7 +222,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeInteger(25) ;
NodeValue nv2 = NodeValue.makeInteger(2) ;
- NodeValue r = XSDFuncOp.divide(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numDivide(nv1, nv2) ;
assertTrue("Not a decimal: "+r, r.isDecimal()) ;
assertTrue("Not a NodeValueDecimal: "+r, r instanceof
NodeValueDecimal) ;
assertEquals("Wrong result", 12.5, r.getDecimal().doubleValue(),
accuracyExact_D) ;
@@ -234,7 +234,7 @@ public class TestXSDFuncOp extends TestC
NodeValue nv1 = NodeValue.makeInteger(1) ;
NodeValue nv2 = NodeValue.makeInteger(0) ;
try {
- NodeValue r = XSDFuncOp.divide(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numDivide(nv1, nv2) ;
fail("No expection from .divide") ;
} catch (ExprEvalException ex)
{ }
@@ -244,7 +244,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeInteger(1) ;
NodeValue nv2 = NodeValue.makeDouble(0) ;
- NodeValue r = XSDFuncOp.divide(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numDivide(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a +INF: "+r, r.getDouble()==Double.POSITIVE_INFINITY) ;
}
@@ -253,7 +253,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeInteger(-1) ;
NodeValue nv2 = NodeValue.makeDouble(-0) ;
- NodeValue r = XSDFuncOp.divide(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numDivide(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a -INF: "+r, r.getDouble()==Double.NEGATIVE_INFINITY) ;
}
@@ -262,7 +262,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDouble(4.5) ;
NodeValue nv2 = NodeValue.makeDecimal(3.5) ;
- NodeValue r = XSDFuncOp.subtract(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numSubtract(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a NodeValueDouble: "+r, r instanceof NodeValueDouble) ;
assertEquals("Wrong result", 1d, r.getDouble(), accuracyExact_D ) ;
@@ -272,7 +272,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDecimal(3.5) ;
NodeValue nv2 = NodeValue.makeInteger(2) ;
- NodeValue r = XSDFuncOp.subtract(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numSubtract(nv1, nv2) ;
assertTrue("Not a decimal: "+r, r.isDecimal()) ;
assertTrue("Not a NodeValueDecimal: "+r, r instanceof
NodeValueDecimal) ;
assertTrue("Wrong result",
NodeValue.sameAs(NodeValue.makeDecimal(1.5), r) ) ;
@@ -282,7 +282,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDouble(4.5) ;
NodeValue nv2 = NodeValue.makeDecimal(3.5) ;
- NodeValue r = XSDFuncOp.multiply(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numMultiply(nv1, nv2) ;
assertTrue("Not a double: "+r, r.isDouble()) ;
assertTrue("Not a NodeValueDouble: "+r, r instanceof NodeValueDouble) ;
assertEquals("Wrong result", 4.5d*3.5d, r.getDouble(), accuracyExact_D
) ;
@@ -292,7 +292,7 @@ public class TestXSDFuncOp extends TestC
{
NodeValue nv1 = NodeValue.makeDecimal(3.5) ;
NodeValue nv2 = NodeValue.makeInteger(2) ;
- NodeValue r = XSDFuncOp.multiply(nv1, nv2) ;
+ NodeValue r = XSDFuncOp.numMultiply(nv1, nv2) ;
assertTrue("Not a decimal: "+r, r.isDecimal()) ;
assertTrue("Not a NodeValueDecimal: "+r, r instanceof
NodeValueDecimal) ;
assertEquals("Wrong result", 7L, r.getDecimal().longValue()) ;
