update

Author: Jader Martins

build.sbt

@@ -3,7 +3,7 @@ scalaVersion := "2.11.10"
 name := "kwic"
 version := "0.0.1"
 
-val sparkVersion = "2.3.0"
+val sparkVersion = "2.1.0"
 
 
 resolvers ++= Seq(

src/main/scala/br/unb/cic/kwic/IndexManager.scala

@@ -2,9 +2,11 @@ package br.unb.cic.kwic
 
 import org.apache.spark.rdd._
 
+
 object IndexManager {
+  type TMatch = (String, List[String])
 
-  def process(lines: RDD[String]): RDD[(String, List[String])] =
+  def process(lines: RDD[String]): RDD[TMatch] =
     lines.flatMap { l =>
       val words = l.split(' ').toList
       val indexes = (1 to words.length).map(p => (words, p-1))
@@ -15,10 +17,9 @@ object IndexManager {
       }
     }.reduceByKey((x: List[String], y: List[String]) => x++y)
 
-  def occurrencesOfWord(word: String,
-    indexmap: RDD[(String, List[String])]): List[String] =
+  def occurrencesOfWord(word: String, indexmap: RDD[TMatch]): List[String] =
     indexmap.lookup(word).head
 
-  def sortedWords(indexmap: RDD[(String, List[String])]): List[String] =
+  def sortedWords(indexmap: RDD[TMatch]): List[String] =
     indexmap.keys.collect.toList.sorted
 }

src/main/scala/br/unb/cic/kwic/WordShift.scala

@@ -11,10 +11,8 @@ object WordShift {
    */
   def shift(words: List[String], pos: Int, target: Int) : List[String] = {
     val (l, r) = words.splitAt(pos)
-    if(l.mkString(" ").length < (target -5)) {
-      return shiftRight(l, r, target)
-    }
-    return shiftLeft(l, r, target)
+    if (l.mkString(" ").length < (target -5)) shiftRight(l, r, target)
+    else shiftLeft(l, r, target)
   }
 
   /*
@@ -23,16 +21,12 @@ object WordShift {
    *of the first list is "smaller enough" than the target parameter.
    */
   private def shiftRight(l : List[String], r : List[String], target : Int) : List[String] = {
-    if(r.length == 0) {
-      return l
-    }
+    if (r.length == 0) return l
 
     val (r1, r2) = r.splitAt(r.length-1)
     val l1 = r2 ++ l
 
-    if(l1.mkString(" ").length > (target - 5)) {
-      return l ++ r
-    }
+    if(l1.mkString(" ").length > (target - 5)) return l ++ r
 
     return shiftRight(l1, r1, target)
   }
@@ -43,16 +37,12 @@ object WordShift {
    *of the first list is "smaller enough" than the target parameter.
    */
   private def shiftLeft(l : List[String], r : List[String], target : Int) : List[String]= {
-    if(l.length == 0) {
-      return r
-    }
+    if(l.length == 0) return r
 
     val (l1, l2) = l.splitAt(1)
     val r1 = r ++ l1
 
-    if(l2.mkString(" ").length < (target - 5)) {
-      return l2 ++ r1
-    }
+    if(l2.mkString(" ").length < (target - 5)) return l2 ++ r1
 
     return shiftLeft(l2, r1, target)
   }