Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compare Java and Scala BigDecimal with tolerance #213

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Compare Java and Scala BigDecimal with tolerance #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/2.0/scala/com/holdenkarau/spark/testing/DataFrameSuiteBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,13 @@ object DataFrameSuiteBase {
}

case d1: java.math.BigDecimal =>
if (d1.compareTo(o2.asInstanceOf[java.math.BigDecimal]) != 0) {
if (d1.subtract(o2.asInstanceOf[java.math.BigDecimal]).abs
.compareTo(new java.math.BigDecimal(tol)) > 0) {
return false
}

case d1: scala.math.BigDecimal =>
if ((d1 - o2.asInstanceOf[scala.math.BigDecimal]).abs > tol) {
return false
}

Expand Down
6 changes: 5 additions & 1 deletion src/main/pre-2.0/scala/com/holdenkarau/spark/testing/DataFrameSuiteBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,11 @@ object DataFrameSuiteBase {
if (abs(d1 - o2.asInstanceOf[Double]) > tol) return false

case d1: java.math.BigDecimal =>
if (d1.compareTo(o2.asInstanceOf[java.math.BigDecimal]) != 0) return false
if (d1.subtract(o2.asInstanceOf[java.math.BigDecimal]).abs
.compareTo(new java.math.BigDecimal(tol)) > 0) return false

case d1: scala.math.BigDecimal =>
if ((d1 - o2.asInstanceOf[scala.math.BigDecimal]).abs > tol) return false

case t1: Timestamp =>
if (abs(t1.getTime - o2.asInstanceOf[Timestamp].getTime) > tol) {
Expand Down
6 changes: 6 additions & 0 deletions src/test/1.3/scala/com/holdenkarau/spark/testing/SampleDataFrameTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ class SampleDataFrameTest extends FunSuite with DataFrameSuiteBase {
val row8 = Row(Timestamp.valueOf("2018-01-12 20:22:13"))
val row9 = Row(Timestamp.valueOf("2018-01-12 20:22:18"))
val row10 = Row(Timestamp.valueOf("2018-01-12 20:23:13"))
val row11 = Row(new java.math.BigDecimal(1.0))
val row11a = Row(new java.math.BigDecimal(1.0 + 1.0E-6))
val row12 = Row(scala.math.BigDecimal(1.0))
val row12a = Row(scala.math.BigDecimal(1.0 + 1.0E-6))
assert(false === approxEquals(row, row2, 1E-7))
assert(true === approxEquals(row, row2, 1E-5))
assert(true === approxEquals(row3, row3, 1E-5))
Expand All @@ -84,6 +88,8 @@ class SampleDataFrameTest extends FunSuite with DataFrameSuiteBase {
assert(false === approxEquals(row9, row8, 3000))
assert(true === approxEquals(row9, row10, 60000))
assert(false === approxEquals(row9, row10, 53000))
assert(true === approxEquals(row11, row11a, 1.0E-6))
assert(true === approxEquals(row12, row12a, 1.0E-6))
}

test("verify hive function support") {
Expand Down