Major code refactoring

Removed unecessary packages (leftovers from InSynth) Changed all packages names from insynth to scife
epfl-lara · Sep 15, 2014 · 89469ec · 89469ec
1 parent 6d65867
commit 89469ec
Show file tree

Hide file tree

Showing 176 changed files with 293 additions and 2,401 deletions.
diff --git a/TODO.md b/TODO.md
@@ -0,0 +1,5 @@
+### Features
+
+### Metadata
+
+Add header checking to ScalaStyle config when add appropriate licence to the project
diff --git a/...umeration/benchmarks/BenchmarkSuite.scala → ...umeration/benchmarks/BenchmarkSuite.scala b/...umeration/benchmarks/BenchmarkSuite.scala → ...umeration/benchmarks/BenchmarkSuite.scala
@@ -1,4 +1,4 @@
-package insynth.enumeration.benchmarks
+package scife.enumeration.benchmarks
 
 import org.scalameter._
 

diff --git a/...eration/benchmarks/BinarySearchTree.scala → ...eration/benchmarks/BinarySearchTree.scala b/...eration/benchmarks/BinarySearchTree.scala → ...eration/benchmarks/BinarySearchTree.scala
@@ -1,13 +1,13 @@
-package insynth
+package scife
 package enumeration
 package benchmarks
 
 import dependent._
 import memoization._
-import insynth.{ enumeration => e }
-import insynth.util._
+import scife.{ enumeration => e }
+import scife.util._
 
-import insynth.util.logging._
+import scife.util.logging._
 
 import Structures._
 import BSTrees._
@@ -21,8 +21,7 @@ class BinarySearchTreeBenchmark
   extends StructuresBenchmark[Depend[(Int, Range), Tree]]
 //  extends PerformanceTest.OfflineReport with HasLogger with ProfileLogger
   {
-  import common._
-
+
   type EnumType = Depend[(Int, Range), Tree]
 
   def measureCode(tdEnum: EnumType) = {

diff --git a/...ion/benchmarks/BinarySearchTreeComp.scala → ...ion/benchmarks/BinarySearchTreeComp.scala b/...ion/benchmarks/BinarySearchTreeComp.scala → ...ion/benchmarks/BinarySearchTreeComp.scala
@@ -1,13 +1,13 @@
-package insynth
+package scife
 package enumeration
 package benchmarks
 
 import dependent._
 import memoization._
-import insynth.{ enumeration => e }
-import insynth.util._
+import scife.{ enumeration => e }
+import scife.util._
 
-import insynth.util.logging._
+import scife.util.logging._
 
 import Structures._
 import TreeShapes._
@@ -21,8 +21,7 @@ class BinarySearchTreeComp
   extends StructuresBenchmark[Depend[Int, Tree]]
 //  extends PerformanceTest.OfflineReport with HasLogger with ProfileLogger
   {
-  import common._
-
+
   type EnumType = Depend[Int, Tree]
 
   def measureCode(tdEnum: EnumType) = {

diff --git a/...ration/benchmarks/ClassDAGBenchmark.scala → ...ration/benchmarks/ClassDAGBenchmark.scala b/...ration/benchmarks/ClassDAGBenchmark.scala → ...ration/benchmarks/ClassDAGBenchmark.scala
@@ -1,13 +1,13 @@
-//package insynth
+//package scife
 //package enumeration
 //package benchmarks
 //
 //import dependent._
-//import insynth.{ enumeration => e }
+//import scife.{ enumeration => e }
 //import memoization._
 //
-//import insynth.util._
-//import insynth.util.logging._
+//import scife.util._
+//import scife.util.logging._
 //import Structures.BSTrees._
 //
 //import org.scalatest._
@@ -30,8 +30,7 @@
 //  type Output = List[(Int, List[Int], List[Int], List[Int])]
 //  type EnumType = Depend[Input, Output]
 //
-//  import common._
-//  import e.Enum
+//  //  import e.Enum
 //
 //  override def name = "ClassDAG"
 //

diff --git a/...nchmarks/ClassInterfaceDAGBenchmark.scala → ...nchmarks/ClassInterfaceDAGBenchmark.scala b/...nchmarks/ClassInterfaceDAGBenchmark.scala → ...nchmarks/ClassInterfaceDAGBenchmark.scala
@@ -1,13 +1,13 @@
-package insynth
+package scife
 package enumeration
 package benchmarks
 
 import dependent._
-import insynth.{ enumeration => e }
+import scife.{ enumeration => e }
 import memoization._
 
-import insynth.util._
-import insynth.util.logging._
+import scife.util._
+import scife.util.logging._
 import Structures.BSTrees._
 
 import org.scalatest._
@@ -29,8 +29,7 @@ class ClassInterfaceDAGBenchmark
   type Output = List[(Int, List[Int], List[Int], List[Int])]
   type EnumType = Depend[Input, Output]
 
-  import common._
-  import e.Enum
+    import e.Enum
 
 //  def fromSizeToPair(s: Int) = {
 //    val actual = s - 1

diff --git a/...enumeration/benchmarks/DAGBenchmark.scala → ...enumeration/benchmarks/DAGBenchmark.scala b/...enumeration/benchmarks/DAGBenchmark.scala → ...enumeration/benchmarks/DAGBenchmark.scala
@@ -1,13 +1,13 @@
-package insynth
+package scife
 package enumeration
 package benchmarks
 
 import dependent._
-import insynth.{ enumeration => e }
+import scife.{ enumeration => e }
 import memoization._
 
-import insynth.util._
-import insynth.util.logging._
+import scife.util._
+import scife.util.logging._
 import Structures.BSTrees._
 
 import org.scalatest._
@@ -28,8 +28,7 @@ class DAGStructureBenchmark
   type Output = List[List[Int]]
   type EnumType = Depend[Input, Output]
 
-  import common._
-  import e.Enum
+    import e.Enum
 
   def measureCode(tdEnum: EnumType) = {
     { (size: Int) =>

diff --git a/...ation/benchmarks/HeapArrayBenchmark.scala → ...ation/benchmarks/HeapArrayBenchmark.scala b/...ation/benchmarks/HeapArrayBenchmark.scala → ...ation/benchmarks/HeapArrayBenchmark.scala
@@ -1,13 +1,13 @@
-package insynth
+package scife
 package enumeration
 package benchmarks
 
 import dependent._
-import insynth.{ enumeration => e }
+import scife.{ enumeration => e }
 import memoization._
 
-import insynth.util._
-import insynth.util.logging._
+import scife.util._
+import scife.util.logging._
 import Structures.BSTrees._
 
 import org.scalatest._
@@ -20,8 +20,7 @@ class HeapArrayBenchmark
   extends StructuresBenchmark[Depend[(Int, Range), Tree]]
 //  extends DependentMemoizedBenchmark[Int, Depend[(Int, List[Int]), Tree]]
   with java.io.Serializable with HasLogger {
-  import common._
-  import e.Enum
+    import e.Enum
 
   type EnumType = Depend[(Int, Range), Tree]
 

diff --git a/...tion/benchmarks/HeapArrayBenchmark2.scala → ...tion/benchmarks/HeapArrayBenchmark2.scala b/...tion/benchmarks/HeapArrayBenchmark2.scala → ...tion/benchmarks/HeapArrayBenchmark2.scala
@@ -1,13 +1,13 @@
-package insynth
+package scife
 package enumeration
 package benchmarks
 
 import dependent._
-import insynth.{ enumeration => e }
+import scife.{ enumeration => e }
 import memoization._
 
-import insynth.util._
-import insynth.util.logging._
+import scife.util._
+import scife.util.logging._
 import Structures.BSTrees._
 
 import org.scalatest._
@@ -20,8 +20,7 @@ class HeapArrayBenchmark2
   extends StructuresBenchmark[Depend[(Int, Range), Tree]]
 //  extends DependentMemoizedBenchmark[Int, Depend[(Int, List[Int]), Tree]]
   with java.io.Serializable with HasLogger {
-  import common._
-  import e.Enum
+    import e.Enum
 
   type EnumType = Depend[(Int, Range), Tree]
 

diff --git a/...arks/RedBlackTreeDependentBenchmark.scala → ...arks/RedBlackTreeDependentBenchmark.scala b/...arks/RedBlackTreeDependentBenchmark.scala → ...arks/RedBlackTreeDependentBenchmark.scala
@@ -1,13 +1,13 @@
-package insynth
+package scife
 package enumeration
 package benchmarks
 
 import dependent._
-import insynth.{ enumeration => e }
+import scife.{ enumeration => e }
 import memoization._
 
-import insynth.util._
-import insynth.util.logging._
+import scife.util._
+import scife.util.logging._
 import Structures.RedBlackTrees._
 
 import org.scalatest._

diff --git a/...hmarks/SortedListDependentBenchmark.scala → ...hmarks/SortedListDependentBenchmark.scala b/...hmarks/SortedListDependentBenchmark.scala → ...hmarks/SortedListDependentBenchmark.scala
@@ -1,13 +1,13 @@
-package insynth
+package scife
 package enumeration
 package benchmarks
 
 import dependent._
-import insynth.{ enumeration => e }
+import scife.{ enumeration => e }
 import memoization._
 
-import insynth.util._
-import insynth.util.logging._
+import scife.util._
+import scife.util.logging._
 import Structures.RedBlackTrees._
 
 import org.scalatest._

diff --git a/.../insynth/enumeration/util/CLPParser.scala → ...la/scife/enumeration/util/CLPParser.scala b/.../insynth/enumeration/util/CLPParser.scala → ...la/scife/enumeration/util/CLPParser.scala
@@ -1,4 +1,4 @@
-package insynth.enumeration.benchmarks
+package scife.enumeration.benchmarks
 
 import org.scalameter._
 

diff --git a/...nsynth/enumeration/util/KoratParser.scala → .../scife/enumeration/util/KoratParser.scala b/...nsynth/enumeration/util/KoratParser.scala → .../scife/enumeration/util/KoratParser.scala
@@ -1,4 +1,4 @@
-package insynth.enumeration.benchmarks
+package scife.enumeration.benchmarks
 
 import org.scalameter._
 

diff --git a/...a/insynth/enumeration/util/Reporter.scala → ...ala/scife/enumeration/util/Reporter.scala b/...a/insynth/enumeration/util/Reporter.scala → ...ala/scife/enumeration/util/Reporter.scala
@@ -1,4 +1,4 @@
-package insynth.enumeration.benchmarks
+package scife.enumeration.benchmarks
 
 import org.scalameter._
 

diff --git a/src/main/scala/insynth/Solver.scala b/src/main/scala/insynth/Solver.scala
diff --git a/src/main/scala/insynth/engine/Cluster.scala b/src/main/scala/insynth/engine/Cluster.scala