Moved dictionaries to own package and created a placeholder for a Hu-…

…Tucker Front-Coding dictionary

#22

src/main/scala/com/signalcollect/triplerush/TriplePattern.scala

@@ -23,6 +23,7 @@ import scala.Option.option2Iterable
 import scala.runtime.ScalaRunTime
 import scala.util.hashing.MurmurHash3._
 import scala.language.implicitConversions
+import com.signalcollect.triplerush.dictionary.Dictionary
 
 object EfficientIndexPattern {
 

src/main/scala/com/signalcollect/triplerush/TripleRush.scala

@@ -53,6 +53,8 @@ import com.signalcollect.triplerush.vertices.query.QueryPlanningVertex
 import java.util.concurrent.atomic.AtomicReference
 import com.signalcollect.triplerush.loading.FileLoader
 import com.signalcollect.triplerush.optimizers.NoOptimizerCreator
+import com.signalcollect.triplerush.dictionary.CompressedDictionary
+import com.signalcollect.triplerush.dictionary.Dictionary
 
 /**
  * Global accessors for the console visualization.

src/main/scala/com/signalcollect/triplerush/CompressedDictionary.scala → src/main/scala/com/signalcollect/triplerush/dictionary/CompressedDictionary.scala

@@ -17,10 +17,11 @@
  *  
  */
 
-package com.signalcollect.triplerush
+package com.signalcollect.triplerush.dictionary
 
 import java.util.concurrent.locks.ReentrantReadWriteLock
 
+import com.signalcollect.triplerush.EfficientIndexPattern
 import com.signalcollect.triplerush.util.CompositeLongIntHashMap
 import com.signalcollect.util.IntLongHashMap
 

src/main/scala/com/signalcollect/triplerush/Dictionary.scala → src/main/scala/com/signalcollect/triplerush/dictionary/Dictionary.scala

@@ -18,7 +18,7 @@
  *  
  */
 
-package com.signalcollect.triplerush
+package com.signalcollect.triplerush.dictionary
 
 import com.signalcollect.util.IntHashMap
 import com.signalcollect.util.IntValueHashMap

src/main/scala/com/signalcollect/triplerush/dictionary/FrontCodingDictionary.scala

@@ -0,0 +1,34 @@
+/*  
+ *  Copyright 2015 iHealth Technologies
+ *      
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  
+ */
+
+package com.signalcollect.triplerush.dictionary
+
+/**
+ * This paper suggests that a Hu-Tucker Front-Coding dictionary performs very well on URIs.
+ * http://www.dcc.uchile.cl/~gnavarro/ps/sea11.1.pdf
+ */
+class FrontCodingDictionary extends Dictionary {
+
+  def contains(s: String): Boolean = ???
+  def apply(s: String): Int = ???
+  def apply(id: Int): String = ???
+  def unsafeDecode(id: Int): String = ???
+  def unsafeGetEncoded(s: String): Int = ???
+  def decode(id: Int): Option[String] = ???
+  def clear(): Unit = ???
+
+}

src/main/scala/com/signalcollect/triplerush/loading/FileLoader.scala

@@ -27,7 +27,8 @@ import org.apache.jena.riot.lang.{ PipedRDFIterator, PipedTriplesStream }
 
 import com.hp.hpl.jena.graph.{ Triple => JenaTriple }
 import com.signalcollect.GraphEditor
-import com.signalcollect.triplerush.{ Dictionary, EfficientIndexPattern, PlaceholderEdge }
+import com.signalcollect.triplerush.{ EfficientIndexPattern, PlaceholderEdge }
+import com.signalcollect.triplerush.dictionary.Dictionary
 import com.signalcollect.triplerush.sparql.NodeConversion
 
 case class FileLoader(filePath: String, dictionary: Dictionary) extends Iterator[GraphEditor[Long, Any] => Unit] {

src/main/scala/com/signalcollect/triplerush/optimizers/ExplorationHeuristicsOptimizer.scala

@@ -5,7 +5,6 @@ import com.signalcollect.triplerush.TriplePattern
 import scala.annotation.tailrec
 import com.signalcollect.triplerush.PredicateStats
 import scala.collection.mutable.ArrayBuffer
-import com.signalcollect.triplerush.Dictionary
 import scala.collection.immutable.Map
 import com.signalcollect.triplerush.TriplePattern
 

src/main/scala/com/signalcollect/triplerush/sparql/TripleRushIterator.scala

@@ -20,9 +20,9 @@
 package com.signalcollect.triplerush.sparql
 
 import com.hp.hpl.jena.graph.{ NodeFactory, Triple }
-import com.signalcollect.triplerush.Dictionary
 import com.hp.hpl.jena.graph.impl.LiteralLabelFactory
 import com.hp.hpl.jena.datatypes.TypeMapper
+import com.signalcollect.triplerush.dictionary.Dictionary
 
 object TripleRushIterator {
 

src/main/scala/com/signalcollect/triplerush/sparql/TripleRushStageGenerator.scala

@@ -26,7 +26,8 @@ import com.hp.hpl.jena.sparql.engine.{ ExecutionContext, QueryIterator }
 import com.hp.hpl.jena.sparql.engine.binding.{ Binding, BindingHashMap }
 import com.hp.hpl.jena.sparql.engine.iterator.{ QueryIterConcat, QueryIterPlainWrapper }
 import com.hp.hpl.jena.sparql.engine.main.StageGenerator
-import com.signalcollect.triplerush.{ Dictionary, TriplePattern, TripleRush }
+import com.signalcollect.triplerush.{ TriplePattern, TripleRush }
+import com.signalcollect.triplerush.dictionary.Dictionary
 import com.hp.hpl.jena.sparql.engine.iterator.QueryIterSingleton
 import com.hp.hpl.jena.graph.Node_Blank
 

src/test/scala/com/signalcollect/triplerush/CompressedDictionarySpec.scala → src/test/scala/com/signalcollect/triplerush/dictionary/CompressedDictionarySpec.scala

@@ -17,7 +17,7 @@
  *  
  */
 
-package com.signalcollect.triplerush
+package com.signalcollect.triplerush.dictionary
 
 import org.scalatest.FlatSpec
 
@@ -63,7 +63,7 @@ class CompressedDictionarySpec extends FlatSpec with TestAnnouncements {
     val decoded = d(id)
     assert(decoded == "simple#")
   }
-  
+
   it should "correctly encode and decode a string with a hash at the beginning" in {
     val d = new CompressedDictionary
     val id = d("#simple")
@@ -73,7 +73,7 @@ class CompressedDictionarySpec extends FlatSpec with TestAnnouncements {
     val decoded = d(id)
     assert(decoded == "#simple")
   }
-  
+
   it should "support adding entries in parallel" in {
     val d = new CompressedDictionary
     val stringEntries = (1 to 1000).map(s => s + "#" + s)
@@ -99,5 +99,5 @@ class CompressedDictionarySpec extends FlatSpec with TestAnnouncements {
     assert(reverseMapped.map(_.toInt).min == 1001)
     assert(highStringEntries.toSet == reverseMapped.toSet)
   }
-  
+
 }

src/test/scala/com/signalcollect/triplerush/DictionarySpec.scala → src/test/scala/com/signalcollect/triplerush/dictionary/DictionarySpec.scala

@@ -17,9 +17,10 @@
  *  
  */
 
-package com.signalcollect.triplerush
+package com.signalcollect.triplerush.dictionary
 
 import org.scalatest.FlatSpec
+
 import com.signalcollect.util.TestAnnouncements
 
 class DictonarySpec extends FlatSpec with TestAnnouncements {