summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorAleksandar Prokopec <axel22@gmail.com>2012-06-07 14:26:35 +0200
committerAleksandar Prokopec <axel22@gmail.com>2012-06-07 19:21:45 +0200
commit881641f83461b5fc23ab25d1efa08b7a760a3363 (patch)
tree5ed07883b14c77d6020c2e99e50f3407587495e6 /test/files/run
parent6cdb6b0299cb917ac3df9e39aa932bacdc31faf9 (diff)
downloadscala-881641f83461b5fc23ab25d1efa08b7a760a3363.tar.gz
scala-881641f83461b5fc23ab25d1efa08b7a760a3363.tar.bz2
scala-881641f83461b5fc23ab25d1efa08b7a760a3363.zip
Add the first iteration of the `util.hashing` package.
Move `MurmurHash3` to `util.hashing`. Make the `class` private and retain a public companion `object`, and put the `MurmurHash3.Hashing` implementations for various types in the companion. Add a method which composes `ByteswapHashing` with some other hashing. Rename `hashOf` to `hash`. Fix chi-square test in a test-case. Review by @jsuereth. Moved a failing test that seems to use some other library version to pending.
Diffstat (limited to 'test/files/run')
-rw-r--r--test/files/run/caseClassHash.scala4
-rw-r--r--test/files/run/t5880.scala2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/run/caseClassHash.scala b/test/files/run/caseClassHash.scala
index 7adfddedf8..c5cb09c355 100644
--- a/test/files/run/caseClassHash.scala
+++ b/test/files/run/caseClassHash.scala
@@ -11,8 +11,8 @@ object Test {
println("## method 1: " + foo1.##)
println("## method 2: " + foo2.##)
- println(" Murmur 1: " + scala.util.MurmurHash3.productHash(foo1))
- println(" Murmur 2: " + scala.util.MurmurHash3.productHash(foo2))
+ println(" Murmur 1: " + scala.util.hashing.MurmurHash3.productHash(foo1))
+ println(" Murmur 2: " + scala.util.hashing.MurmurHash3.productHash(foo2))
}
}
diff --git a/test/files/run/t5880.scala b/test/files/run/t5880.scala
index 08cd0d6bf8..4cda599f79 100644
--- a/test/files/run/t5880.scala
+++ b/test/files/run/t5880.scala
@@ -35,7 +35,7 @@ object Test {
}
// println(hits.toBuffer)
// println(ChiSquare)
- assert(ChiSquare < 2.0)
+ assert(ChiSquare < 4.0, ChiSquare + " -> " + hits.mkString(", "))
}
}