diff --git a/04-code-golf/tf-04-a.scala b/04-code-golf/tf04.scala similarity index 70% rename from 04-code-golf/tf-04-a.scala rename to 04-code-golf/tf04.scala index 2dda0db..abe0aba 100644 --- a/04-code-golf/tf-04-a.scala +++ b/04-code-golf/tf04.scala @@ -30,9 +30,14 @@ real 0m5.237s */ -object tf04a extends App { +object tf04 extends App { def l(f:String) = io.Source.fromFile(f).getLines.mkString(",") val s = l("../stop_words.txt").split(",") ++ (1 to 26).map(i=>String.valueOf(Character.toChars(96+i))) - val w = l(args(0)).split("[^a-zA-Z]+").filter(x => !s.contains(x.toLowerCase)) - w.distinct.map(u=> (u,w.count(_==u))).sortBy(-_._2).take(25).foreach(println) + + l(args(0)).split("[^a-zA-Z]+").filter(x => !s.contains(x.toLowerCase)) + .distinct + .map(u=> (u,l(args(0)).split("[^a-zA-Z]+").filter(x => !s.contains(x.toLowerCase)).count(_==u))) + .sortBy(-_._2) + .take(25) + .foreach(println) } diff --git a/04-code-golf/tf-04-fold.scala b/09-the-one/tf-04-fold.scala similarity index 100% rename from 04-code-golf/tf-04-fold.scala rename to 09-the-one/tf-04-fold.scala diff --git a/04-code-golf/tf-04-map.scala b/09-the-one/tf-04-map.scala similarity index 100% rename from 04-code-golf/tf-04-map.scala rename to 09-the-one/tf-04-map.scala