fix imports

cmorty · Jul 8, 2015 · f69fbdc · f69fbdc
1 parent 770c58f
commit f69fbdc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/tools/scala/src/main/scala/de/fau/realsim/rleDecoder/RLEdecoder.scala b/tools/scala/src/main/scala/de/fau/realsim/rleDecoder/RLEdecoder.scala
@@ -1,20 +1,21 @@
 package de.fau.realsim.rleDecoder
-import scala.language.implicitConversions
+
 import java.io.BufferedReader
-import java.io.PrintWriter
-import java.io.FileReader
-import java.io.FileWriter
-import scopt.OptionParser
-import scopt.OptionParser._
 import java.io.File
-import scala.collection.mutable.UnrolledBuffer
-import scala.collection.mutable.HashMap
 import java.io.FileOutputStream
-import java.util.zip.GZIPOutputStream
-import scala.collection.convert.Wrappers.ToIteratorWrapper
+import java.io.FileReader
+import java.io.FileWriter
+import java.io.PrintWriter
 import java.util.concurrent.TimeUnit.NANOSECONDS
+import java.util.zip.GZIPOutputStream
 
-import Data._
+import scala.collection.mutable.UnrolledBuffer
+import scala.language.implicitConversions
+
+import Data.dataToInt
+import Data.intToData
+import de.fau.realsim.helper.FormulaParser
+import scopt.OptionParser
 
 object RLEdecoder {
 

diff --git a/tools/scala/src/main/scala/de/fau/realsim/rleDecoder/RLEdecoder2.scala b/tools/scala/src/main/scala/de/fau/realsim/rleDecoder/RLEdecoder2.scala
@@ -1,14 +1,18 @@
-package de.fau.realsim
+package de.fau.realsim.rleDecoder
 
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileReader
 import java.util.concurrent.TimeUnit.NANOSECONDS
-import scala.collection.mutable.Buffer
+
+import scala.collection.JavaConversions.asScalaSet
+import scala.collection.mutable.ArrayBuffer
 import scala.language.implicitConversions
-import scopt.OptionParser
+
 import org.reflections.Reflections
-import scala.collection.mutable.ArrayBuffer
+
+import de.fau.realsim.helper.FormulaParser
+import scopt.OptionParser