assorted-commits

[Assorted-commits] SF.net SVN: assorted: [426] hash-dist/trunk/src/HashDist.scala

[<yan...@us...>]

Revision: 426
          http://assorted.svn.sourceforge.net/assorted/?rev=426&view=rev
Author:   yangzhang
Date:     2008-02-14 18:28:59 -0800 (Thu, 14 Feb 2008)

Log Message:
-----------
moved hash functions to scala commons

Modified Paths:
--------------
    hash-dist/trunk/src/HashDist.scala

Modified: hash-dist/trunk/src/HashDist.scala
===================================================================
--- hash-dist/trunk/src/HashDist.scala	2008-02-15 02:28:31 UTC (rev 425)
+++ hash-dist/trunk/src/HashDist.scala	2008-02-15 02:28:59 UTC (rev 426)
@@ -3,40 +3,13 @@
 import Control._
 import Io._
 import Tree._
+import Hash._
 
 import scala.util._
 
 object HashDist {
 
   /**
-   * From libstdc++ 4.1 __stl_hash_string.
-   */
-  def hashStl(xs: Seq[Int]) = {
-    var h = 0
-    for (x <- xs) h = 5 * h + x
-    h
-  }
-
-  /**
-   * From Sun JDK6 String.hashCode.
-   */
-  def hashJava(xs: Seq[Int]) = {
-    var h = 0
-    for (x <- xs) h = 31 * h + x
-    h
-  }
-
-  /**
-   * From http://www.cse.yorku.ca/~oz/hash.html. Not sure if this is correct,
-   * since Int is signed.
-   */
-  def hashDjb2(xs: Seq[Int]) = {
-    var h = 5381
-    for (x <- xs) h = ((h << 5) + h) + x
-    h
-  }
-
-  /**
    * Hash function.
    */
   type Hasher = Seq[Int] => Int


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [445] hash-dist/trunk/src/HashDist.scala

[<yan...@us...>]

Revision: 445
          http://assorted.svn.sourceforge.net/assorted/?rev=445&view=rev
Author:   yangzhang
Date:     2008-02-14 20:04:44 -0800 (Thu, 14 Feb 2008)

Log Message:
-----------
added warnings if something hashed to 0

Modified Paths:
--------------
    hash-dist/trunk/src/HashDist.scala

Modified: hash-dist/trunk/src/HashDist.scala
===================================================================
--- hash-dist/trunk/src/HashDist.scala	2008-02-15 04:04:38 UTC (rev 444)
+++ hash-dist/trunk/src/HashDist.scala	2008-02-15 04:04:44 UTC (rev 445)
@@ -43,8 +43,15 @@
 
     // For each line, hash its way down the tree.
     for (line <- untilNull(Console.readLine)) {
+      if (line.length == 0) println("XXX")
       val xs = line.toCharArray map (_ toInt)
-      val path = (for ((h,n) <- hs) yield mod(h(xs), n)).toArray
+      val path = (
+        for ((h,n) <- hs) yield {
+          val hv = h(xs)
+          if (hv == 0) println("hashed to 0: " + line + " / " + xs.toList)
+          mod(hv, n)
+        }
+      ) toArray
       val counts: Array[Int] = tree get path.toStream.init
       counts(path.last) += 1
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.