From 89469ec92de49a3509bcc82dffec22c108ff5a54 Mon Sep 17 00:00:00 2001 From: Ivan Kuraj Date: Mon, 15 Sep 2014 14:51:54 -0400 Subject: [PATCH] Major code refactoring Removed unecessary packages (leftovers from InSynth) Changed all packages names from insynth to scife --- TODO.md | 5 + .../benchmarks/BenchmarkSuite.scala | 2 +- .../benchmarks/BinarySearchTree.scala | 11 +- .../benchmarks/BinarySearchTreeComp.scala | 11 +- .../benchmarks/ClassDAGBenchmark.scala | 11 +- .../ClassInterfaceDAGBenchmark.scala | 11 +- .../enumeration/benchmarks/DAGBenchmark.scala | 11 +- .../benchmarks/HeapArrayBenchmark.scala | 11 +- .../benchmarks/HeapArrayBenchmark2.scala | 11 +- .../RedBlackTreeDependentBenchmark.scala | 8 +- .../SortedListDependentBenchmark.scala | 8 +- .../enumeration/util/CLPParser.scala | 2 +- .../enumeration/util/KoratParser.scala | 2 +- .../enumeration/util/Reporter.scala | 2 +- src/main/scala/insynth/Solver.scala | 73 ------ src/main/scala/insynth/engine/Cluster.scala | 27 --- src/main/scala/insynth/engine/Engine.scala | 37 --- .../scala/insynth/engine/Environment.scala | 150 ------------ .../insynth/engine/EnvironmentBuilder.scala | 98 -------- .../scala/insynth/engine/Properties.scala | 21 -- src/main/scala/insynth/engine/Requests.scala | 177 -------------- .../scala/insynth/engine/TypeAssignment.scala | 54 ----- .../insynth/engine/scheduler/Listener.scala | 14 -- .../insynth/engine/scheduler/Scheduler.scala | 73 ------ .../insynth/engine/scheduler/Subject.scala | 25 -- src/main/scala/insynth/load/Declaration.scala | 25 -- src/main/scala/insynth/load/Loader.scala | 7 - src/main/scala/insynth/query/Query.scala | 18 -- .../scala/insynth/query/QueryBuilder.scala | 14 -- .../scala/insynth/structures/DomainType.scala | 38 --- .../scala/insynth/structures/ProofTrees.scala | 27 --- .../insynth/structures/SuccinctType.scala | 110 --------- .../scala/insynth/structures/Weight.scala | 8 - .../scala/insynth/util/TreeOperations.scala | 110 --------- .../util/format/FormatSuccinctNode.scala | 49 ---- .../util/format/FormatSuccinctType.scala | 32 --- .../insynth/util/format/TreePrinter.scala | 219 ------------------ .../enumeration/Concat.scala | 2 +- .../enumeration/Empty.scala | 2 +- .../{insynth => scife}/enumeration/Enum.scala | 2 +- .../enumeration/Filter.scala | 2 +- .../enumeration/Finite.scala | 2 +- .../enumeration/Identity.scala | 2 +- .../enumeration/Infinite.scala | 2 +- .../{insynth => scife}/enumeration/Map.scala | 2 +- .../enumeration/Product.scala | 2 +- .../enumeration/Singleton.scala | 2 +- .../enumeration/WrapArray.scala | 2 +- .../enumeration/WrapFunction.scala | 2 +- .../enumeration/WrapIndexedSeq.scala | 2 +- .../enumeration/WrapStream.scala | 2 +- .../enumeration/combinators/Concat.scala | 2 +- .../enumeration/combinators/Filter.scala | 2 +- .../enumeration/combinators/Map.scala | 2 +- .../enumeration/combinators/Product.scala | 2 +- .../enumeration/dependent/Chain.scala | 4 +- .../enumeration/dependent/Concat.scala | 4 +- .../enumeration/dependent/ConcatFinite.scala | 4 +- .../dependent/ConcatInfinite.scala | 4 +- .../enumeration/dependent/Depend.scala | 2 +- .../enumeration/dependent/DependFinite.scala | 2 +- .../dependent/DependInfinite.scala | 2 +- .../enumeration/dependent/InMap.scala | 2 +- .../enumeration/dependent/Product.scala | 8 +- .../enumeration/dependent/ProductFinite.scala | 6 +- .../enumeration/dependent/WrapFunction.scala | 2 +- .../enumeration/dependent/WrapMap.scala | 2 +- .../dependent/combinators/Chain.scala | 4 +- .../dependent/combinators/Concat.scala | 2 +- .../dependent/combinators/InMap.scala | 2 +- .../dependent/combinators/Product.scala | 2 +- .../dependent/eager/ChainFinite.scala | 4 +- .../dependent/eager/ChainFiniteSingle.scala | 4 +- .../dependent/lzy/ChainFinite.scala | 6 +- .../dependent/lzy/ChainFiniteSingle.scala | 6 +- .../enumeration/eager/SimpleFilter.scala | 2 +- .../enumeration/lzy/Concat.scala | 2 +- .../enumeration/lzy/ConcatFinite.scala | 2 +- .../lzy/ConcatFiniteInfinite.scala | 2 +- .../enumeration/lzy/ConcatInfinite.scala | 2 +- .../enumeration/lzy/Product.scala | 4 +- .../enumeration/lzy/ProductFinite.scala | 4 +- .../lzy/ProductFiniteInfinite.scala | 6 +- .../enumeration/lzy/ProductInfinite.scala | 4 +- .../lzy/dynamic/ConcatFiniteBuffer.scala | 2 +- .../enumeration/memoization/Memoizable.scala | 2 +- .../memoization/MemoizationScope.scala | 2 +- .../enumeration/memoization/Memoized.scala | 2 +- .../memoization/MemoizedEmpty.scala | 2 +- .../memoization/dependent/Chain.scala | 8 +- .../memoization/dependent/Memoized.scala | 4 +- .../enumeration/package.scala | 2 +- .../enumeration/reverse/Empty.scala | 4 +- .../enumeration/reverse/Identity.scala | 4 +- .../enumeration/reverse/Map.scala | 4 +- .../enumeration/reverse/ProductFinite.scala | 4 +- .../enumeration/reverse/Reverse.scala | 2 +- .../enumeration/reverse/Reversed.scala | 2 +- .../enumeration/reverse/Reverser.scala | 2 +- .../enumeration/reverse/Singleton.scala | 2 +- .../enumeration/reverse/WrapArray.scala | 4 +- .../enumeration/reverse/WrapFunction.scala | 4 +- .../reverse/dependent/ChainFinite.scala | 4 +- .../reverse/dependent/DependReverse.scala | 4 +- .../enumeration/reverse/dependent/InMap.scala | 4 +- .../reverse/dependent/Product.scala | 6 +- .../reverse/dependent/ProductFinite.scala | 4 +- .../reverse/dependent/Reverser.scala | 6 +- .../enumeration/types/Sequent.scala | 2 +- .../enumeration/types/TraversableOnce.scala | 2 +- .../enumeration/util/EnumStream.scala | 2 +- .../util/FreshNameGenerator.scala | 2 +- .../scala/{insynth => scife}/util/Math.scala | 2 +- .../{insynth => scife}/util/Stopwatch.scala | 2 +- .../util/TernaryOperator.scala | 2 +- .../{insynth => scife}/util/TimeOut.scala | 2 +- .../util/format/Formatable.scala | 2 +- .../util/logging/CountedLogger.scala | 2 +- .../util/logging/DummyLogger.scala | 2 +- .../util/logging/HasLogger.scala | 2 +- .../util/logging/LoggerFactory.scala | 2 +- .../util/logging/ProfileLogger.scala | 2 +- .../enumeration/testcases/classdag/DAG.java | 2 +- .../testcases/classdag/DAGNode.java | 2 +- .../testcases/classinterfacedag/DAG.java | 2 +- .../testcases/classinterfacedag/DAGNode.java | 2 +- .../util/MemoryLeakTester.java | 2 +- src/test/scala/insynth/SolverTest.scala | 161 ------------- .../insynth/common/CommonDeclarations.scala | 35 --- .../insynth/common/CommonDomainTypes.scala | 27 --- .../insynth/common/CommonProofTrees.scala | 217 ----------------- .../insynth/common/CommonSuccinctTypes.scala | 24 -- .../scala/insynth/load/DeclarationTest.scala | 34 --- .../insynth/load/DeclarationTestJUnit.scala | 23 -- .../insynth/structures/DomainTypeTest.scala | 44 ---- .../insynth/structures/SuccinctTypeTest.scala | 57 ----- .../insynth/testdomain/TestDeclaration.scala | 36 --- .../scala/insynth/testdomain/TestQuery.scala | 17 -- .../insynth/testdomain/TestQueryBuilder.scala | 18 -- .../enumeration/CombinatorsTest.scala | 2 +- .../enumeration/EnumStreamTest.scala | 2 +- .../enumeration/EnumTest.scala | 2 +- .../enumeration/FiniteTest.scala | 2 +- .../enumeration/SingletonTest.scala | 2 +- .../{insynth => scife}/enumeration/Util.scala | 2 +- .../benchmarks/DependentBenchmark.scala | 8 +- .../benchmarks/StructuresBenchmark.scala | 8 +- .../test/BinarySearchTreeBenchmarkTest.scala | 11 +- .../BinarySearchTreeCompBenchmarkTest.scala | 11 +- .../benchmarks/test/BinarySearchTreeOld.scala | 11 +- .../benchmarks/test/HeapArrayBenchmark.scala | 13 +- .../RedBlackTreeDependentBenchmarkTest.scala | 11 +- .../test/SortedListDependentBenchmark.scala | 10 +- .../enumeration/dependent/ChainTest.scala | 4 +- .../dependent/CombinationsTest.scala | 6 +- .../enumeration/dependent/DependentTest.scala | 2 +- .../enumeration/lzy/ConcatFiniteTest.scala | 4 +- .../enumeration/lzy/ProductFiniteTest.scala | 2 +- .../enumeration/lzy/ProductInfiniteTest.scala | 2 +- .../reverse/BinarySearchTreeTest.scala | 8 +- .../enumeration/reverse/ReverseTest.scala | 4 +- .../enumeration/reverse/SortedListTest.scala | 8 +- .../showcase/BinarySearchTree.scala | 11 +- .../showcase/PedagogicalExample.scala | 11 +- .../testcases/BinarySearchTreeTest.scala | 8 +- .../enumeration/testcases/ClassDAGTest.scala | 12 +- .../testcases/ClassInterfaceDAGTest.scala | 12 +- .../enumeration/testcases/DAGTest.scala | 8 +- .../testcases/DAGTestStructure.scala | 8 +- .../testcases/HeapArrayEqualTest.scala | 8 +- .../enumeration/testcases/HeapArrayTest.scala | 8 +- .../{insynth => scife}/util/Checks.scala | 2 +- .../{insynth => scife}/util/MemoryLeak.scala | 2 +- .../scala/{insynth => scife}/util/RBMap.scala | 2 +- .../util/RunnableJUnit.scala | 2 +- .../{insynth => scife}/util/Structures.scala | 2 +- 176 files changed, 293 insertions(+), 2401 deletions(-) create mode 100644 TODO.md rename src/bench/test/scala/{insynth => scife}/enumeration/benchmarks/BenchmarkSuite.scala (99%) rename src/bench/test/scala/{insynth => scife}/enumeration/benchmarks/BinarySearchTree.scala (94%) rename src/bench/test/scala/{insynth => scife}/enumeration/benchmarks/BinarySearchTreeComp.scala (93%) rename src/bench/test/scala/{insynth => scife}/enumeration/benchmarks/ClassDAGBenchmark.scala (97%) rename src/bench/test/scala/{insynth => scife}/enumeration/benchmarks/ClassInterfaceDAGBenchmark.scala (98%) rename src/bench/test/scala/{insynth => scife}/enumeration/benchmarks/DAGBenchmark.scala (95%) rename src/bench/test/scala/{insynth => scife}/enumeration/benchmarks/HeapArrayBenchmark.scala (95%) rename src/bench/test/scala/{insynth => scife}/enumeration/benchmarks/HeapArrayBenchmark2.scala (94%) rename src/bench/test/scala/{insynth => scife}/enumeration/benchmarks/RedBlackTreeDependentBenchmark.scala (97%) rename src/bench/test/scala/{insynth => scife}/enumeration/benchmarks/SortedListDependentBenchmark.scala (96%) rename src/bench/test/scala/{insynth => scife}/enumeration/util/CLPParser.scala (94%) rename src/bench/test/scala/{insynth => scife}/enumeration/util/KoratParser.scala (95%) rename src/bench/test/scala/{insynth => scife}/enumeration/util/Reporter.scala (97%) delete mode 100644 src/main/scala/insynth/Solver.scala delete mode 100644 src/main/scala/insynth/engine/Cluster.scala delete mode 100644 src/main/scala/insynth/engine/Engine.scala delete mode 100644 src/main/scala/insynth/engine/Environment.scala delete mode 100644 src/main/scala/insynth/engine/EnvironmentBuilder.scala delete mode 100644 src/main/scala/insynth/engine/Properties.scala delete mode 100644 src/main/scala/insynth/engine/Requests.scala delete mode 100644 src/main/scala/insynth/engine/TypeAssignment.scala delete mode 100644 src/main/scala/insynth/engine/scheduler/Listener.scala delete mode 100644 src/main/scala/insynth/engine/scheduler/Scheduler.scala delete mode 100644 src/main/scala/insynth/engine/scheduler/Subject.scala delete mode 100644 src/main/scala/insynth/load/Declaration.scala delete mode 100644 src/main/scala/insynth/load/Loader.scala delete mode 100644 src/main/scala/insynth/query/Query.scala delete mode 100644 src/main/scala/insynth/query/QueryBuilder.scala delete mode 100644 src/main/scala/insynth/structures/DomainType.scala delete mode 100644 src/main/scala/insynth/structures/ProofTrees.scala delete mode 100644 src/main/scala/insynth/structures/SuccinctType.scala delete mode 100644 src/main/scala/insynth/structures/Weight.scala delete mode 100644 src/main/scala/insynth/util/TreeOperations.scala delete mode 100644 src/main/scala/insynth/util/format/FormatSuccinctNode.scala delete mode 100644 src/main/scala/insynth/util/format/FormatSuccinctType.scala delete mode 100644 src/main/scala/insynth/util/format/TreePrinter.scala rename src/main/scala/{insynth => scife}/enumeration/Concat.scala (94%) rename src/main/scala/{insynth => scife}/enumeration/Empty.scala (87%) rename src/main/scala/{insynth => scife}/enumeration/Enum.scala (99%) rename src/main/scala/{insynth => scife}/enumeration/Filter.scala (97%) rename src/main/scala/{insynth => scife}/enumeration/Finite.scala (97%) rename src/main/scala/{insynth => scife}/enumeration/Identity.scala (93%) rename src/main/scala/{insynth => scife}/enumeration/Infinite.scala (89%) rename src/main/scala/{insynth => scife}/enumeration/Map.scala (97%) rename src/main/scala/{insynth => scife}/enumeration/Product.scala (98%) rename src/main/scala/{insynth => scife}/enumeration/Singleton.scala (92%) rename src/main/scala/{insynth => scife}/enumeration/WrapArray.scala (97%) rename src/main/scala/{insynth => scife}/enumeration/WrapFunction.scala (95%) rename src/main/scala/{insynth => scife}/enumeration/WrapIndexedSeq.scala (94%) rename src/main/scala/{insynth => scife}/enumeration/WrapStream.scala (92%) rename src/main/scala/{insynth => scife}/enumeration/combinators/Concat.scala (90%) rename src/main/scala/{insynth => scife}/enumeration/combinators/Filter.scala (80%) rename src/main/scala/{insynth => scife}/enumeration/combinators/Map.scala (84%) rename src/main/scala/{insynth => scife}/enumeration/combinators/Product.scala (84%) rename src/main/scala/{insynth => scife}/enumeration/dependent/Chain.scala (98%) rename src/main/scala/{insynth => scife}/enumeration/dependent/Concat.scala (85%) rename src/main/scala/{insynth => scife}/enumeration/dependent/ConcatFinite.scala (84%) rename src/main/scala/{insynth => scife}/enumeration/dependent/ConcatInfinite.scala (85%) rename src/main/scala/{insynth => scife}/enumeration/dependent/Depend.scala (99%) rename src/main/scala/{insynth => scife}/enumeration/dependent/DependFinite.scala (96%) rename src/main/scala/{insynth => scife}/enumeration/dependent/DependInfinite.scala (80%) rename src/main/scala/{insynth => scife}/enumeration/dependent/InMap.scala (98%) rename src/main/scala/{insynth => scife}/enumeration/dependent/Product.scala (82%) rename src/main/scala/{insynth => scife}/enumeration/dependent/ProductFinite.scala (82%) rename src/main/scala/{insynth => scife}/enumeration/dependent/WrapFunction.scala (98%) rename src/main/scala/{insynth => scife}/enumeration/dependent/WrapMap.scala (93%) rename src/main/scala/{insynth => scife}/enumeration/dependent/combinators/Chain.scala (84%) rename src/main/scala/{insynth => scife}/enumeration/dependent/combinators/Concat.scala (83%) rename src/main/scala/{insynth => scife}/enumeration/dependent/combinators/InMap.scala (92%) rename src/main/scala/{insynth => scife}/enumeration/dependent/combinators/Product.scala (84%) rename src/main/scala/{insynth => scife}/enumeration/dependent/eager/ChainFinite.scala (97%) rename src/main/scala/{insynth => scife}/enumeration/dependent/eager/ChainFiniteSingle.scala (93%) rename src/main/scala/{insynth => scife}/enumeration/dependent/lzy/ChainFinite.scala (94%) rename src/main/scala/{insynth => scife}/enumeration/dependent/lzy/ChainFiniteSingle.scala (89%) rename src/main/scala/{insynth => scife}/enumeration/eager/SimpleFilter.scala (95%) rename src/main/scala/{insynth => scife}/enumeration/lzy/Concat.scala (97%) rename src/main/scala/{insynth => scife}/enumeration/lzy/ConcatFinite.scala (99%) rename src/main/scala/{insynth => scife}/enumeration/lzy/ConcatFiniteInfinite.scala (97%) rename src/main/scala/{insynth => scife}/enumeration/lzy/ConcatInfinite.scala (96%) rename src/main/scala/{insynth => scife}/enumeration/lzy/Product.scala (97%) rename src/main/scala/{insynth => scife}/enumeration/lzy/ProductFinite.scala (96%) rename src/main/scala/{insynth => scife}/enumeration/lzy/ProductFiniteInfinite.scala (93%) rename src/main/scala/{insynth => scife}/enumeration/lzy/ProductInfinite.scala (92%) rename src/main/scala/{insynth => scife}/enumeration/lzy/dynamic/ConcatFiniteBuffer.scala (96%) rename src/main/scala/{insynth => scife}/enumeration/memoization/Memoizable.scala (70%) rename src/main/scala/{insynth => scife}/enumeration/memoization/MemoizationScope.scala (90%) rename src/main/scala/{insynth => scife}/enumeration/memoization/Memoized.scala (96%) rename src/main/scala/{insynth => scife}/enumeration/memoization/MemoizedEmpty.scala (80%) rename src/main/scala/{insynth => scife}/enumeration/memoization/dependent/Chain.scala (95%) rename src/main/scala/{insynth => scife}/enumeration/memoization/dependent/Memoized.scala (89%) rename src/main/scala/{insynth => scife}/enumeration/package.scala (91%) rename src/main/scala/{insynth => scife}/enumeration/reverse/Empty.scala (75%) rename src/main/scala/{insynth => scife}/enumeration/reverse/Identity.scala (81%) rename src/main/scala/{insynth => scife}/enumeration/reverse/Map.scala (82%) rename src/main/scala/{insynth => scife}/enumeration/reverse/ProductFinite.scala (89%) rename src/main/scala/{insynth => scife}/enumeration/reverse/Reverse.scala (95%) rename src/main/scala/{insynth => scife}/enumeration/reverse/Reversed.scala (87%) rename src/main/scala/{insynth => scife}/enumeration/reverse/Reverser.scala (96%) rename src/main/scala/{insynth => scife}/enumeration/reverse/Singleton.scala (91%) rename src/main/scala/{insynth => scife}/enumeration/reverse/WrapArray.scala (90%) rename src/main/scala/{insynth => scife}/enumeration/reverse/WrapFunction.scala (90%) rename src/main/scala/{insynth => scife}/enumeration/reverse/dependent/ChainFinite.scala (96%) rename src/main/scala/{insynth => scife}/enumeration/reverse/dependent/DependReverse.scala (78%) rename src/main/scala/{insynth => scife}/enumeration/reverse/dependent/InMap.scala (77%) rename src/main/scala/{insynth => scife}/enumeration/reverse/dependent/Product.scala (65%) rename src/main/scala/{insynth => scife}/enumeration/reverse/dependent/ProductFinite.scala (86%) rename src/main/scala/{insynth => scife}/enumeration/reverse/dependent/Reverser.scala (95%) rename src/main/scala/{insynth => scife}/enumeration/types/Sequent.scala (63%) rename src/main/scala/{insynth => scife}/enumeration/types/TraversableOnce.scala (66%) rename src/main/scala/{insynth => scife}/enumeration/util/EnumStream.scala (96%) rename src/main/scala/{insynth => scife}/util/FreshNameGenerator.scala (93%) rename src/main/scala/{insynth => scife}/util/Math.scala (95%) rename src/main/scala/{insynth => scife}/util/Stopwatch.scala (98%) rename src/main/scala/{insynth => scife}/util/TernaryOperator.scala (92%) rename src/main/scala/{insynth => scife}/util/TimeOut.scala (92%) rename src/main/scala/{insynth => scife}/util/format/Formatable.scala (98%) rename src/main/scala/{insynth => scife}/util/logging/CountedLogger.scala (97%) rename src/main/scala/{insynth => scife}/util/logging/DummyLogger.scala (95%) rename src/main/scala/{insynth => scife}/util/logging/HasLogger.scala (97%) rename src/main/scala/{insynth => scife}/util/logging/LoggerFactory.scala (96%) rename src/main/scala/{insynth => scife}/util/logging/ProfileLogger.scala (97%) rename src/test/java/{insynth => scife}/enumeration/testcases/classdag/DAG.java (99%) rename src/test/java/{insynth => scife}/enumeration/testcases/classdag/DAGNode.java (97%) rename src/test/java/{insynth => scife}/enumeration/testcases/classinterfacedag/DAG.java (99%) rename src/test/java/{insynth => scife}/enumeration/testcases/classinterfacedag/DAGNode.java (98%) rename src/test/java/{insynth => scife}/util/MemoryLeakTester.java (98%) delete mode 100644 src/test/scala/insynth/SolverTest.scala delete mode 100644 src/test/scala/insynth/common/CommonDeclarations.scala delete mode 100644 src/test/scala/insynth/common/CommonDomainTypes.scala delete mode 100644 src/test/scala/insynth/common/CommonProofTrees.scala delete mode 100644 src/test/scala/insynth/common/CommonSuccinctTypes.scala delete mode 100644 src/test/scala/insynth/load/DeclarationTest.scala delete mode 100644 src/test/scala/insynth/load/DeclarationTestJUnit.scala delete mode 100644 src/test/scala/insynth/structures/DomainTypeTest.scala delete mode 100644 src/test/scala/insynth/structures/SuccinctTypeTest.scala delete mode 100644 src/test/scala/insynth/testdomain/TestDeclaration.scala delete mode 100644 src/test/scala/insynth/testdomain/TestQuery.scala delete mode 100644 src/test/scala/insynth/testdomain/TestQueryBuilder.scala rename src/test/scala/{insynth => scife}/enumeration/CombinatorsTest.scala (99%) rename src/test/scala/{insynth => scife}/enumeration/EnumStreamTest.scala (96%) rename src/test/scala/{insynth => scife}/enumeration/EnumTest.scala (98%) rename src/test/scala/{insynth => scife}/enumeration/FiniteTest.scala (97%) rename src/test/scala/{insynth => scife}/enumeration/SingletonTest.scala (95%) rename src/test/scala/{insynth => scife}/enumeration/Util.scala (98%) rename src/test/scala/{insynth => scife}/enumeration/benchmarks/DependentBenchmark.scala (97%) rename src/test/scala/{insynth => scife}/enumeration/benchmarks/StructuresBenchmark.scala (78%) rename src/test/scala/{insynth => scife}/enumeration/benchmarks/test/BinarySearchTreeBenchmarkTest.scala (96%) rename src/test/scala/{insynth => scife}/enumeration/benchmarks/test/BinarySearchTreeCompBenchmarkTest.scala (95%) rename src/test/scala/{insynth => scife}/enumeration/benchmarks/test/BinarySearchTreeOld.scala (95%) rename src/test/scala/{insynth => scife}/enumeration/benchmarks/test/HeapArrayBenchmark.scala (92%) rename src/test/scala/{insynth => scife}/enumeration/benchmarks/test/RedBlackTreeDependentBenchmarkTest.scala (97%) rename src/test/scala/{insynth => scife}/enumeration/benchmarks/test/SortedListDependentBenchmark.scala (95%) rename src/test/scala/{insynth => scife}/enumeration/dependent/ChainTest.scala (83%) rename src/test/scala/{insynth => scife}/enumeration/dependent/CombinationsTest.scala (99%) rename src/test/scala/{insynth => scife}/enumeration/dependent/DependentTest.scala (97%) rename src/test/scala/{insynth => scife}/enumeration/lzy/ConcatFiniteTest.scala (96%) rename src/test/scala/{insynth => scife}/enumeration/lzy/ProductFiniteTest.scala (92%) rename src/test/scala/{insynth => scife}/enumeration/lzy/ProductInfiniteTest.scala (94%) rename src/test/scala/{insynth => scife}/enumeration/reverse/BinarySearchTreeTest.scala (97%) rename src/test/scala/{insynth => scife}/enumeration/reverse/ReverseTest.scala (94%) rename src/test/scala/{insynth => scife}/enumeration/reverse/SortedListTest.scala (97%) rename src/test/scala/{insynth => scife}/enumeration/showcase/BinarySearchTree.scala (98%) rename src/test/scala/{insynth => scife}/enumeration/showcase/PedagogicalExample.scala (95%) rename src/test/scala/{insynth => scife}/enumeration/testcases/BinarySearchTreeTest.scala (97%) rename src/test/scala/{insynth => scife}/enumeration/testcases/ClassDAGTest.scala (97%) rename src/test/scala/{insynth => scife}/enumeration/testcases/ClassInterfaceDAGTest.scala (98%) rename src/test/scala/{insynth => scife}/enumeration/testcases/DAGTest.scala (98%) rename src/test/scala/{insynth => scife}/enumeration/testcases/DAGTestStructure.scala (96%) rename src/test/scala/{insynth => scife}/enumeration/testcases/HeapArrayEqualTest.scala (99%) rename src/test/scala/{insynth => scife}/enumeration/testcases/HeapArrayTest.scala (98%) rename src/test/scala/{insynth => scife}/util/Checks.scala (99%) rename src/test/scala/{insynth => scife}/util/MemoryLeak.scala (97%) rename src/test/scala/{insynth => scife}/util/RBMap.scala (99%) rename src/test/scala/{insynth => scife}/util/RunnableJUnit.scala (83%) rename src/test/scala/{insynth => scife}/util/Structures.scala (99%) diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..507eb05 --- /dev/null +++ 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/src/bench/test/scala/insynth/enumeration/benchmarks/BenchmarkSuite.scala b/src/bench/test/scala/scife/enumeration/benchmarks/BenchmarkSuite.scala similarity index 99% rename from src/bench/test/scala/insynth/enumeration/benchmarks/BenchmarkSuite.scala rename to src/bench/test/scala/scife/enumeration/benchmarks/BenchmarkSuite.scala index 217356d..9ba81f1 100644 --- a/src/bench/test/scala/insynth/enumeration/benchmarks/BenchmarkSuite.scala +++ b/src/bench/test/scala/scife/enumeration/benchmarks/BenchmarkSuite.scala @@ -1,4 +1,4 @@ -package insynth.enumeration.benchmarks +package scife.enumeration.benchmarks import org.scalameter._ diff --git a/src/bench/test/scala/insynth/enumeration/benchmarks/BinarySearchTree.scala b/src/bench/test/scala/scife/enumeration/benchmarks/BinarySearchTree.scala similarity index 94% rename from src/bench/test/scala/insynth/enumeration/benchmarks/BinarySearchTree.scala rename to src/bench/test/scala/scife/enumeration/benchmarks/BinarySearchTree.scala index e63add6..37f01f9 100644 --- a/src/bench/test/scala/insynth/enumeration/benchmarks/BinarySearchTree.scala +++ b/src/bench/test/scala/scife/enumeration/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/src/bench/test/scala/insynth/enumeration/benchmarks/BinarySearchTreeComp.scala b/src/bench/test/scala/scife/enumeration/benchmarks/BinarySearchTreeComp.scala similarity index 93% rename from src/bench/test/scala/insynth/enumeration/benchmarks/BinarySearchTreeComp.scala rename to src/bench/test/scala/scife/enumeration/benchmarks/BinarySearchTreeComp.scala index b0303a1..5672aed 100644 --- a/src/bench/test/scala/insynth/enumeration/benchmarks/BinarySearchTreeComp.scala +++ b/src/bench/test/scala/scife/enumeration/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/src/bench/test/scala/insynth/enumeration/benchmarks/ClassDAGBenchmark.scala b/src/bench/test/scala/scife/enumeration/benchmarks/ClassDAGBenchmark.scala similarity index 97% rename from src/bench/test/scala/insynth/enumeration/benchmarks/ClassDAGBenchmark.scala rename to src/bench/test/scala/scife/enumeration/benchmarks/ClassDAGBenchmark.scala index f28fe1e..0fa17e6 100644 --- a/src/bench/test/scala/insynth/enumeration/benchmarks/ClassDAGBenchmark.scala +++ b/src/bench/test/scala/scife/enumeration/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/src/bench/test/scala/insynth/enumeration/benchmarks/ClassInterfaceDAGBenchmark.scala b/src/bench/test/scala/scife/enumeration/benchmarks/ClassInterfaceDAGBenchmark.scala similarity index 98% rename from src/bench/test/scala/insynth/enumeration/benchmarks/ClassInterfaceDAGBenchmark.scala rename to src/bench/test/scala/scife/enumeration/benchmarks/ClassInterfaceDAGBenchmark.scala index 06f62b7..99e68c8 100644 --- a/src/bench/test/scala/insynth/enumeration/benchmarks/ClassInterfaceDAGBenchmark.scala +++ b/src/bench/test/scala/scife/enumeration/benchmarks/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/src/bench/test/scala/insynth/enumeration/benchmarks/DAGBenchmark.scala b/src/bench/test/scala/scife/enumeration/benchmarks/DAGBenchmark.scala similarity index 95% rename from src/bench/test/scala/insynth/enumeration/benchmarks/DAGBenchmark.scala rename to src/bench/test/scala/scife/enumeration/benchmarks/DAGBenchmark.scala index 2f221fc..edfd25a 100644 --- a/src/bench/test/scala/insynth/enumeration/benchmarks/DAGBenchmark.scala +++ b/src/bench/test/scala/scife/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/src/bench/test/scala/insynth/enumeration/benchmarks/HeapArrayBenchmark.scala b/src/bench/test/scala/scife/enumeration/benchmarks/HeapArrayBenchmark.scala similarity index 95% rename from src/bench/test/scala/insynth/enumeration/benchmarks/HeapArrayBenchmark.scala rename to src/bench/test/scala/scife/enumeration/benchmarks/HeapArrayBenchmark.scala index cc1973e..bb45699 100644 --- a/src/bench/test/scala/insynth/enumeration/benchmarks/HeapArrayBenchmark.scala +++ b/src/bench/test/scala/scife/enumeration/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/src/bench/test/scala/insynth/enumeration/benchmarks/HeapArrayBenchmark2.scala b/src/bench/test/scala/scife/enumeration/benchmarks/HeapArrayBenchmark2.scala similarity index 94% rename from src/bench/test/scala/insynth/enumeration/benchmarks/HeapArrayBenchmark2.scala rename to src/bench/test/scala/scife/enumeration/benchmarks/HeapArrayBenchmark2.scala index 97f4ae6..0b39367 100644 --- a/src/bench/test/scala/insynth/enumeration/benchmarks/HeapArrayBenchmark2.scala +++ b/src/bench/test/scala/scife/enumeration/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/src/bench/test/scala/insynth/enumeration/benchmarks/RedBlackTreeDependentBenchmark.scala b/src/bench/test/scala/scife/enumeration/benchmarks/RedBlackTreeDependentBenchmark.scala similarity index 97% rename from src/bench/test/scala/insynth/enumeration/benchmarks/RedBlackTreeDependentBenchmark.scala rename to src/bench/test/scala/scife/enumeration/benchmarks/RedBlackTreeDependentBenchmark.scala index f3048ee..915b4bd 100644 --- a/src/bench/test/scala/insynth/enumeration/benchmarks/RedBlackTreeDependentBenchmark.scala +++ b/src/bench/test/scala/scife/enumeration/benchmarks/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/src/bench/test/scala/insynth/enumeration/benchmarks/SortedListDependentBenchmark.scala b/src/bench/test/scala/scife/enumeration/benchmarks/SortedListDependentBenchmark.scala similarity index 96% rename from src/bench/test/scala/insynth/enumeration/benchmarks/SortedListDependentBenchmark.scala rename to src/bench/test/scala/scife/enumeration/benchmarks/SortedListDependentBenchmark.scala index e63b464..f1df47b 100644 --- a/src/bench/test/scala/insynth/enumeration/benchmarks/SortedListDependentBenchmark.scala +++ b/src/bench/test/scala/scife/enumeration/benchmarks/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/src/bench/test/scala/insynth/enumeration/util/CLPParser.scala b/src/bench/test/scala/scife/enumeration/util/CLPParser.scala similarity index 94% rename from src/bench/test/scala/insynth/enumeration/util/CLPParser.scala rename to src/bench/test/scala/scife/enumeration/util/CLPParser.scala index 0c64dd8..ff2aeb5 100644 --- a/src/bench/test/scala/insynth/enumeration/util/CLPParser.scala +++ b/src/bench/test/scala/scife/enumeration/util/CLPParser.scala @@ -1,4 +1,4 @@ -package insynth.enumeration.benchmarks +package scife.enumeration.benchmarks import org.scalameter._ diff --git a/src/bench/test/scala/insynth/enumeration/util/KoratParser.scala b/src/bench/test/scala/scife/enumeration/util/KoratParser.scala similarity index 95% rename from src/bench/test/scala/insynth/enumeration/util/KoratParser.scala rename to src/bench/test/scala/scife/enumeration/util/KoratParser.scala index d517ac1..5c52fa3 100644 --- a/src/bench/test/scala/insynth/enumeration/util/KoratParser.scala +++ b/src/bench/test/scala/scife/enumeration/util/KoratParser.scala @@ -1,4 +1,4 @@ -package insynth.enumeration.benchmarks +package scife.enumeration.benchmarks import org.scalameter._ diff --git a/src/bench/test/scala/insynth/enumeration/util/Reporter.scala b/src/bench/test/scala/scife/enumeration/util/Reporter.scala similarity index 97% rename from src/bench/test/scala/insynth/enumeration/util/Reporter.scala rename to src/bench/test/scala/scife/enumeration/util/Reporter.scala index 2d99ca5..f108e66 100644 --- a/src/bench/test/scala/insynth/enumeration/util/Reporter.scala +++ b/src/bench/test/scala/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 deleted file mode 100644 index d7d574f..0000000 --- a/src/main/scala/insynth/Solver.scala +++ /dev/null @@ -1,73 +0,0 @@ -package insynth - -import insynth.load._ -import insynth.engine._ -import insynth.query._ -import insynth.engine.scheduler.WeightScheduler -import insynth.structures.ContainerNode - -import insynth.util.TimeOut -import insynth.util.logging.HasLogger -import insynth.util.format.TreePrinter - -/** - * Main class for the synthesis process invocation - * @param program Leon program object that contains the hole - * @param hole hole in the program on which the synthesis is called - */ -class Solver(declarations: List[Declaration], queryBuilder: QueryBuilder, timeOut: Int = 500) extends HasLogger { - - def this(loader: Loader, queryBuilder: QueryBuilder) = this(loader.load, queryBuilder) - - fine("declarations given to InSynth constructor:\n" + declarations.mkString("\n")) - - // create a new builder - val initialBuilder = new InitialEnvironmentBuilder(declarations) - - // store all declarations in a field - val allDeclarations: List[Declaration] = initialBuilder.getAllDeclarations - - // construct query for the given synthesis instance - val query = queryBuilder.getQuery - - // builder updated after each synthesis - var currentBuilder = initialBuilder - - /** - * @param builder instance used in the engine search - * @return container node representing the proof tree - */ - def getProofTree(builder: InitialEnvironmentBuilder): ContainerNode = { - info("all declarations saved, size: " + allDeclarations.size) - finer("declarations seen:\n" + builder.getAllDeclarations.mkString("\n")) - - // create the engine - val engine = new Engine(builder, query, new WeightScheduler(), TimeOut(timeOut)) - // measure time - val time = System.currentTimeMillis - // run the engine - val solution = engine.run() - - if (solution != null) { - info("Solution found in " + (System.currentTimeMillis - time) + " ms.") - finest("Solution found: " + TreePrinter(solution, 3)) - } else - info("No solution found in " + (System.currentTimeMillis - time) + " ms") - - currentBuilder = builder - - solution - } - - /** - * @return container node representing the proof tree - */ - def getProofTree: ContainerNode = { - finer("initialBuilder.getAllDeclarations.size: " + initialBuilder.getAllDeclarations.size) - finer("initialBuilder.clone.getAllDeclarations.size: " + initialBuilder.clone.getAllDeclarations.size) - - // call on new identical builder, with same declarations - getProofTree(initialBuilder.clone) - } - -} \ No newline at end of file diff --git a/src/main/scala/insynth/engine/Cluster.scala b/src/main/scala/insynth/engine/Cluster.scala deleted file mode 100644 index d22649f..0000000 --- a/src/main/scala/insynth/engine/Cluster.scala +++ /dev/null @@ -1,27 +0,0 @@ -package insynth.engine - -import insynth.structures.{ SuccinctType => Type } - -abstract class Cluster(tpe:Type) { - assert(tpe != null) - - protected var tas = List.empty[TypeAssignment] - - def getType = tpe - - def getTypeAssignments:List[TypeAssignment] - - def addTypeAssignment(ta:TypeAssignment) { tas = ta :: tas} -} - -class InitialCluster(tpe:Type) extends Cluster(tpe) { - - override def getTypeAssignments = tas -} - -class DeltaCluster(tpe:Type, parent:Cluster) extends Cluster(tpe) { - assert(parent != null) - - override def getTypeAssignments = parent.getTypeAssignments ::: tas - -} \ No newline at end of file diff --git a/src/main/scala/insynth/engine/Engine.scala b/src/main/scala/insynth/engine/Engine.scala deleted file mode 100644 index 9741342..0000000 --- a/src/main/scala/insynth/engine/Engine.scala +++ /dev/null @@ -1,37 +0,0 @@ -package insynth.engine - -import insynth.engine.scheduler.Scheduler -import insynth.structures.{ SuccinctType => Type } -import insynth.query.Query - -import insynth.util.TimeOut -import insynth.util.logging.HasLogger - -class Engine(builder:InitialEnvironmentBuilder, query: Query, scheduler:Scheduler, timeout:TimeOut) extends HasLogger { - assert(builder != null && query != null && scheduler != null && timeout != null) - - def run() = { - info("engine run on query: " + query) - - //Adding query decl to the env - builder.addDeclaration(query.getDeclaration) - - //Create request pool - val requests = new Requests() - - //Register Scheduler as a listener of the request pool - requests.registerListener(scheduler) - - //Initiate first request, that will find query decl and put it into Scheduler - requests.addSender(query.getReturnType, builder.produceEnvirionment, query.getSender) - - timeout.start() - while(!timeout.hasExpired() && !scheduler.hasFinished()){ - var ta = scheduler.next() - ta.processRequests(requests) - } - - query.getSolution - } -} - diff --git a/src/main/scala/insynth/engine/Environment.scala b/src/main/scala/insynth/engine/Environment.scala deleted file mode 100644 index 9a6bee8..0000000 --- a/src/main/scala/insynth/engine/Environment.scala +++ /dev/null @@ -1,150 +0,0 @@ -package insynth.engine - -import insynth.structures.{ SuccinctType => Type } -import insynth.engine.scheduler.Scheduler - -abstract class Environment { - - protected var clusters = Map.empty[Type, Cluster] - - def getCluster(tpe:Type) = { - clusters.get(tpe) match { - case Some(cluster) => cluster - case None => null - } - } - - def addCluster(cluster:Cluster) { - assert(cluster != null) - clusters += (cluster.getType -> cluster) - } - - def addTypeAssignment(ta:TypeAssignment) - - def getTypeAssignments(tpe:Type):List[TypeAssignment] - - def getTypeSet:Set[Type] - - def getClusters = clusters - - def getParent:Environment - - final private def copy(newEnv: Environment) { - newEnv.clusters = Map.empty[Type, Cluster] - newEnv.clusters ++= clusters - } - - override protected def clone = { - val newEnvironment = super.clone.asInstanceOf[Environment] - copy(newEnvironment) - newEnvironment - } - -} - -class InitialEnvironment extends Environment with Cloneable { - - override def addTypeAssignment(ta:TypeAssignment) { - val tpe = ta.getReturnType - val cluster = this.getCluster(tpe) - if(cluster != null){ - cluster.addTypeAssignment(ta) - } else { - val newCluster = new InitialCluster(tpe) - newCluster.addTypeAssignment(ta) - this.addCluster(newCluster) - } - } - - override def getTypeAssignments(tpe:Type) = { - val cluster = this.getCluster(tpe) - if (cluster != null) cluster.getTypeAssignments - else List.empty[TypeAssignment] - } - - override def getTypeSet = Set.empty[Type] - - override def getParent = null - - def getAllDeclarations = clusters.values.toList.map(cluster => cluster.getTypeAssignments.map(ta => ta.getDeclarations).flatten).flatten - - override def clone = { - super.clone.asInstanceOf[InitialEnvironment] - } -} - -class DeltaEnvironment(parent: Environment) extends Environment with Cloneable { - assert(parent != null) - - private var typeSet = parent.getTypeSet - - override def addTypeAssignment(ta:TypeAssignment) { - val tpe = ta.getType - if (!typeSet.contains(tpe)){ - typeSet += tpe - - val retType = ta.getReturnType - - //get a cluster from a child - val cluster = this.getCluster(retType) - if(cluster != null){ - cluster.addTypeAssignment(ta) - } else { - - //get a cluster from a parent - val parentCluster = parent.getCluster(retType) - - //anyways create new cluster that may or may not point to the parent cluster - val newCluster = if (parentCluster != null) new DeltaCluster(retType, parentCluster) - else new InitialCluster(retType) - - //add new cluster - this.addCluster(newCluster) - newCluster.addTypeAssignment(ta) - } - } - } - - override def getParent = parent - - override def getTypeSet = typeSet - - //TODO: Think about better design and solution - override def getTypeAssignments(tpe:Type) = { - var cluster = this.getCluster(tpe) - var parent = this.getParent - while(parent != null && cluster == null) { - cluster = parent.getCluster(tpe) - parent = parent.getParent - } - - if (cluster != null) { - cluster.getTypeAssignments - } else List.empty[TypeAssignment] - } - - final private def copy(newDeltaEnvironment: DeltaEnvironment) { - newDeltaEnvironment.typeSet = Set.empty - newDeltaEnvironment.typeSet ++= typeSet - } - - override def clone = { - val newDeltaEnvironment = super.clone.asInstanceOf[DeltaEnvironment] - copy(newDeltaEnvironment) - newDeltaEnvironment - } - -/* Old - override def getTypeAssignments(tpe:Type) = { - val cluster = this.getCluster(tpe) - if (cluster != null) { - cluster.getTypeAssignments - } else { - val parentCluster = parent.getCluster(tpe) - if (parentCluster != null) { - parentCluster.getTypeAssignments - } else List.empty[TypeAssignment] - } - } -*/ -} \ No newline at end of file diff --git a/src/main/scala/insynth/engine/EnvironmentBuilder.scala b/src/main/scala/insynth/engine/EnvironmentBuilder.scala deleted file mode 100644 index d485260..0000000 --- a/src/main/scala/insynth/engine/EnvironmentBuilder.scala +++ /dev/null @@ -1,98 +0,0 @@ -package insynth.engine - -import insynth.structures.{ SuccinctType => Type, TSet } -import insynth.load.Declaration -import insynth.engine.scheduler.Scheduler - -abstract class EnvironmentBuilder { - - private var taMap = Map.empty[Type, TypeAssignment] - -// def addDeclaration(name: String, scalaType: DomainType) { -// addDeclaration(new Declaration(name, TypeTransformer(scalaType), scalaType)) -// } - - def addDeclarations(decls: Seq[Declaration]){ - decls.foreach(addDeclaration) - } - - def addDeclaration(decl:Declaration) { - val tpe = decl.getType - - taMap.get(tpe) match { - case Some(ta) => - ta.addDeclaration(decl) - case None => { - val ta = new TypeAssignment(decl.getType) - ta.addDeclaration(decl) - getEnv.addTypeAssignment(ta) - taMap += (tpe -> ta) - } - } - } - - protected def getEnv:Environment - - def produceEnvirionment:Environment - - final private def copy(newEnvironmentBuilder: EnvironmentBuilder) { - newEnvironmentBuilder.taMap = Map.empty - newEnvironmentBuilder.taMap ++= taMap - } - - override protected def clone = { - val newEnvironmentBuilder = super.clone.asInstanceOf[EnvironmentBuilder] - copy(newEnvironmentBuilder) - newEnvironmentBuilder - } - -} - -class InitialEnvironmentBuilder extends EnvironmentBuilder with Cloneable { - - def this(initialDecls: List[Declaration]) = { - this() - addDeclarations(initialDecls) - } - - // this needs to be var (yes, cloning is very bad approach) - private var env = new InitialEnvironment() - - override protected def getEnv = env - - override def produceEnvirionment = env - - def getAllDeclarations = env.getAllDeclarations - - private final def copy(newInitialEnvironmentBuilder: InitialEnvironmentBuilder) { - newInitialEnvironmentBuilder.env = env.clone.asInstanceOf[InitialEnvironment] - } - - override def clone = { - val newEnvironmentBuilder = super.clone.asInstanceOf[InitialEnvironmentBuilder] - copy(newEnvironmentBuilder) - newEnvironmentBuilder - } - -} - -class DeltaEnvironmentBuilder(parent: Environment) extends EnvironmentBuilder with Cloneable { - - private val env = new DeltaEnvironment(parent) - - def create(set: TSet) { - set.content.foreach{ - tpe => //this.addDeclaration(DeclarationFactory.makeAbstractDeclaration(tpe)) - throw new RuntimeException("Fix this") - } - } - - override protected def getEnv = env - - override def produceEnvirionment = if (!env.getTypeSet.equals(parent.getTypeSet)) env else parent - - override def clone = { - super.clone.asInstanceOf[DeltaEnvironmentBuilder] - } - -} \ No newline at end of file diff --git a/src/main/scala/insynth/engine/Properties.scala b/src/main/scala/insynth/engine/Properties.scala deleted file mode 100644 index 098bdfb..0000000 --- a/src/main/scala/insynth/engine/Properties.scala +++ /dev/null @@ -1,21 +0,0 @@ -package insynth.engine - -import insynth.structures.Weight._ - -class Properties { - private var active = false - - def isActive = active - def activate(){active = true} - def deactivate(){active = false} - - private var minWeight: Weight = globalMinWeight - - def getMinWeight = minWeight - - def setMinWeight(weight: Weight){ - if (minWeight > weight) minWeight = weight - } - //TODO: We can speed up the search by not sending queries to the other 'params' if at least one of them can not fulfill the request - //TODO: This raises the question of 'negative answer propagation' -} \ No newline at end of file diff --git a/src/main/scala/insynth/engine/Requests.scala b/src/main/scala/insynth/engine/Requests.scala deleted file mode 100644 index c9c858e..0000000 --- a/src/main/scala/insynth/engine/Requests.scala +++ /dev/null @@ -1,177 +0,0 @@ -package insynth.engine - -import insynth.structures.{ SuccinctType => Type, _ } -import scheduler.ListenerHolder -import scheduler.Subject -import insynth.load.Declaration - -class Requests extends ListenerHolder { - - private var clusters = Map.empty[Type, RequestCluster] - - def addSender(returnType:Type, env: Environment, sender:Sender){ - clusters.get(returnType) match { - case None => - val cluster = new RequestCluster(returnType) - - cluster.registerAllListener(listeners) - - cluster.addSender(env, sender) - clusters += (returnType -> cluster) - case Some(cluster) => - cluster.addSender(env, sender) - } - } - - def getCluster(returnType:Type) = clusters.get(returnType) - -} - -class RequestCluster(returnType:Type) extends Subject { - assert(returnType != null) - - private var requests = Map.empty[Environment, Request] - - def addSender(env:Environment, sender:Sender){ - requests.get(env) match { - case None => - val request = new Request(env) - request.addSender(sender) - requests += (env -> request) - - //putting request in tas queues - val tas = env.getTypeAssignments(returnType) - - //notify Listener - this.notifyListeners(tas) - - tas.foreach(_.addRequest(request)) - case Some(request) => - request.addSender(sender) - } - } - - def getRequest(env:Environment) = requests.get(env) -} - -/** - * 'requestType' is the most important here. It is the type that we are searching for. - * 'senderType' is that type of the parameter that initiated the request. It is also the same as the type of the cluster that holds requests. - */ -class Request(env:Environment) { - assert(env != null) - - private var senders = Set.empty[Sender] - private var answers:ContainerNode = null - - def addAnswer(answer:SimpleNode) { - if (answers == null){ - answers = new ContainerNode(scala.collection.mutable.Set.empty) - answers.addNode(answer) - //Update senders - updateSenders() - } else { - answers.addNode(answer) - } - } - - private def updateSenders() { - senders.foreach(updateSender) - } - - private def updateSender(sender:Sender) { - sender.update(answers) - } - - def addSender(sender:Sender) { - senders += sender - if (answers != null) { - //updating the new sender - updateSender(sender) - } - } - - def getEnv = env - - def getAnswers = answers - - def getSenders = senders.toList - - /* - override def hashCode() = env.hashCode ^ 2324334 - - override def equals(that:Any) = { - if (that == null || !that.isInstanceOf[Request]) false - else { - val request = that.asInstanceOf[Request] - this.env.equals(request.getEnv) - } - } - */ -} - -class Sender(rc:RequestContainer, paramType:Type) { - def update(answers:ContainerNode){ - rc.addAnswer(paramType, answers) - } -} - -class InitialSender extends Sender(null, null) { - private var answers:ContainerNode = null - - override def update(answers:ContainerNode) { - this.answers = answers - } - - def getAnswers = answers -} - -class RequestContainer(request:Request, decls:List[Declaration], paramTypes:List[Type]) { - - //TODO: Delete. We probably don't need this flag any more. - //The reason is that Container is notified at most n times, where n is paramTypes.lenght - private var answerPropagated:Boolean = false - - private var answers = scala.collection.mutable.Map.empty[Type, ContainerNode] - - tryToPropagateAnswer() - - def addAnswer(paramType:Type, answer:ContainerNode) { - if (answers.contains(paramType)) - throw new Exception("Answers already contian an answer at: "+paramType+" in "+this.getClass.getName) - else answers += (paramType -> answer) - - tryToPropagateAnswer() - } - - private def tryToPropagateAnswer() { - if(!answerPropagated && fullyAnswerd){ - //Debug("In RequestContainer.tryToPropagateAnswer: ", decls(0)) - - request.addAnswer(new SimpleNode(decls, answers)) - answerPropagated = true - } - } - - def sendRequests(requests:Requests) { - val oldEnv = request.getEnv - - //Debug("In RequestContainer.sendRequests: ", decls(0)) - - paramTypes.foreach { - paramType => - val builder = new DeltaEnvironmentBuilder(oldEnv) - builder.create(Type.paramSetType(paramType)) - val newEnv = builder.produceEnvirionment - - //Debug("SentType: ", Type.returnType(paramType)) - //Debug("SentEnv: "+newEnv) - requests.addSender(Type.returnType(paramType), newEnv, new Sender(this, paramType)) - } - } - - def isAnswerPropagated = answerPropagated - - def fullyAnswerd = answers.size == paramTypes.length - -} \ No newline at end of file diff --git a/src/main/scala/insynth/engine/TypeAssignment.scala b/src/main/scala/insynth/engine/TypeAssignment.scala deleted file mode 100644 index 3934156..0000000 --- a/src/main/scala/insynth/engine/TypeAssignment.scala +++ /dev/null @@ -1,54 +0,0 @@ -package insynth.engine - -import insynth.structures.{ SuccinctType => Type } -import insynth.load.Declaration - -class TypeAssignment(tpe:Type) { - assert(tpe != null) - - private val paramTypes:List[Type] = Type.paramTypes(tpe) - private val returnType:Type = Type.returnType(tpe) - - private var decls = List.empty[Declaration] - - private var workingRequests = List.empty[RequestContainer] - private var newRequests = List.empty[Request] - - /* - * Properties like: - * (1) the distance form the main query - * (2) type properties (polymorphic, how many arguments, function) - * (3) how many new/processed queries do we have - * (4) weight - */ - private var properties:Properties = new Properties() - - def getProperties = properties - - def getType = tpe - - def addDeclaration(decl: Declaration) { - decls = decl :: decls - properties.setMinWeight(decl.getWeight) - } - - def addRequest(request:Request) { - newRequests = request :: newRequests - } - - def processRequests(requests: Requests) { - - val containerRequests = newRequests.map(new RequestContainer(_, decls, paramTypes)) - - containerRequests.foreach { - _.sendRequests(requests) - } - - newRequests = Nil - workingRequests :::= containerRequests - } - - def getDeclarations = decls - - def getReturnType = returnType -} \ No newline at end of file diff --git a/src/main/scala/insynth/engine/scheduler/Listener.scala b/src/main/scala/insynth/engine/scheduler/Listener.scala deleted file mode 100644 index 90b0c77..0000000 --- a/src/main/scala/insynth/engine/scheduler/Listener.scala +++ /dev/null @@ -1,14 +0,0 @@ -package insynth.engine.scheduler - -import insynth.engine.TypeAssignment - -trait Listener { - - //notifies listener when TAs are updated - def notify(tas:List[TypeAssignment]){ - tas.foreach(notify) - } - - //notifies listener when TA is updated - def notify(ta:TypeAssignment) -} \ No newline at end of file diff --git a/src/main/scala/insynth/engine/scheduler/Scheduler.scala b/src/main/scala/insynth/engine/scheduler/Scheduler.scala deleted file mode 100644 index e1376ad..0000000 --- a/src/main/scala/insynth/engine/scheduler/Scheduler.scala +++ /dev/null @@ -1,73 +0,0 @@ -package insynth.engine.scheduler - -import insynth.engine.TypeAssignment -import insynth.engine.Environment - -import scala.collection.mutable.Queue -import scala.collection.mutable.PriorityQueue - -trait Scheduler extends Listener { - - def hasFinished():Boolean - - def add(ta:TypeAssignment) - - def next():TypeAssignment - -} - -class BFSScheduler extends Scheduler { - - private var queue = Queue.empty[TypeAssignment] - - def hasFinished():Boolean = queue.isEmpty - - def add(ta:TypeAssignment){ - val active = ta.getProperties.isActive - if (!active) { - ta.getProperties.activate() - queue.enqueue(ta) - } - } - - def next():TypeAssignment = { - val ta = queue.dequeue() - ta.getProperties.deactivate() - ta - } - - def notify(ta:TypeAssignment){ - val properties = ta.getProperties - if (!properties.isActive) add(ta) - } -} - -class WeightScheduler extends Scheduler { - - private var pq = new PriorityQueue[TypeAssignment]()(new Weighting()) - - def hasFinished():Boolean = pq.isEmpty - - def add(ta:TypeAssignment){ - val active = ta.getProperties.isActive - if (!active) { - ta.getProperties.activate() - pq.enqueue(ta) - } - } - - def next():TypeAssignment = { - val ta = pq.dequeue() - ta.getProperties.deactivate() - ta - } - - def notify(ta:TypeAssignment){ - val properties = ta.getProperties - if (!properties.isActive) add(ta) - } - - class Weighting[T <: TypeAssignment] extends Ordering[T] { - def compare(x: T, y: T): Int = y.getProperties.getMinWeight.compare(x.getProperties.getMinWeight) - } -} \ No newline at end of file diff --git a/src/main/scala/insynth/engine/scheduler/Subject.scala b/src/main/scala/insynth/engine/scheduler/Subject.scala deleted file mode 100644 index a914f36..0000000 --- a/src/main/scala/insynth/engine/scheduler/Subject.scala +++ /dev/null @@ -1,25 +0,0 @@ -package insynth.engine.scheduler - -import insynth.engine.TypeAssignment - -abstract class Subject extends ListenerHolder { - - def notifyListeners(tas:List[TypeAssignment]){ - listeners.foreach(_.notify(tas)) - } - -} - - -//Still all listeners must register before the synthesis starts -abstract class ListenerHolder { - - protected var listeners = Set.empty[Listener] - - def registerAllListener(listeners:Set[Listener]) { this.listeners ++= listeners} - - def registerListener(listener:Listener) { listeners += listener} - - def unregisterListener(listener:Listener) {listeners -= listener} - -} \ No newline at end of file diff --git a/src/main/scala/insynth/load/Declaration.scala b/src/main/scala/insynth/load/Declaration.scala deleted file mode 100644 index 0f2ba12..0000000 --- a/src/main/scala/insynth/load/Declaration.scala +++ /dev/null @@ -1,25 +0,0 @@ -package insynth.load - -import insynth.structures.{ SuccinctType => Type, _ } -import insynth.structures.Weight._ - -abstract class Declaration(val inSynthType: Type, val weight: Weight) { - - private var query = false - - def getWeight = weight - //def setWeight(weight:Weight) { this.weight = weight } - - def isQuery = query - def setQuery(query: Boolean) = { - this.query = query - this - } - - def getType = inSynthType - - def getSimpleName: String - - def getDomainType: DomainType - -} \ No newline at end of file diff --git a/src/main/scala/insynth/load/Loader.scala b/src/main/scala/insynth/load/Loader.scala deleted file mode 100644 index 7214ba3..0000000 --- a/src/main/scala/insynth/load/Loader.scala +++ /dev/null @@ -1,7 +0,0 @@ -package insynth.load - -trait Loader { - - def load: List[Declaration] - -} \ No newline at end of file diff --git a/src/main/scala/insynth/query/Query.scala b/src/main/scala/insynth/query/Query.scala deleted file mode 100644 index d573429..0000000 --- a/src/main/scala/insynth/query/Query.scala +++ /dev/null @@ -1,18 +0,0 @@ -package insynth.query - -import insynth.engine.Sender -import insynth.structures.ContainerNode -import insynth.structures.SuccinctType -import insynth.load.Declaration - -abstract class Query(val inSynthRetType: SuccinctType) { - - def getSolution: ContainerNode - - def getDeclaration: Declaration - - def getReturnType = inSynthRetType - - def getSender: Sender - -} \ No newline at end of file diff --git a/src/main/scala/insynth/query/QueryBuilder.scala b/src/main/scala/insynth/query/QueryBuilder.scala deleted file mode 100644 index 6bc3a5d..0000000 --- a/src/main/scala/insynth/query/QueryBuilder.scala +++ /dev/null @@ -1,14 +0,0 @@ -package insynth -package query - -import insynth.structures._ - -abstract class QueryBuilder(protected val tpe: SuccinctType) { - require(tpe != null) - - val succinctReturnType = BottomType - val succinctType = Arrow(TSet(tpe), succinctReturnType) - - def getQuery: Query - -} \ No newline at end of file diff --git a/src/main/scala/insynth/structures/DomainType.scala b/src/main/scala/insynth/structures/DomainType.scala deleted file mode 100644 index 2ece98a..0000000 --- a/src/main/scala/insynth/structures/DomainType.scala +++ /dev/null @@ -1,38 +0,0 @@ -package insynth.structures - -// enable implicit conversions -import scala.language.implicitConversions -// enable postfix operators -import scala.language.postfixOps - -/** - * DomainType is here so that early reconstruction phases know - * the structure of types without the need to know the actual - * type - */ -sealed abstract class DomainType { - def toSuccinctType = DomainType.toSuccinctType(this) -} - -case class Atom(st: SuccinctType) extends DomainType -case class Function(args: List[DomainType], retType: DomainType) extends DomainType - -object DomainType { - - def toSuccinctType(domainType: DomainType): SuccinctType = { - implicit def singletonList(x: SuccinctType) = List(x) - - domainType match { - case Atom(st) => st - case Function(froms, to) => transformFunction(to, froms) - } - } - - private def transformFunction(fun: DomainType, params: List[DomainType]): SuccinctType = fun match { - case Function(froms, to) => - transformFunction(to, params ++ froms) - case Atom(st) => - Arrow( TSet(params map this.toSuccinctType distinct), st ) - } - -} \ No newline at end of file diff --git a/src/main/scala/insynth/structures/ProofTrees.scala b/src/main/scala/insynth/structures/ProofTrees.scala deleted file mode 100644 index daa1b1d..0000000 --- a/src/main/scala/insynth/structures/ProofTrees.scala +++ /dev/null @@ -1,27 +0,0 @@ -package insynth.structures - -import insynth.structures.{ SuccinctType => Type } -import insynth.load.Declaration - -import scala.collection.mutable.{ Set, Map } - -trait Node - -class SimpleNode(decls:List[Declaration], params:Map[Type, ContainerNode]) extends Node { - def getDecls = decls - def getParams = params -} - -/** - * container for tree nodes - */ -class ContainerNode(var nodes: Set[SimpleNode]) extends Node { - - def this() = this(Set.empty) - - def addNode(node:SimpleNode){ - nodes += node - } - - def getNodes = nodes -} \ No newline at end of file diff --git a/src/main/scala/insynth/structures/SuccinctType.scala b/src/main/scala/insynth/structures/SuccinctType.scala deleted file mode 100644 index 9b7862d..0000000 --- a/src/main/scala/insynth/structures/SuccinctType.scala +++ /dev/null @@ -1,110 +0,0 @@ -package insynth.structures - -import insynth.util.format.FormatSuccinctType - -sealed abstract class SuccinctType { - override def toString = FormatSuccinctType(this).toString -} - -object BottomType extends SuccinctType - -//--------------------------------------------------- Ground Types ----------------------------------------------------------// - -case class Const(val name: String) extends SuccinctType -case class Instance(val name: String, val t: List[SuccinctType]) extends SuccinctType -case class Arrow(val paramType:TSet, val returnType:SuccinctType) extends SuccinctType - -// TODO: Maybe find better representation -case class TSet(val list:List[SuccinctType]) extends SuccinctType { - - def this() = this(Nil) - - private var hashCodeValue:Int = list.map(x => x.hashCode >>> 4).foldLeft(2482783)( _+_) ^ 23821 - - override def equals(that:Any) = { - if (that == null || !that.isInstanceOf[TSet]) false - else { - val tpe = that.asInstanceOf[TSet] - TSet.equals(this, tpe) - } - } - - override def hashCode() = hashCodeValue - - def subsetOf(tpe:TSet) = { - if (tpe == null) false - else { - TSet.subsetOf(this,tpe) - } - } - - def minus(tpe1: TSet) = TSet.minus(this, tpe1) - - def union(tpe1: TSet) = TSet.union(this, tpe1) - - def contains(tpe1: SuccinctType) = list.contains(tpe1) - - def content = list - -} - -object TSet { - - val empty = new TSet() - - def apply(tpe: SuccinctType*) = new TSet(tpe.toList) - - def equals(tpe1:TSet, tpe2:TSet) = { - val length1 = tpe1.list.length - val length2 = tpe2.list.length - - if (length1 != length2) false - else { - tpe1.list.forall(x => tpe2.list.contains(x)) - } - } - - def subsetOf(tpe1:TSet, tpe2:TSet) = { - val length1 = tpe1.list.length - val length2 = tpe2.list.length - - if (length1 > length2) false - else { - tpe1.list.forall(x => tpe2.list.contains(x)) - } - } - - def union(tpe1:TSet, tpe2:TSet) = TSet(tpe1.list ::: tpe2.list.filterNot(tpe1.list.contains)) - - def minus(tpe1:TSet, tpe2:TSet) = TSet(tpe1.list.filterNot(tpe2.list.contains)) - -} - -object SuccinctType { - - def returnType(tpe: SuccinctType) = tpe match { - case Arrow(_,returnType) => returnType - case IArrow(_,returnType) => returnType - case t => t - } - - def paramTypes(tpe: SuccinctType) = tpe match { - case Arrow(params,_) => params.content - case IArrow(params,_) => params.content - case _ => Nil - } - - def paramSetType(tpe: SuccinctType) = tpe match { - case Arrow(params,_) => params - case IArrow(params,_) => params - case _ => TSet.empty - } -} - -//------------------------------------------------ Polymorphic Types --------------------------------------------------------// - -case class Variable(val name:String) extends SuccinctType - -//-------------------------------------------- Inheritance Function Types ---------------------------------------------------// - -case class IArrow(val subclass:TSet, val superclass: SuccinctType) extends SuccinctType \ No newline at end of file diff --git a/src/main/scala/insynth/structures/Weight.scala b/src/main/scala/insynth/structures/Weight.scala deleted file mode 100644 index 515b6eb..0000000 --- a/src/main/scala/insynth/structures/Weight.scala +++ /dev/null @@ -1,8 +0,0 @@ -package insynth.structures - -object Weight { - type Weight = Float - - val globalMinWeight = Float.MinValue - val globalMaxWeight = Float.MaxValue -} \ No newline at end of file diff --git a/src/main/scala/insynth/util/TreeOperations.scala b/src/main/scala/insynth/util/TreeOperations.scala deleted file mode 100644 index 47906b6..0000000 --- a/src/main/scala/insynth/util/TreeOperations.scala +++ /dev/null @@ -1,110 +0,0 @@ -package insynth.util - -import java.io._ - -object ProofTreeOperations { - import insynth.structures._ - - def size(n: Node): Int = size(n, Set()) - - private def size(n: Node, visited: Set[Node]): Int = { - if (visited contains n) - 0 - else n match { - case sn: SimpleNode => - sn.getDecls.size + (0 /: sn.getParams) { - (res, pair) => res + size(pair._2, visited + n) - } - case cn: ContainerNode => - (0 /: cn.getNodes) { - (res, node) => res + size(node, visited + n) - } - } - } - - case class StringNode(name: String, nodes: Set[StringNode] = Set()) - - def checkInhabitants(cn: ContainerNode, names: StringNode): Boolean = { - (for (outerInnerNode <- cn.getNodes; innerContainer <- outerInnerNode.getParams.values; - innerNodes = innerContainer.getNodes; innerNode <- innerNodes) - yield - checkInhabitants(innerNode, names) - ).reduce(_ || _) - } - - def checkInhabitants(sn: SimpleNode, names: StringNode): Boolean = { - val visibleNames = - for (decl <- sn.getDecls) - yield decl.getSimpleName - - names match { - case StringNode(currentName, set) if !set.isEmpty => - if (visibleNames contains currentName) - (for (innerStringNode <- set) - yield - (for (innerContainer <- sn.getParams.values; innerNodes = innerContainer.getNodes; - innerNode <- innerNodes) - yield - checkInhabitants(innerNode, innerStringNode) - ).reduce(_ || _) - ).reduce(_ && _) - else - false - case StringNode(currentName, _) => - visibleNames contains currentName - } - } - - def getSubtrees(sn: SimpleNode, names: StringNode): Set[SimpleNode] = { - val visibleNames = - for (decl <- sn.getDecls) - yield decl.getSimpleName - - if (visibleNames contains names.name) { - if (!names.nodes.isEmpty) - (for (innerStringNode <- names.nodes) - yield - (for (innerContainer <- sn.getParams.values; innerNodes = innerContainer.getNodes; - innerNode <- innerNodes) - yield - getSubtrees(innerNode, innerStringNode) - ).reduce(_ | _) - ).reduce(_ | _) - else - Set(sn) - } - else Set.empty - } - - def breadthFirstSearchPrint(sn: SimpleNode): String = { - val stringWriter = new StringWriter - breadthFirstSearchPrint(sn, new PrintWriter(stringWriter, true)) - stringWriter.getBuffer.toString - } - - def breadthFirstSearchPrint(sn: SimpleNode, out: PrintWriter) = { - var visited: Set[SimpleNode] = Set.empty - var currentList: List[SimpleNode] = List.empty - var nextLevelList: List[SimpleNode] = List(sn) - - var level = -1 - - while (!nextLevelList.isEmpty) { - level += 1 - currentList = nextLevelList - nextLevelList = List.empty - - for (node <- currentList; decl <- node.getDecls) { - visited += node - - for (_ <- 0 to level) out.print(' ') - out.println(decl.toString) - } - - for (node <- currentList; (tpe, cn) <- node.getParams; - innerNode <- cn.getNodes; if ! (visited contains innerNode)) { - nextLevelList +:= innerNode - } - } - } -} \ No newline at end of file diff --git a/src/main/scala/insynth/util/format/FormatSuccinctNode.scala b/src/main/scala/insynth/util/format/FormatSuccinctNode.scala deleted file mode 100644 index 3b0f0c8..0000000 --- a/src/main/scala/insynth/util/format/FormatSuccinctNode.scala +++ /dev/null @@ -1,49 +0,0 @@ -package insynth.util.format - -import scala.text.Document._ - -import insynth.structures._ -import insynth.load.Declaration - -case class FormatSuccinctNode(node: Node, levels: Int = -1) extends Formatable { - override def toDocument = toDocument(node, Set.empty, 0) - - def toDocument(node: Node, visited: Set[Node], level: Int): scala.text.Document = { - import FormatHelpers._ - import FormatSuccinctType.succinctTypeToDocument - - val simple = levels == level - - if (!simple) - node match { - case sn:SimpleNode => - "SimpleNode" :: nestedBrackets( - "decls: " :/: nestedBrackets(seqToDoc(sn.getDecls, ",", { d: Declaration => strToDoc(d.toString) })) - :/: - "params: " :: break :: seqToDoc(sn.getParams.toList, ",", - { - p:(SuccinctType, ContainerNode) => p._1 :: "->" :: - nestedBrackets(toDocument(p._2, visited + node, level + 1)) - } - ) - ) - case cn:ContainerNode => - nestedBrackets(seqToDoc(cn.getNodes.toList, ",", - { sn:SimpleNode => - if (visited contains sn) - "already visited (" :: sn.getDecls.head.toString :: ")" - else - toDocument(sn, visited, level + 1) - } - )) - } - - else - node match { - case sn:SimpleNode => - "SimpleNode*" :: paren(sn.getDecls.head.toString) - case cn:ContainerNode => - "Container*" :: paren(cn.getNodes.size) - } - } -} \ No newline at end of file diff --git a/src/main/scala/insynth/util/format/FormatSuccinctType.scala b/src/main/scala/insynth/util/format/FormatSuccinctType.scala deleted file mode 100644 index 4cb5ab9..0000000 --- a/src/main/scala/insynth/util/format/FormatSuccinctType.scala +++ /dev/null @@ -1,32 +0,0 @@ -package insynth.util.format - -import scala.text.Document._ - -import insynth.structures._ - -// enable implicit conversions -import scala.language.implicitConversions - -class FormatSuccinctType(tpe: SuccinctType) extends Formatable { - import insynth.util.format.FormatHelpers._ - - override def toDocument = toDocument(tpe) - - def toDocument(tpe: SuccinctType): scala.text.Document = { - tpe match { - case Const(name) => name - case Arrow(TSet(paramList), returnType) => - paren(seqToDoc(paramList, ",", toDocument(_: SuccinctType))) :: "→" :: toDocument(returnType) - case BottomType => "⊥" - case Instance(name, list) => name :: "[" :: seqToDoc(list, ",", toDocument(_: SuccinctType)) :: "]" - case _ => throw new UnsupportedOperationException - } - } - -} - -object FormatSuccinctType { - def apply(tpe: SuccinctType) = new FormatSuccinctType(tpe) - - implicit def succinctTypeToDocument(tpe: SuccinctType) = FormatSuccinctType(tpe).toDocument -} \ No newline at end of file diff --git a/src/main/scala/insynth/util/format/TreePrinter.scala b/src/main/scala/insynth/util/format/TreePrinter.scala deleted file mode 100644 index 45a265a..0000000 --- a/src/main/scala/insynth/util/format/TreePrinter.scala +++ /dev/null @@ -1,219 +0,0 @@ -package insynth.util.format - -import insynth.structures.{ ContainerNode, SimpleNode } -import insynth.load.Declaration -import java.io.PrintWriter -import java.io.FileWriter -import java.io.ByteArrayOutputStream - -object TreePrinter { - - def apply(fileName:String, msg:String){ - val out = new PrintWriter(new FileWriter(fileName)) - out.println - out.println(msg) - out.flush - out.close - } - - def apply(fileName:String, msg:String, decls:List[Declaration]){ - val out = new PrintWriter(new FileWriter(fileName)) - - out.println("Initial decls: ") - decls.foreach{ - decl => out.println(decl) - } - - out.println - out.println(msg) - out.flush - out.close - } - - def apply(fileName:String, answer:ContainerNode, decls:List[Declaration]){ - val out = new PrintWriter(new FileWriter(fileName)) - - out.println("Initial decls: ") - decls.foreach{ - decl => out.println(decl) - } - - out.println - printAnswer(out, answer) - out.flush - out.close - } - - def printAnswerAsXML(out: PrintWriter, answer: ContainerNode, depth: Int) { - printAnswerAsXML(out, answer, "query", Set.empty, depth) - } - - private def printAnswerAsXML(out: PrintWriter, answer: ContainerNode, tpe: String, set: Set[SimpleNode], depth:Int) { - println("printAnswerAsXML called") - if(depth > 0) { - out.println("") - answer.getNodes.foreach{ - simpleNode => - if (!set.contains(simpleNode)) { - out.println("""""") - out.println(simpleNode.getDecls.map("").mkString("\n","\n\t,","\n")) - for ((tpe, container) <- simpleNode.getParams) { - printAnswerAsXML(out, container, tpe.toString, set + simpleNode, depth-1) - } - out.println("") - } else { - out.println("""""") - simpleNode.getDecls.map("").mkString("\n","\n\t,","\n") - out.println("") - } - } - out.println("") - } - out.flush - - } - - def apply(fileName:String, answer:ContainerNode, decls:List[Declaration], depth:Int){ - val out = new PrintWriter(new FileWriter(fileName)) - - out.println("Initial decls: ") - decls.foreach{ - decl => out.println(decl) - } - - out.println - printAnswerWithDepth(out, answer, depth) - out.flush - out.close - } - - def apply(answer:ContainerNode, depth:Int): String = { - val byteArrayOutputStream = new ByteArrayOutputStream() - val out = new PrintWriter(byteArrayOutputStream) - - out.println - printAnswerWithDepth(out, answer, depth) - out.flush - out.close - - byteArrayOutputStream.toString - } - - def apply(fileName:String, msg:String, answer:ContainerNode, decls:List[Declaration]){ - val out = new PrintWriter(new FileWriter(fileName)) - - out.println("Initial decls: ") - decls.foreach{ - decl => out.println(decl) - } - - out.println - out.println(msg) - out.println - printAnswer(out, answer) - out.flush - out.close - } - - def apply(fileName:String, msg:String, answer:ContainerNode, decls:List[Declaration], depth:Int){ - val out = new PrintWriter(new FileWriter(fileName)) - - out.println("Initial decls: ") - decls.foreach{ - decl => out.println(decl) - } - - out.println - out.println(msg) - out.println - printAnswerWithDepth(out, answer, depth) - out.flush - out.close - } - - def apply(answer:ContainerNode, decls:List[Declaration]){ - val out = new PrintWriter(System.out) - - out.println("Initial decls: ") - decls.foreach{ - decl => out.println(decl) - } - - out.println - - printAnswer(out, answer) - out.flush - } - - private def printAnswer(out:PrintWriter, answer:ContainerNode) { - out.println - out.println("Solution:") - - printAnswer(out, answer, Set.empty[SimpleNode], 0) - } - - private def printAnswerWithDepth(out:PrintWriter, answer:ContainerNode, depth:Int) { - out.println - out.println("Solution:") - - printAnswerWithDebth(out, answer, Set.empty[SimpleNode], 0, depth) - } - - private def printAnswer(out:PrintWriter, answer:ContainerNode, set:Set[SimpleNode], length:Int) { - answer.getNodes.foreach{ - simpleNode => - if (!set.contains(simpleNode)){ - printlnDeclsWithIndention(out, simpleNode.getDecls, length) - for ((tpe, container) <- simpleNode.getParams) { - val tpeName = "["+tpe.toString+ "]" - printlnWithIndention(out, tpeName, length) - printlnWithIndention(out, "|", length + 4) - printlnWithIndention(out, "V", length + 4) - printAnswer(out, container, set + simpleNode, length + 4) - } - } else { - printWithIndention(out, "Visited ", length) - printlnDeclNamesWithIndention(out, simpleNode.getDecls, 0) - } - } - } - - private def printAnswerWithDebth(out:PrintWriter, answer:ContainerNode, set:Set[SimpleNode], length:Int, depth:Int) { - if(depth > 0){ - answer.getNodes.foreach{ - simpleNode => - if (!set.contains(simpleNode)){ - printlnDeclNamesWithIndention(out, simpleNode.getDecls, length) - for ((tpe, container) <- simpleNode.getParams) { - val tpeName = "["+tpe.toString+ "]" - printlnWithIndention(out, tpeName, length) - printlnWithIndention(out, "|", length + 4) - printlnWithIndention(out, "V", length + 4) - printAnswerWithDebth(out, container, set + simpleNode, length + 4, depth-1) - } - } else { - printWithIndention(out, "Visited ", length) - printlnDeclNamesWithIndention(out, simpleNode.getDecls, 0) - } - } - } - } - - private def printlnWithIndention(out:PrintWriter, text:String, length:Int){ - for(i <- 0 until length) out.print(" ") - out.println(text) - } - - private def printWithIndention(out:PrintWriter, text:String, length:Int){ - for(i <- 0 until length) out.print(" ") - out.print(text) - } - - private def printlnDeclsWithIndention(out:PrintWriter, decls:List[Declaration], length:Int){ - printlnWithIndention(out, decls.mkString("Decls[",",","]"), length) - } - - private def printlnDeclNamesWithIndention(out:PrintWriter, decls:List[Declaration], length:Int){ - printlnWithIndention(out, decls.map(_.toString).mkString("Decls[",",","]"), length) - } -} \ No newline at end of file diff --git a/src/main/scala/insynth/enumeration/Concat.scala b/src/main/scala/scife/enumeration/Concat.scala similarity index 94% rename from src/main/scala/insynth/enumeration/Concat.scala rename to src/main/scala/scife/enumeration/Concat.scala index 27d1631..e801ca0 100644 --- a/src/main/scala/insynth/enumeration/Concat.scala +++ b/src/main/scala/scife/enumeration/Concat.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration import scala.reflect._ diff --git a/src/main/scala/insynth/enumeration/Empty.scala b/src/main/scala/scife/enumeration/Empty.scala similarity index 87% rename from src/main/scala/insynth/enumeration/Empty.scala rename to src/main/scala/scife/enumeration/Empty.scala index f37d708..1a50c71 100644 --- a/src/main/scala/insynth/enumeration/Empty.scala +++ b/src/main/scala/scife/enumeration/Empty.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration trait Empty extends Finite[Nothing] { diff --git a/src/main/scala/insynth/enumeration/Enum.scala b/src/main/scala/scife/enumeration/Enum.scala similarity index 99% rename from src/main/scala/insynth/enumeration/Enum.scala rename to src/main/scala/scife/enumeration/Enum.scala index b64e1ef..19b79ca 100644 --- a/src/main/scala/insynth/enumeration/Enum.scala +++ b/src/main/scala/scife/enumeration/Enum.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration import util.EnumStream diff --git a/src/main/scala/insynth/enumeration/Filter.scala b/src/main/scala/scife/enumeration/Filter.scala similarity index 97% rename from src/main/scala/insynth/enumeration/Filter.scala rename to src/main/scala/scife/enumeration/Filter.scala index 122689a..08d1b4b 100644 --- a/src/main/scala/insynth/enumeration/Filter.scala +++ b/src/main/scala/scife/enumeration/Filter.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration import eager._ import memoization._ diff --git a/src/main/scala/insynth/enumeration/Finite.scala b/src/main/scala/scife/enumeration/Finite.scala similarity index 97% rename from src/main/scala/insynth/enumeration/Finite.scala rename to src/main/scala/scife/enumeration/Finite.scala index b7d8b11..0829037 100644 --- a/src/main/scala/insynth/enumeration/Finite.scala +++ b/src/main/scala/scife/enumeration/Finite.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration import scala.language.implicitConversions diff --git a/src/main/scala/insynth/enumeration/Identity.scala b/src/main/scala/scife/enumeration/Identity.scala similarity index 93% rename from src/main/scala/insynth/enumeration/Identity.scala rename to src/main/scala/scife/enumeration/Identity.scala index c7fe3ce..821d733 100644 --- a/src/main/scala/insynth/enumeration/Identity.scala +++ b/src/main/scala/scife/enumeration/Identity.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration object Identity extends Infinite[Int] { diff --git a/src/main/scala/insynth/enumeration/Infinite.scala b/src/main/scala/scife/enumeration/Infinite.scala similarity index 89% rename from src/main/scala/insynth/enumeration/Infinite.scala rename to src/main/scala/scife/enumeration/Infinite.scala index 4535a28..708388d 100644 --- a/src/main/scala/insynth/enumeration/Infinite.scala +++ b/src/main/scala/scife/enumeration/Infinite.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration trait Infinite[+A] extends Enum[A] { diff --git a/src/main/scala/insynth/enumeration/Map.scala b/src/main/scala/scife/enumeration/Map.scala similarity index 97% rename from src/main/scala/insynth/enumeration/Map.scala rename to src/main/scala/scife/enumeration/Map.scala index 9577ce4..aa6d56e 100644 --- a/src/main/scala/insynth/enumeration/Map.scala +++ b/src/main/scala/scife/enumeration/Map.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration import memoization._ diff --git a/src/main/scala/insynth/enumeration/Product.scala b/src/main/scala/scife/enumeration/Product.scala similarity index 98% rename from src/main/scala/insynth/enumeration/Product.scala rename to src/main/scala/scife/enumeration/Product.scala index 6743c81..aee7ef3 100644 --- a/src/main/scala/insynth/enumeration/Product.scala +++ b/src/main/scala/scife/enumeration/Product.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration import lzy._ diff --git a/src/main/scala/insynth/enumeration/Singleton.scala b/src/main/scala/scife/enumeration/Singleton.scala similarity index 92% rename from src/main/scala/insynth/enumeration/Singleton.scala rename to src/main/scala/scife/enumeration/Singleton.scala index 2075457..4bd18da 100644 --- a/src/main/scala/insynth/enumeration/Singleton.scala +++ b/src/main/scala/scife/enumeration/Singleton.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration trait SingletonT[T] extends Finite[T] { diff --git a/src/main/scala/insynth/enumeration/WrapArray.scala b/src/main/scala/scife/enumeration/WrapArray.scala similarity index 97% rename from src/main/scala/insynth/enumeration/WrapArray.scala rename to src/main/scala/scife/enumeration/WrapArray.scala index 0abb1f3..d432d1b 100644 --- a/src/main/scala/insynth/enumeration/WrapArray.scala +++ b/src/main/scala/scife/enumeration/WrapArray.scala @@ -1,4 +1,4 @@ -package insynth +package scife package enumeration import scala.reflect._ diff --git a/src/main/scala/insynth/enumeration/WrapFunction.scala b/src/main/scala/scife/enumeration/WrapFunction.scala similarity index 95% rename from src/main/scala/insynth/enumeration/WrapFunction.scala rename to src/main/scala/scife/enumeration/WrapFunction.scala index ba3d7d5..47300b2 100644 --- a/src/main/scala/insynth/enumeration/WrapFunction.scala +++ b/src/main/scala/scife/enumeration/WrapFunction.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration case class WrapFunction[T](val f: Int => T) extends Infinite[T] { diff --git a/src/main/scala/insynth/enumeration/WrapIndexedSeq.scala b/src/main/scala/scife/enumeration/WrapIndexedSeq.scala similarity index 94% rename from src/main/scala/insynth/enumeration/WrapIndexedSeq.scala rename to src/main/scala/scife/enumeration/WrapIndexedSeq.scala index 466b648..73ec31a 100644 --- a/src/main/scala/insynth/enumeration/WrapIndexedSeq.scala +++ b/src/main/scala/scife/enumeration/WrapIndexedSeq.scala @@ -1,4 +1,4 @@ -package insynth +package scife package enumeration import scala.reflect._ diff --git a/src/main/scala/insynth/enumeration/WrapStream.scala b/src/main/scala/scife/enumeration/WrapStream.scala similarity index 92% rename from src/main/scala/insynth/enumeration/WrapStream.scala rename to src/main/scala/scife/enumeration/WrapStream.scala index 8e4668b..dd69a24 100644 --- a/src/main/scala/insynth/enumeration/WrapStream.scala +++ b/src/main/scala/scife/enumeration/WrapStream.scala @@ -1,4 +1,4 @@ -package insynth +package scife package enumeration /** diff --git a/src/main/scala/insynth/enumeration/combinators/Concat.scala b/src/main/scala/scife/enumeration/combinators/Concat.scala similarity index 90% rename from src/main/scala/insynth/enumeration/combinators/Concat.scala rename to src/main/scala/scife/enumeration/combinators/Concat.scala index a4491ef..2deffe6 100644 --- a/src/main/scala/insynth/enumeration/combinators/Concat.scala +++ b/src/main/scala/scife/enumeration/combinators/Concat.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package combinators trait Concat[T, U, V] extends Enum[V] { diff --git a/src/main/scala/insynth/enumeration/combinators/Filter.scala b/src/main/scala/scife/enumeration/combinators/Filter.scala similarity index 80% rename from src/main/scala/insynth/enumeration/combinators/Filter.scala rename to src/main/scala/scife/enumeration/combinators/Filter.scala index 8e1058e..f66e128 100644 --- a/src/main/scala/insynth/enumeration/combinators/Filter.scala +++ b/src/main/scala/scife/enumeration/combinators/Filter.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package combinators import Filter.FilterFunction diff --git a/src/main/scala/insynth/enumeration/combinators/Map.scala b/src/main/scala/scife/enumeration/combinators/Map.scala similarity index 84% rename from src/main/scala/insynth/enumeration/combinators/Map.scala rename to src/main/scala/scife/enumeration/combinators/Map.scala index 64de91f..ed3558e 100644 --- a/src/main/scala/insynth/enumeration/combinators/Map.scala +++ b/src/main/scala/scife/enumeration/combinators/Map.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package combinators trait Map[T, U] extends Enum[U] { diff --git a/src/main/scala/insynth/enumeration/combinators/Product.scala b/src/main/scala/scife/enumeration/combinators/Product.scala similarity index 84% rename from src/main/scala/insynth/enumeration/combinators/Product.scala rename to src/main/scala/scife/enumeration/combinators/Product.scala index 6c449da..0bd9fa7 100644 --- a/src/main/scala/insynth/enumeration/combinators/Product.scala +++ b/src/main/scala/scife/enumeration/combinators/Product.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package combinators trait Product[T, U] extends Enum[(T, U)] { diff --git a/src/main/scala/insynth/enumeration/dependent/Chain.scala b/src/main/scala/scife/enumeration/dependent/Chain.scala similarity index 98% rename from src/main/scala/insynth/enumeration/dependent/Chain.scala rename to src/main/scala/scife/enumeration/dependent/Chain.scala index 5f2abe4..d1aecd9 100644 --- a/src/main/scala/insynth/enumeration/dependent/Chain.scala +++ b/src/main/scala/scife/enumeration/dependent/Chain.scala @@ -1,9 +1,9 @@ -package insynth.enumeration +package scife.enumeration package dependent import lzy._ -import insynth.util.logging._ +import scife.util.logging._ object Chain { diff --git a/src/main/scala/insynth/enumeration/dependent/Concat.scala b/src/main/scala/scife/enumeration/dependent/Concat.scala similarity index 85% rename from src/main/scala/insynth/enumeration/dependent/Concat.scala rename to src/main/scala/scife/enumeration/dependent/Concat.scala index 02e8155..cec58f1 100644 --- a/src/main/scala/insynth/enumeration/dependent/Concat.scala +++ b/src/main/scala/scife/enumeration/dependent/Concat.scala @@ -1,7 +1,7 @@ -package insynth.enumeration +package scife.enumeration package dependent -import insynth.util.logging._ +import scife.util.logging._ object Concat { diff --git a/src/main/scala/insynth/enumeration/dependent/ConcatFinite.scala b/src/main/scala/scife/enumeration/dependent/ConcatFinite.scala similarity index 84% rename from src/main/scala/insynth/enumeration/dependent/ConcatFinite.scala rename to src/main/scala/scife/enumeration/dependent/ConcatFinite.scala index 3795d12..12ce8e5 100644 --- a/src/main/scala/insynth/enumeration/dependent/ConcatFinite.scala +++ b/src/main/scala/scife/enumeration/dependent/ConcatFinite.scala @@ -1,7 +1,7 @@ -package insynth.enumeration +package scife.enumeration package dependent -import insynth.enumeration.lzy._ +import scife.enumeration.lzy._ class ConcatFinite[I, O] (s1: DependFinite[I, O], s2: DependFinite[I, O]) diff --git a/src/main/scala/insynth/enumeration/dependent/ConcatInfinite.scala b/src/main/scala/scife/enumeration/dependent/ConcatInfinite.scala similarity index 85% rename from src/main/scala/insynth/enumeration/dependent/ConcatInfinite.scala rename to src/main/scala/scife/enumeration/dependent/ConcatInfinite.scala index 679072a..8f43178 100644 --- a/src/main/scala/insynth/enumeration/dependent/ConcatInfinite.scala +++ b/src/main/scala/scife/enumeration/dependent/ConcatInfinite.scala @@ -1,7 +1,7 @@ -package insynth.enumeration +package scife.enumeration package dependent -import insynth.enumeration.lzy._ +import scife.enumeration.lzy._ class ConcatInfinite[I, O] (s1: DependInfinite[I, O], s2: DependInfinite[I, O]) diff --git a/src/main/scala/insynth/enumeration/dependent/Depend.scala b/src/main/scala/scife/enumeration/dependent/Depend.scala similarity index 99% rename from src/main/scala/insynth/enumeration/dependent/Depend.scala rename to src/main/scala/scife/enumeration/dependent/Depend.scala index fdce5b5..98a4fe3 100644 --- a/src/main/scala/insynth/enumeration/dependent/Depend.scala +++ b/src/main/scala/scife/enumeration/dependent/Depend.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package dependent import scala.collection.immutable.{ Map => ScalaMap } diff --git a/src/main/scala/insynth/enumeration/dependent/DependFinite.scala b/src/main/scala/scife/enumeration/dependent/DependFinite.scala similarity index 96% rename from src/main/scala/insynth/enumeration/dependent/DependFinite.scala rename to src/main/scala/scife/enumeration/dependent/DependFinite.scala index 59355a9..e4832e7 100644 --- a/src/main/scala/insynth/enumeration/dependent/DependFinite.scala +++ b/src/main/scala/scife/enumeration/dependent/DependFinite.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package dependent trait DependFinite[I, +O] extends Depend[I, O] { diff --git a/src/main/scala/insynth/enumeration/dependent/DependInfinite.scala b/src/main/scala/scife/enumeration/dependent/DependInfinite.scala similarity index 80% rename from src/main/scala/insynth/enumeration/dependent/DependInfinite.scala rename to src/main/scala/scife/enumeration/dependent/DependInfinite.scala index f266f7b..a9a2328 100644 --- a/src/main/scala/insynth/enumeration/dependent/DependInfinite.scala +++ b/src/main/scala/scife/enumeration/dependent/DependInfinite.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package dependent trait DependInfinite[I, +O] extends Depend[I, O] { diff --git a/src/main/scala/insynth/enumeration/dependent/InMap.scala b/src/main/scala/scife/enumeration/dependent/InMap.scala similarity index 98% rename from src/main/scala/insynth/enumeration/dependent/InMap.scala rename to src/main/scala/scife/enumeration/dependent/InMap.scala index 66124f3..3674b99 100644 --- a/src/main/scala/insynth/enumeration/dependent/InMap.scala +++ b/src/main/scala/scife/enumeration/dependent/InMap.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package dependent import scala.language.higherKinds diff --git a/src/main/scala/insynth/enumeration/dependent/Product.scala b/src/main/scala/scife/enumeration/dependent/Product.scala similarity index 82% rename from src/main/scala/insynth/enumeration/dependent/Product.scala rename to src/main/scala/scife/enumeration/dependent/Product.scala index ae945fe..41c98ec 100644 --- a/src/main/scala/insynth/enumeration/dependent/Product.scala +++ b/src/main/scala/scife/enumeration/dependent/Product.scala @@ -1,10 +1,10 @@ -package insynth.enumeration +package scife.enumeration package dependent -import insynth.{ enumeration => e } -import insynth.enumeration.{ combinators => ecomb } +import scife.{ enumeration => e } +import scife.enumeration.{ combinators => ecomb } -import insynth.util.logging._ +import scife.util.logging._ object Product { diff --git a/src/main/scala/insynth/enumeration/dependent/ProductFinite.scala b/src/main/scala/scife/enumeration/dependent/ProductFinite.scala similarity index 82% rename from src/main/scala/insynth/enumeration/dependent/ProductFinite.scala rename to src/main/scala/scife/enumeration/dependent/ProductFinite.scala index 3872c8d..74413b7 100644 --- a/src/main/scala/insynth/enumeration/dependent/ProductFinite.scala +++ b/src/main/scala/scife/enumeration/dependent/ProductFinite.scala @@ -1,11 +1,11 @@ -package insynth +package scife package enumeration package dependent -import insynth.{ enumeration => e } +import scife.{ enumeration => e } import enumeration.{ lzy => elzy } -import insynth.util.logging._ +import scife.util.logging._ case class ProductFinite[I, O1, O2] (s1: DependFinite[I, O1], s2: DependFinite[I, O2]) diff --git a/src/main/scala/insynth/enumeration/dependent/WrapFunction.scala b/src/main/scala/scife/enumeration/dependent/WrapFunction.scala similarity index 98% rename from src/main/scala/insynth/enumeration/dependent/WrapFunction.scala rename to src/main/scala/scife/enumeration/dependent/WrapFunction.scala index edb03f5..6d412e8 100644 --- a/src/main/scala/insynth/enumeration/dependent/WrapFunction.scala +++ b/src/main/scala/scife/enumeration/dependent/WrapFunction.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package dependent import scala.collection.mutable diff --git a/src/main/scala/insynth/enumeration/dependent/WrapMap.scala b/src/main/scala/scife/enumeration/dependent/WrapMap.scala similarity index 93% rename from src/main/scala/insynth/enumeration/dependent/WrapMap.scala rename to src/main/scala/scife/enumeration/dependent/WrapMap.scala index f5f29c2..7227171 100644 --- a/src/main/scala/insynth/enumeration/dependent/WrapMap.scala +++ b/src/main/scala/scife/enumeration/dependent/WrapMap.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package dependent import scala.collection.immutable.{ Map => ScalaMap } diff --git a/src/main/scala/insynth/enumeration/dependent/combinators/Chain.scala b/src/main/scala/scife/enumeration/dependent/combinators/Chain.scala similarity index 84% rename from src/main/scala/insynth/enumeration/dependent/combinators/Chain.scala rename to src/main/scala/scife/enumeration/dependent/combinators/Chain.scala index 3b87210..30303ad 100644 --- a/src/main/scala/insynth/enumeration/dependent/combinators/Chain.scala +++ b/src/main/scala/scife/enumeration/dependent/combinators/Chain.scala @@ -1,8 +1,8 @@ -package insynth.enumeration +package scife.enumeration package dependent package combinators -import insynth.enumeration.Enum +import scife.enumeration.Enum trait Chain[T, U] extends Enum[(T, U)] { diff --git a/src/main/scala/insynth/enumeration/dependent/combinators/Concat.scala b/src/main/scala/scife/enumeration/dependent/combinators/Concat.scala similarity index 83% rename from src/main/scala/insynth/enumeration/dependent/combinators/Concat.scala rename to src/main/scala/scife/enumeration/dependent/combinators/Concat.scala index d761df5..8ec4afa 100644 --- a/src/main/scala/insynth/enumeration/dependent/combinators/Concat.scala +++ b/src/main/scala/scife/enumeration/dependent/combinators/Concat.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package dependent package combinators diff --git a/src/main/scala/insynth/enumeration/dependent/combinators/InMap.scala b/src/main/scala/scife/enumeration/dependent/combinators/InMap.scala similarity index 92% rename from src/main/scala/insynth/enumeration/dependent/combinators/InMap.scala rename to src/main/scala/scife/enumeration/dependent/combinators/InMap.scala index 2b283de..e54a71e 100644 --- a/src/main/scala/insynth/enumeration/dependent/combinators/InMap.scala +++ b/src/main/scala/scife/enumeration/dependent/combinators/InMap.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package dependent package combinators diff --git a/src/main/scala/insynth/enumeration/dependent/combinators/Product.scala b/src/main/scala/scife/enumeration/dependent/combinators/Product.scala similarity index 84% rename from src/main/scala/insynth/enumeration/dependent/combinators/Product.scala rename to src/main/scala/scife/enumeration/dependent/combinators/Product.scala index 4bcd050..f4c87c0 100644 --- a/src/main/scala/insynth/enumeration/dependent/combinators/Product.scala +++ b/src/main/scala/scife/enumeration/dependent/combinators/Product.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package dependent package combinators diff --git a/src/main/scala/insynth/enumeration/dependent/eager/ChainFinite.scala b/src/main/scala/scife/enumeration/dependent/eager/ChainFinite.scala similarity index 97% rename from src/main/scala/insynth/enumeration/dependent/eager/ChainFinite.scala rename to src/main/scala/scife/enumeration/dependent/eager/ChainFinite.scala index 20e3989..c20c7ea 100644 --- a/src/main/scala/insynth/enumeration/dependent/eager/ChainFinite.scala +++ b/src/main/scala/scife/enumeration/dependent/eager/ChainFinite.scala @@ -1,8 +1,8 @@ -package insynth.enumeration +package scife.enumeration package dependent import combinators._ -import insynth.{ enumeration => e } +import scife.{ enumeration => e } class ChainFinite[I, O] (override val left: Finite[I], override val right: DependFinite[I, O]) diff --git a/src/main/scala/insynth/enumeration/dependent/eager/ChainFiniteSingle.scala b/src/main/scala/scife/enumeration/dependent/eager/ChainFiniteSingle.scala similarity index 93% rename from src/main/scala/insynth/enumeration/dependent/eager/ChainFiniteSingle.scala rename to src/main/scala/scife/enumeration/dependent/eager/ChainFiniteSingle.scala index bacd2f9..3657dcc 100644 --- a/src/main/scala/insynth/enumeration/dependent/eager/ChainFiniteSingle.scala +++ b/src/main/scala/scife/enumeration/dependent/eager/ChainFiniteSingle.scala @@ -1,8 +1,8 @@ -package insynth.enumeration +package scife.enumeration package dependent import combinators.ChainSingle -import insynth.{ enumeration => e } +import scife.{ enumeration => e } class ChainFiniteSingle[I, O] (override val left: Finite[I], override val right: DependFinite[I, O]) diff --git a/src/main/scala/insynth/enumeration/dependent/lzy/ChainFinite.scala b/src/main/scala/scife/enumeration/dependent/lzy/ChainFinite.scala similarity index 94% rename from src/main/scala/insynth/enumeration/dependent/lzy/ChainFinite.scala rename to src/main/scala/scife/enumeration/dependent/lzy/ChainFinite.scala index a5bf002..9dde9d5 100644 --- a/src/main/scala/insynth/enumeration/dependent/lzy/ChainFinite.scala +++ b/src/main/scala/scife/enumeration/dependent/lzy/ChainFinite.scala @@ -1,9 +1,9 @@ -package insynth.enumeration +package scife.enumeration package dependent package lzy -import insynth.{ enumeration => e } -import insynth.enumeration.lzy._ +import scife.{ enumeration => e } +import scife.enumeration.lzy._ class ChainFinite[I, O] (override val left: Finite[I], override val right: DependFinite[I, O]) diff --git a/src/main/scala/insynth/enumeration/dependent/lzy/ChainFiniteSingle.scala b/src/main/scala/scife/enumeration/dependent/lzy/ChainFiniteSingle.scala similarity index 89% rename from src/main/scala/insynth/enumeration/dependent/lzy/ChainFiniteSingle.scala rename to src/main/scala/scife/enumeration/dependent/lzy/ChainFiniteSingle.scala index a66bfe1..d9edd1d 100644 --- a/src/main/scala/insynth/enumeration/dependent/lzy/ChainFiniteSingle.scala +++ b/src/main/scala/scife/enumeration/dependent/lzy/ChainFiniteSingle.scala @@ -1,9 +1,9 @@ -package insynth.enumeration +package scife.enumeration package dependent package lzy -import insynth.{ enumeration => e } -import insynth.enumeration.lzy._ +import scife.{ enumeration => e } +import scife.enumeration.lzy._ class ChainFiniteSingle[I, O] (override val left: Finite[I], override val right: DependFinite[I, O]) diff --git a/src/main/scala/insynth/enumeration/eager/SimpleFilter.scala b/src/main/scala/scife/enumeration/eager/SimpleFilter.scala similarity index 95% rename from src/main/scala/insynth/enumeration/eager/SimpleFilter.scala rename to src/main/scala/scife/enumeration/eager/SimpleFilter.scala index 2e5707a..8164892 100644 --- a/src/main/scala/insynth/enumeration/eager/SimpleFilter.scala +++ b/src/main/scala/scife/enumeration/eager/SimpleFilter.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package eager import combinators._ diff --git a/src/main/scala/insynth/enumeration/lzy/Concat.scala b/src/main/scala/scife/enumeration/lzy/Concat.scala similarity index 97% rename from src/main/scala/insynth/enumeration/lzy/Concat.scala rename to src/main/scala/scife/enumeration/lzy/Concat.scala index 2ac3f7e..6d8410a 100644 --- a/src/main/scala/insynth/enumeration/lzy/Concat.scala +++ b/src/main/scala/scife/enumeration/lzy/Concat.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package lzy import scala.reflect._ diff --git a/src/main/scala/insynth/enumeration/lzy/ConcatFinite.scala b/src/main/scala/scife/enumeration/lzy/ConcatFinite.scala similarity index 99% rename from src/main/scala/insynth/enumeration/lzy/ConcatFinite.scala rename to src/main/scala/scife/enumeration/lzy/ConcatFinite.scala index c6a5260..1f0cfcd 100644 --- a/src/main/scala/insynth/enumeration/lzy/ConcatFinite.scala +++ b/src/main/scala/scife/enumeration/lzy/ConcatFinite.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package lzy import combinators._ diff --git a/src/main/scala/insynth/enumeration/lzy/ConcatFiniteInfinite.scala b/src/main/scala/scife/enumeration/lzy/ConcatFiniteInfinite.scala similarity index 97% rename from src/main/scala/insynth/enumeration/lzy/ConcatFiniteInfinite.scala rename to src/main/scala/scife/enumeration/lzy/ConcatFiniteInfinite.scala index e550c04..0954453 100644 --- a/src/main/scala/insynth/enumeration/lzy/ConcatFiniteInfinite.scala +++ b/src/main/scala/scife/enumeration/lzy/ConcatFiniteInfinite.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package lzy import combinators._ diff --git a/src/main/scala/insynth/enumeration/lzy/ConcatInfinite.scala b/src/main/scala/scife/enumeration/lzy/ConcatInfinite.scala similarity index 96% rename from src/main/scala/insynth/enumeration/lzy/ConcatInfinite.scala rename to src/main/scala/scife/enumeration/lzy/ConcatInfinite.scala index c6d527c..423d5f4 100644 --- a/src/main/scala/insynth/enumeration/lzy/ConcatInfinite.scala +++ b/src/main/scala/scife/enumeration/lzy/ConcatInfinite.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package lzy import combinators._ diff --git a/src/main/scala/insynth/enumeration/lzy/Product.scala b/src/main/scala/scife/enumeration/lzy/Product.scala similarity index 97% rename from src/main/scala/insynth/enumeration/lzy/Product.scala rename to src/main/scala/scife/enumeration/lzy/Product.scala index 0eff264..1921bcd 100644 --- a/src/main/scala/insynth/enumeration/lzy/Product.scala +++ b/src/main/scala/scife/enumeration/lzy/Product.scala @@ -1,7 +1,7 @@ -package insynth.enumeration +package scife.enumeration package lzy -import _root_.insynth.util +import _root_.scife.util import util.Math._ import util.logging._ diff --git a/src/main/scala/insynth/enumeration/lzy/ProductFinite.scala b/src/main/scala/scife/enumeration/lzy/ProductFinite.scala similarity index 96% rename from src/main/scala/insynth/enumeration/lzy/ProductFinite.scala rename to src/main/scala/scife/enumeration/lzy/ProductFinite.scala index dc52deb..844e578 100644 --- a/src/main/scala/insynth/enumeration/lzy/ProductFinite.scala +++ b/src/main/scala/scife/enumeration/lzy/ProductFinite.scala @@ -1,9 +1,9 @@ -package insynth.enumeration +package scife.enumeration package lzy import combinators.{ Product => CProduct } -import _root_.insynth.util +import _root_.scife.util import util.Math._ protected[enumeration] class ProductFinite[T, V] diff --git a/src/main/scala/insynth/enumeration/lzy/ProductFiniteInfinite.scala b/src/main/scala/scife/enumeration/lzy/ProductFiniteInfinite.scala similarity index 93% rename from src/main/scala/insynth/enumeration/lzy/ProductFiniteInfinite.scala rename to src/main/scala/scife/enumeration/lzy/ProductFiniteInfinite.scala index dfa602f..fb08e05 100644 --- a/src/main/scala/insynth/enumeration/lzy/ProductFiniteInfinite.scala +++ b/src/main/scala/scife/enumeration/lzy/ProductFiniteInfinite.scala @@ -1,9 +1,9 @@ -package insynth.enumeration +package scife.enumeration package lzy -import insynth.enumeration.{ combinators => comb } +import scife.enumeration.{ combinators => comb } -import _root_.insynth.util +import _root_.scife.util import util.Math._ trait ProductFiniteInfinite[T, V, U <: Pair[_, _]] extends Infinite[U] { diff --git a/src/main/scala/insynth/enumeration/lzy/ProductInfinite.scala b/src/main/scala/scife/enumeration/lzy/ProductInfinite.scala similarity index 92% rename from src/main/scala/insynth/enumeration/lzy/ProductInfinite.scala rename to src/main/scala/scife/enumeration/lzy/ProductInfinite.scala index 36df1b8..984f04e 100644 --- a/src/main/scala/insynth/enumeration/lzy/ProductInfinite.scala +++ b/src/main/scala/scife/enumeration/lzy/ProductInfinite.scala @@ -1,7 +1,7 @@ -package insynth.enumeration +package scife.enumeration package lzy -import _root_.insynth.util +import _root_.scife.util import util.Math._ // Cantor inverse mapping is fine in this case diff --git a/src/main/scala/insynth/enumeration/lzy/dynamic/ConcatFiniteBuffer.scala b/src/main/scala/scife/enumeration/lzy/dynamic/ConcatFiniteBuffer.scala similarity index 96% rename from src/main/scala/insynth/enumeration/lzy/dynamic/ConcatFiniteBuffer.scala rename to src/main/scala/scife/enumeration/lzy/dynamic/ConcatFiniteBuffer.scala index faa60f0..827a3be 100644 --- a/src/main/scala/insynth/enumeration/lzy/dynamic/ConcatFiniteBuffer.scala +++ b/src/main/scala/scife/enumeration/lzy/dynamic/ConcatFiniteBuffer.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package lzy package dynamic diff --git a/src/main/scala/insynth/enumeration/memoization/Memoizable.scala b/src/main/scala/scife/enumeration/memoization/Memoizable.scala similarity index 70% rename from src/main/scala/insynth/enumeration/memoization/Memoizable.scala rename to src/main/scala/scife/enumeration/memoization/Memoizable.scala index d60e46d..e63257a 100644 --- a/src/main/scala/insynth/enumeration/memoization/Memoizable.scala +++ b/src/main/scala/scife/enumeration/memoization/Memoizable.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package memoization trait Memoizable { diff --git a/src/main/scala/insynth/enumeration/memoization/MemoizationScope.scala b/src/main/scala/scife/enumeration/memoization/MemoizationScope.scala similarity index 90% rename from src/main/scala/insynth/enumeration/memoization/MemoizationScope.scala rename to src/main/scala/scife/enumeration/memoization/MemoizationScope.scala index 864b5e3..f8f503e 100644 --- a/src/main/scala/insynth/enumeration/memoization/MemoizationScope.scala +++ b/src/main/scala/scife/enumeration/memoization/MemoizationScope.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package memoization import scala.collection.mutable.MutableList diff --git a/src/main/scala/insynth/enumeration/memoization/Memoized.scala b/src/main/scala/scife/enumeration/memoization/Memoized.scala similarity index 96% rename from src/main/scala/insynth/enumeration/memoization/Memoized.scala rename to src/main/scala/scife/enumeration/memoization/Memoized.scala index bd692ac..42e478a 100644 --- a/src/main/scala/insynth/enumeration/memoization/Memoized.scala +++ b/src/main/scala/scife/enumeration/memoization/Memoized.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package memoization import scala.collection.mutable._ diff --git a/src/main/scala/insynth/enumeration/memoization/MemoizedEmpty.scala b/src/main/scala/scife/enumeration/memoization/MemoizedEmpty.scala similarity index 80% rename from src/main/scala/insynth/enumeration/memoization/MemoizedEmpty.scala rename to src/main/scala/scife/enumeration/memoization/MemoizedEmpty.scala index 4794e59..8c67539 100644 --- a/src/main/scala/insynth/enumeration/memoization/MemoizedEmpty.scala +++ b/src/main/scala/scife/enumeration/memoization/MemoizedEmpty.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package memoization object MemoizedEmpty extends Empty with Memoizable { diff --git a/src/main/scala/insynth/enumeration/memoization/dependent/Chain.scala b/src/main/scala/scife/enumeration/memoization/dependent/Chain.scala similarity index 95% rename from src/main/scala/insynth/enumeration/memoization/dependent/Chain.scala rename to src/main/scala/scife/enumeration/memoization/dependent/Chain.scala index 4e31825..0edf147 100644 --- a/src/main/scala/insynth/enumeration/memoization/dependent/Chain.scala +++ b/src/main/scala/scife/enumeration/memoization/dependent/Chain.scala @@ -1,10 +1,10 @@ -package insynth.enumeration +package scife.enumeration package memoization -import insynth.enumeration.{ combinators => ecomb } -import insynth.enumeration.dependent._ +import scife.enumeration.{ combinators => ecomb } +import scife.enumeration.dependent._ -import insynth.util.logging._ +import scife.util.logging._ import scala.language.existentials diff --git a/src/main/scala/insynth/enumeration/memoization/dependent/Memoized.scala b/src/main/scala/scife/enumeration/memoization/dependent/Memoized.scala similarity index 89% rename from src/main/scala/insynth/enumeration/memoization/dependent/Memoized.scala rename to src/main/scala/scife/enumeration/memoization/dependent/Memoized.scala index 4132b17..a240b89 100644 --- a/src/main/scala/insynth/enumeration/memoization/dependent/Memoized.scala +++ b/src/main/scala/scife/enumeration/memoization/dependent/Memoized.scala @@ -1,8 +1,8 @@ -package insynth.enumeration +package scife.enumeration package memoization package dependent -import insynth.enumeration.dependent.Depend +import scife.enumeration.dependent.Depend import scala.collection.mutable diff --git a/src/main/scala/insynth/enumeration/package.scala b/src/main/scala/scife/enumeration/package.scala similarity index 91% rename from src/main/scala/insynth/enumeration/package.scala rename to src/main/scala/scife/enumeration/package.scala index 80867e6..e678353 100644 --- a/src/main/scala/insynth/enumeration/package.scala +++ b/src/main/scala/scife/enumeration/package.scala @@ -1,4 +1,4 @@ -package insynth +package scife import util.logging._ diff --git a/src/main/scala/insynth/enumeration/reverse/Empty.scala b/src/main/scala/scife/enumeration/reverse/Empty.scala similarity index 75% rename from src/main/scala/insynth/enumeration/reverse/Empty.scala rename to src/main/scala/scife/enumeration/reverse/Empty.scala index c7fcffa..9faa295 100644 --- a/src/main/scala/insynth/enumeration/reverse/Empty.scala +++ b/src/main/scala/scife/enumeration/reverse/Empty.scala @@ -1,7 +1,7 @@ -package insynth.enumeration +package scife.enumeration package reverse -import _root_.insynth.{ enumeration => e } +import _root_.scife.{ enumeration => e } object Empty extends e.Empty with Reverse[Nothing] { diff --git a/src/main/scala/insynth/enumeration/reverse/Identity.scala b/src/main/scala/scife/enumeration/reverse/Identity.scala similarity index 81% rename from src/main/scala/insynth/enumeration/reverse/Identity.scala rename to src/main/scala/scife/enumeration/reverse/Identity.scala index 5962645..1543ff8 100644 --- a/src/main/scala/insynth/enumeration/reverse/Identity.scala +++ b/src/main/scala/scife/enumeration/reverse/Identity.scala @@ -1,7 +1,7 @@ -//package insynth.enumeration +//package scife.enumeration //package reverse // -//import insynth.{ enumeration => e } +//import scife.{ enumeration => e } // //trait Identity extends Reverse[Int] { // diff --git a/src/main/scala/insynth/enumeration/reverse/Map.scala b/src/main/scala/scife/enumeration/reverse/Map.scala similarity index 82% rename from src/main/scala/insynth/enumeration/reverse/Map.scala rename to src/main/scala/scife/enumeration/reverse/Map.scala index 75a9433..9dfcc56 100644 --- a/src/main/scala/insynth/enumeration/reverse/Map.scala +++ b/src/main/scala/scife/enumeration/reverse/Map.scala @@ -1,7 +1,7 @@ -package insynth.enumeration +package scife.enumeration package reverse -import insynth.{ enumeration => en } +import scife.{ enumeration => en } class Map[T, U](enum: Reverse[T], modify: T=>U, revFun: U => T) extends en.Map[T, U](enum, modify) with Reverse[U] with HasLogger { diff --git a/src/main/scala/insynth/enumeration/reverse/ProductFinite.scala b/src/main/scala/scife/enumeration/reverse/ProductFinite.scala similarity index 89% rename from src/main/scala/insynth/enumeration/reverse/ProductFinite.scala rename to src/main/scala/scife/enumeration/reverse/ProductFinite.scala index 531154c..621094e 100644 --- a/src/main/scala/insynth/enumeration/reverse/ProductFinite.scala +++ b/src/main/scala/scife/enumeration/reverse/ProductFinite.scala @@ -1,9 +1,9 @@ -package insynth.enumeration +package scife.enumeration package reverse import combinators.{ Product => CProduct } -import _root_.insynth.util +import _root_.scife.util import util.Math._ import util.logging._ diff --git a/src/main/scala/insynth/enumeration/reverse/Reverse.scala b/src/main/scala/scife/enumeration/reverse/Reverse.scala similarity index 95% rename from src/main/scala/insynth/enumeration/reverse/Reverse.scala rename to src/main/scala/scife/enumeration/reverse/Reverse.scala index df86227..4d120b1 100644 --- a/src/main/scala/insynth/enumeration/reverse/Reverse.scala +++ b/src/main/scala/scife/enumeration/reverse/Reverse.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package reverse import util.EnumStream diff --git a/src/main/scala/insynth/enumeration/reverse/Reversed.scala b/src/main/scala/scife/enumeration/reverse/Reversed.scala similarity index 87% rename from src/main/scala/insynth/enumeration/reverse/Reversed.scala rename to src/main/scala/scife/enumeration/reverse/Reversed.scala index 390f92a..a0f261d 100644 --- a/src/main/scala/insynth/enumeration/reverse/Reversed.scala +++ b/src/main/scala/scife/enumeration/reverse/Reversed.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package reverse trait Reversed[T] extends Finite[T] { diff --git a/src/main/scala/insynth/enumeration/reverse/Reverser.scala b/src/main/scala/scife/enumeration/reverse/Reverser.scala similarity index 96% rename from src/main/scala/insynth/enumeration/reverse/Reverser.scala rename to src/main/scala/scife/enumeration/reverse/Reverser.scala index 07b0158..e665c38 100644 --- a/src/main/scala/insynth/enumeration/reverse/Reverser.scala +++ b/src/main/scala/scife/enumeration/reverse/Reverser.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package reverse import scala.reflect._ diff --git a/src/main/scala/insynth/enumeration/reverse/Singleton.scala b/src/main/scala/scife/enumeration/reverse/Singleton.scala similarity index 91% rename from src/main/scala/insynth/enumeration/reverse/Singleton.scala rename to src/main/scala/scife/enumeration/reverse/Singleton.scala index 6fdf95d..b39b4ee 100644 --- a/src/main/scala/insynth/enumeration/reverse/Singleton.scala +++ b/src/main/scala/scife/enumeration/reverse/Singleton.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package reverse case class Singleton[T](override val el: T) extends SingletonT[T] with Reverse[T] { diff --git a/src/main/scala/insynth/enumeration/reverse/WrapArray.scala b/src/main/scala/scife/enumeration/reverse/WrapArray.scala similarity index 90% rename from src/main/scala/insynth/enumeration/reverse/WrapArray.scala rename to src/main/scala/scife/enumeration/reverse/WrapArray.scala index e2ff94a..6694f20 100644 --- a/src/main/scala/insynth/enumeration/reverse/WrapArray.scala +++ b/src/main/scala/scife/enumeration/reverse/WrapArray.scala @@ -1,8 +1,8 @@ -package insynth +package scife package enumeration package reverse -import insynth.{ enumeration => e } +import scife.{ enumeration => e } import scala.{ collection => col } import scala.reflect._ diff --git a/src/main/scala/insynth/enumeration/reverse/WrapFunction.scala b/src/main/scala/scife/enumeration/reverse/WrapFunction.scala similarity index 90% rename from src/main/scala/insynth/enumeration/reverse/WrapFunction.scala rename to src/main/scala/scife/enumeration/reverse/WrapFunction.scala index f3e9c82..65d1637 100644 --- a/src/main/scala/insynth/enumeration/reverse/WrapFunction.scala +++ b/src/main/scala/scife/enumeration/reverse/WrapFunction.scala @@ -1,7 +1,7 @@ -//package insynth.enumeration +//package scife.enumeration //package reverse // -//import insynth.{ enumeration => e } +//import scife.{ enumeration => e } // //case class WrapFunction[T](val f: Int => T) extends Infinite[T] { // diff --git a/src/main/scala/insynth/enumeration/reverse/dependent/ChainFinite.scala b/src/main/scala/scife/enumeration/reverse/dependent/ChainFinite.scala similarity index 96% rename from src/main/scala/insynth/enumeration/reverse/dependent/ChainFinite.scala rename to src/main/scala/scife/enumeration/reverse/dependent/ChainFinite.scala index 27a4829..a86dfe2 100644 --- a/src/main/scala/insynth/enumeration/reverse/dependent/ChainFinite.scala +++ b/src/main/scala/scife/enumeration/reverse/dependent/ChainFinite.scala @@ -1,8 +1,8 @@ -package insynth.enumeration +package scife.enumeration package reverse package dependent -import insynth.{ enumeration => e } +import scife.{ enumeration => e } import e.{ dependent => dp } class ChainFinite[I, O] diff --git a/src/main/scala/insynth/enumeration/reverse/dependent/DependReverse.scala b/src/main/scala/scife/enumeration/reverse/dependent/DependReverse.scala similarity index 78% rename from src/main/scala/insynth/enumeration/reverse/dependent/DependReverse.scala rename to src/main/scala/scife/enumeration/reverse/dependent/DependReverse.scala index 57fdc97..a18abad 100644 --- a/src/main/scala/insynth/enumeration/reverse/dependent/DependReverse.scala +++ b/src/main/scala/scife/enumeration/reverse/dependent/DependReverse.scala @@ -1,8 +1,8 @@ -package insynth.enumeration +package scife.enumeration package reverse package dependent -import insynth.enumeration.dependent._ +import scife.enumeration.dependent._ trait DependReverse[I, +O] extends DependFinite[I, O] { diff --git a/src/main/scala/insynth/enumeration/reverse/dependent/InMap.scala b/src/main/scala/scife/enumeration/reverse/dependent/InMap.scala similarity index 77% rename from src/main/scala/insynth/enumeration/reverse/dependent/InMap.scala rename to src/main/scala/scife/enumeration/reverse/dependent/InMap.scala index 9edc39d..673bc0e 100644 --- a/src/main/scala/insynth/enumeration/reverse/dependent/InMap.scala +++ b/src/main/scala/scife/enumeration/reverse/dependent/InMap.scala @@ -1,8 +1,8 @@ -package insynth.enumeration +package scife.enumeration package reverse package dependent -import insynth.{ enumeration => e } +import scife.{ enumeration => e } import scala.language.higherKinds diff --git a/src/main/scala/insynth/enumeration/reverse/dependent/Product.scala b/src/main/scala/scife/enumeration/reverse/dependent/Product.scala similarity index 65% rename from src/main/scala/insynth/enumeration/reverse/dependent/Product.scala rename to src/main/scala/scife/enumeration/reverse/dependent/Product.scala index a90ddee..e48141e 100644 --- a/src/main/scala/insynth/enumeration/reverse/dependent/Product.scala +++ b/src/main/scala/scife/enumeration/reverse/dependent/Product.scala @@ -1,10 +1,10 @@ -package insynth.enumeration +package scife.enumeration package reverse package dependent -import insynth.enumeration.{ combinators => ecomb } +import scife.enumeration.{ combinators => ecomb } -import insynth.util.logging._ +import scife.util.logging._ object Product { diff --git a/src/main/scala/insynth/enumeration/reverse/dependent/ProductFinite.scala b/src/main/scala/scife/enumeration/reverse/dependent/ProductFinite.scala similarity index 86% rename from src/main/scala/insynth/enumeration/reverse/dependent/ProductFinite.scala rename to src/main/scala/scife/enumeration/reverse/dependent/ProductFinite.scala index 60bc15a..fcca9fb 100644 --- a/src/main/scala/insynth/enumeration/reverse/dependent/ProductFinite.scala +++ b/src/main/scala/scife/enumeration/reverse/dependent/ProductFinite.scala @@ -1,8 +1,8 @@ -package insynth.enumeration +package scife.enumeration package reverse package dependent -import insynth.util.logging._ +import scife.util.logging._ case class ProductFinite[I, O1, O2] (s1: DependReverse[I, O1], s2: DependReverse[I, O2]) diff --git a/src/main/scala/insynth/enumeration/reverse/dependent/Reverser.scala b/src/main/scala/scife/enumeration/reverse/dependent/Reverser.scala similarity index 95% rename from src/main/scala/insynth/enumeration/reverse/dependent/Reverser.scala rename to src/main/scala/scife/enumeration/reverse/dependent/Reverser.scala index 1437c5d..f4ea1fa 100644 --- a/src/main/scala/insynth/enumeration/reverse/dependent/Reverser.scala +++ b/src/main/scala/scife/enumeration/reverse/dependent/Reverser.scala @@ -1,9 +1,9 @@ -package insynth.enumeration +package scife.enumeration package reverse package dependent -import insynth.enumeration.{ dependent => d } -import insynth.enumeration.{ memoization => m } +import scife.enumeration.{ dependent => d } +import scife.enumeration.{ memoization => m } import scala.reflect._ import scala.language.higherKinds diff --git a/src/main/scala/insynth/enumeration/types/Sequent.scala b/src/main/scala/scife/enumeration/types/Sequent.scala similarity index 63% rename from src/main/scala/insynth/enumeration/types/Sequent.scala rename to src/main/scala/scife/enumeration/types/Sequent.scala index 872ddcd..5e89988 100644 --- a/src/main/scala/insynth/enumeration/types/Sequent.scala +++ b/src/main/scala/scife/enumeration/types/Sequent.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package types trait Sequent[+A] extends Enum[A] \ No newline at end of file diff --git a/src/main/scala/insynth/enumeration/types/TraversableOnce.scala b/src/main/scala/scife/enumeration/types/TraversableOnce.scala similarity index 66% rename from src/main/scala/insynth/enumeration/types/TraversableOnce.scala rename to src/main/scala/scife/enumeration/types/TraversableOnce.scala index 7af809b..196fcf7 100644 --- a/src/main/scala/insynth/enumeration/types/TraversableOnce.scala +++ b/src/main/scala/scife/enumeration/types/TraversableOnce.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package types trait TraversableOnce[+A] extends Enum[A] \ No newline at end of file diff --git a/src/main/scala/insynth/enumeration/util/EnumStream.scala b/src/main/scala/scife/enumeration/util/EnumStream.scala similarity index 96% rename from src/main/scala/insynth/enumeration/util/EnumStream.scala rename to src/main/scala/scife/enumeration/util/EnumStream.scala index 56b89d8..4693c21 100644 --- a/src/main/scala/insynth/enumeration/util/EnumStream.scala +++ b/src/main/scala/scife/enumeration/util/EnumStream.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package util /** Same as Scala stream but strictly single-threaded, thus without synchronization */ diff --git a/src/main/scala/insynth/util/FreshNameGenerator.scala b/src/main/scala/scife/util/FreshNameGenerator.scala similarity index 93% rename from src/main/scala/insynth/util/FreshNameGenerator.scala rename to src/main/scala/scife/util/FreshNameGenerator.scala index 7bfcaf0..940f742 100644 --- a/src/main/scala/insynth/util/FreshNameGenerator.scala +++ b/src/main/scala/scife/util/FreshNameGenerator.scala @@ -1,4 +1,4 @@ -package insynth.util +package scife.util // NOTE can be solved with a functional solution (stream of variables, not so pretty) class FreshNameGenerator(initialString: String) { diff --git a/src/main/scala/insynth/util/Math.scala b/src/main/scala/scife/util/Math.scala similarity index 95% rename from src/main/scala/insynth/util/Math.scala rename to src/main/scala/scife/util/Math.scala index 079090a..3492723 100644 --- a/src/main/scala/insynth/util/Math.scala +++ b/src/main/scala/scife/util/Math.scala @@ -1,4 +1,4 @@ -package insynth.util +package scife.util object Math { diff --git a/src/main/scala/insynth/util/Stopwatch.scala b/src/main/scala/scife/util/Stopwatch.scala similarity index 98% rename from src/main/scala/insynth/util/Stopwatch.scala rename to src/main/scala/scife/util/Stopwatch.scala index 89eade6..f15be01 100644 --- a/src/main/scala/insynth/util/Stopwatch.scala +++ b/src/main/scala/scife/util/Stopwatch.scala @@ -1,4 +1,4 @@ -package insynth +package scife class StopwatchCollection(name: String) { var acc: Long = 0L diff --git a/src/main/scala/insynth/util/TernaryOperator.scala b/src/main/scala/scife/util/TernaryOperator.scala similarity index 92% rename from src/main/scala/insynth/util/TernaryOperator.scala rename to src/main/scala/scife/util/TernaryOperator.scala index 9f5c3ab..d23cb12 100644 --- a/src/main/scala/insynth/util/TernaryOperator.scala +++ b/src/main/scala/scife/util/TernaryOperator.scala @@ -1,4 +1,4 @@ -package insynth.util +package scife.util // enable implicit conversions import scala.language.implicitConversions diff --git a/src/main/scala/insynth/util/TimeOut.scala b/src/main/scala/scife/util/TimeOut.scala similarity index 92% rename from src/main/scala/insynth/util/TimeOut.scala rename to src/main/scala/scife/util/TimeOut.scala index 0743bef..bc88d25 100644 --- a/src/main/scala/insynth/util/TimeOut.scala +++ b/src/main/scala/scife/util/TimeOut.scala @@ -1,4 +1,4 @@ -package insynth.util +package scife.util class TimeOut(timeSlot:Long) { diff --git a/src/main/scala/insynth/util/format/Formatable.scala b/src/main/scala/scife/util/format/Formatable.scala similarity index 98% rename from src/main/scala/insynth/util/format/Formatable.scala rename to src/main/scala/scife/util/format/Formatable.scala index 9727660..9835b06 100644 --- a/src/main/scala/insynth/util/format/Formatable.scala +++ b/src/main/scala/scife/util/format/Formatable.scala @@ -1,4 +1,4 @@ -package insynth.util.format +package scife.util.format // enable implicit conversions import scala.language.implicitConversions diff --git a/src/main/scala/insynth/util/logging/CountedLogger.scala b/src/main/scala/scife/util/logging/CountedLogger.scala similarity index 97% rename from src/main/scala/insynth/util/logging/CountedLogger.scala rename to src/main/scala/scife/util/logging/CountedLogger.scala index 610cdcf..e49d1bf 100644 --- a/src/main/scala/insynth/util/logging/CountedLogger.scala +++ b/src/main/scala/scife/util/logging/CountedLogger.scala @@ -1,4 +1,4 @@ -package insynth.util.logging +package scife.util.logging import scala.collection._ diff --git a/src/main/scala/insynth/util/logging/DummyLogger.scala b/src/main/scala/scife/util/logging/DummyLogger.scala similarity index 95% rename from src/main/scala/insynth/util/logging/DummyLogger.scala rename to src/main/scala/scife/util/logging/DummyLogger.scala index 221b7a6..ca4e908 100644 --- a/src/main/scala/insynth/util/logging/DummyLogger.scala +++ b/src/main/scala/scife/util/logging/DummyLogger.scala @@ -1,4 +1,4 @@ -package insynth.util.logging +package scife.util.logging import scala.annotation._, elidable._ diff --git a/src/main/scala/insynth/util/logging/HasLogger.scala b/src/main/scala/scife/util/logging/HasLogger.scala similarity index 97% rename from src/main/scala/insynth/util/logging/HasLogger.scala rename to src/main/scala/scife/util/logging/HasLogger.scala index bac5ba0..cd37010 100644 --- a/src/main/scala/insynth/util/logging/HasLogger.scala +++ b/src/main/scala/scife/util/logging/HasLogger.scala @@ -1,4 +1,4 @@ -package insynth.util.logging +package scife.util.logging /** * Classes can mix this trait for having access to the "default" {{{logger}}}. diff --git a/src/main/scala/insynth/util/logging/LoggerFactory.scala b/src/main/scala/scife/util/logging/LoggerFactory.scala similarity index 96% rename from src/main/scala/insynth/util/logging/LoggerFactory.scala rename to src/main/scala/scife/util/logging/LoggerFactory.scala index baf2c21..5c1cf27 100644 --- a/src/main/scala/insynth/util/logging/LoggerFactory.scala +++ b/src/main/scala/scife/util/logging/LoggerFactory.scala @@ -1,4 +1,4 @@ -package insynth.util.logging +package scife.util.logging import scala.collection.mutable.{ Map => MutableMap } diff --git a/src/main/scala/insynth/util/logging/ProfileLogger.scala b/src/main/scala/scife/util/logging/ProfileLogger.scala similarity index 97% rename from src/main/scala/insynth/util/logging/ProfileLogger.scala rename to src/main/scala/scife/util/logging/ProfileLogger.scala index 50b53a7..4594d3b 100644 --- a/src/main/scala/insynth/util/logging/ProfileLogger.scala +++ b/src/main/scala/scife/util/logging/ProfileLogger.scala @@ -1,4 +1,4 @@ -package insynth.util.logging +package scife.util.logging import scala.collection._ diff --git a/src/test/java/insynth/enumeration/testcases/classdag/DAG.java b/src/test/java/scife/enumeration/testcases/classdag/DAG.java similarity index 99% rename from src/test/java/insynth/enumeration/testcases/classdag/DAG.java rename to src/test/java/scife/enumeration/testcases/classdag/DAG.java index 5ea3856..e70ce23 100644 --- a/src/test/java/insynth/enumeration/testcases/classdag/DAG.java +++ b/src/test/java/scife/enumeration/testcases/classdag/DAG.java @@ -1,4 +1,4 @@ -package insynth.enumeration.testcases.classdag; +package scife.enumeration.testcases.classdag; import java.util.HashMap; import java.util.HashSet; diff --git a/src/test/java/insynth/enumeration/testcases/classdag/DAGNode.java b/src/test/java/scife/enumeration/testcases/classdag/DAGNode.java similarity index 97% rename from src/test/java/insynth/enumeration/testcases/classdag/DAGNode.java rename to src/test/java/scife/enumeration/testcases/classdag/DAGNode.java index 3e81b52..490f367 100644 --- a/src/test/java/insynth/enumeration/testcases/classdag/DAGNode.java +++ b/src/test/java/scife/enumeration/testcases/classdag/DAGNode.java @@ -1,4 +1,4 @@ -package insynth.enumeration.testcases.classdag; +package scife.enumeration.testcases.classdag; diff --git a/src/test/java/insynth/enumeration/testcases/classinterfacedag/DAG.java b/src/test/java/scife/enumeration/testcases/classinterfacedag/DAG.java similarity index 99% rename from src/test/java/insynth/enumeration/testcases/classinterfacedag/DAG.java rename to src/test/java/scife/enumeration/testcases/classinterfacedag/DAG.java index 9ddc6ae..7820464 100644 --- a/src/test/java/insynth/enumeration/testcases/classinterfacedag/DAG.java +++ b/src/test/java/scife/enumeration/testcases/classinterfacedag/DAG.java @@ -1,4 +1,4 @@ -package insynth.enumeration.testcases.classinterfacedag; +package scife.enumeration.testcases.classinterfacedag; import java.util.HashMap; import java.util.HashSet; diff --git a/src/test/java/insynth/enumeration/testcases/classinterfacedag/DAGNode.java b/src/test/java/scife/enumeration/testcases/classinterfacedag/DAGNode.java similarity index 98% rename from src/test/java/insynth/enumeration/testcases/classinterfacedag/DAGNode.java rename to src/test/java/scife/enumeration/testcases/classinterfacedag/DAGNode.java index 6f032dd..64bd560 100644 --- a/src/test/java/insynth/enumeration/testcases/classinterfacedag/DAGNode.java +++ b/src/test/java/scife/enumeration/testcases/classinterfacedag/DAGNode.java @@ -1,4 +1,4 @@ -package insynth.enumeration.testcases.classinterfacedag; +package scife.enumeration.testcases.classinterfacedag; diff --git a/src/test/java/insynth/util/MemoryLeakTester.java b/src/test/java/scife/util/MemoryLeakTester.java similarity index 98% rename from src/test/java/insynth/util/MemoryLeakTester.java rename to src/test/java/scife/util/MemoryLeakTester.java index dd9d505..1e3bc27 100644 --- a/src/test/java/insynth/util/MemoryLeakTester.java +++ b/src/test/java/scife/util/MemoryLeakTester.java @@ -1,4 +1,4 @@ -package insynth.util; +package scife.util; import java.lang.ref.*; import java.util.*; diff --git a/src/test/scala/insynth/SolverTest.scala b/src/test/scala/insynth/SolverTest.scala deleted file mode 100644 index d6ca25b..0000000 --- a/src/test/scala/insynth/SolverTest.scala +++ /dev/null @@ -1,161 +0,0 @@ -package insynth - -import insynth._ -import insynth.testdomain._ -import insynth.common._ - -import org.scalatest._ - -class SolverTest extends FunSpec with GivenWhenThen with Matchers { - - import CommonDeclarations._ - import CommonSuccinctTypes._ - import insynth.util.ProofTreeOperations._ - - describe("Solver") { - - it("should be properly initialized") { - - val inputDeclarations = List(booleanDeclaration, functionBoolToIntDeclaration) - val queryBuilder = TestQueryBuilder(typeInt) - - Given("a solver") - val solver = new Solver( - inputDeclarations,queryBuilder - ) - - Then("queries should be appropriate") - solver.allDeclarations.toSet should equal (inputDeclarations.toSet) - solver.allDeclarations.size should equal (inputDeclarations.size) - solver.query.getReturnType should equal (queryBuilder.getQuery.getReturnType) - solver.query.getDeclaration should equal (queryBuilder.getQuery.getDeclaration) - solver.currentBuilder should equal (solver.initialBuilder) - } - - it("should compute valid a proof tree with bool->int, bool") { - val inputDeclarations = List(booleanDeclaration, functionBoolToIntDeclaration) - val queryBuilder = TestQueryBuilder(typeInt) - - Given("a solver") - val solver = new Solver( - inputDeclarations, queryBuilder - ) - - Then("returned proof trees should be appropriate") - val result = solver.getProofTree - result should not be (null) - result.getNodes should not be ('empty) - withClue( - breadthFirstSearchPrint(result.getNodes.head) - ) { - checkInhabitants(result, - StringNode(functionBoolToIntDeclaration.getSimpleName, Set( - StringNode(booleanDeclaration.getSimpleName) - ))) should be (true) - } - } - - it("should compute valid a proof tree with bool->int, int, int->int, bool") { - val inputDeclarations = List(booleanDeclaration, functionBoolToIntDeclaration, - functionIntToIntDeclaration, intDeclaration) - val queryBuilder = TestQueryBuilder(typeInt) - - Given("a solver") - val solver = new Solver( - inputDeclarations, queryBuilder - ) - - Then("returned proof tree should contain f1(bool)") - val result = solver.getProofTree - result should not be (null) - result.getNodes should not be ('empty) - withClue( - breadthFirstSearchPrint(result.getNodes.head) - ) { - checkInhabitants(result, - StringNode(functionBoolToIntDeclaration.getSimpleName, Set( - StringNode(booleanDeclaration.getSimpleName) - ))) should be (true) - } - - And("returned proof tree should contain f2(int), f2(f2(int), f2(f1(bool))") - withClue( - breadthFirstSearchPrint(result.getNodes.head) - ) { - checkInhabitants(result, - StringNode(functionIntToIntDeclaration.getSimpleName, Set( - StringNode(intDeclaration.getSimpleName), - StringNode(functionIntToIntDeclaration.getSimpleName, Set( - StringNode(intDeclaration.getSimpleName) - )), - StringNode(functionBoolToIntDeclaration.getSimpleName, Set( - StringNode(booleanDeclaration.getSimpleName) - )) - ))) should be (true) - } - } - - it("should be sensitive to timeout value") { - val inputDeclarations = List(booleanDeclaration, functionBoolToIntDeclaration, - functionIntToIntDeclaration, intDeclaration) - val queryBuilder = TestQueryBuilder(typeInt) - - Given("a solver with 0 timeout") - val solver = new Solver( - inputDeclarations, queryBuilder, 0 - ) - - Then("returned proof tree should be empty") - val result = solver.getProofTree - result should be (null) - } - - ignore("Fix this ASAP!") { - it("should compute valid a proof tree if function has to be created") { - val inputDeclarations = List(booleanDeclaration, unitDeclaration, - functionFunsToFunDeclaration) - val queryBuilder = TestQueryBuilder(typeInt) - - Given("a solver with 0 timeout") - val solver = new Solver( - inputDeclarations, queryBuilder - ) - - Then("returned proof tree should be empty") - val result = solver.getProofTree - result should not be (null) - result.getNodes should not be ('empty) - } - - it("should compute valid a proof tree if function has function parameters") { - val inputDeclarations = List(booleanDeclaration, functionBoolToIntDeclaration, - functionFun1ToUnitDeclaration, intDeclaration, functionFunsToFunDeclaration) - val queryBuilder = TestQueryBuilder(typeInt) - - Given("a solver with 0 timeout") - val solver = new Solver( - inputDeclarations, queryBuilder - ) - - Then("returned proof tree should be empty") - val result = solver.getProofTree - result should not be (null) - result.getNodes should not be ('empty) - - And("returned proof tree should contain (ff(f1, f2))(int)") - withClue( - breadthFirstSearchPrint(result.getNodes.head) - ) { - checkInhabitants(result, - StringNode(functionFunsToFunDeclaration.getSimpleName, Set( - StringNode(intDeclaration.getSimpleName), - StringNode(functionBoolToIntDeclaration.getSimpleName), - StringNode(functionFun1ToUnitDeclaration.getSimpleName) - ))) should be (true) - } - } - } - - } - -} \ No newline at end of file diff --git a/src/test/scala/insynth/common/CommonDeclarations.scala b/src/test/scala/insynth/common/CommonDeclarations.scala deleted file mode 100644 index d7f183a..0000000 --- a/src/test/scala/insynth/common/CommonDeclarations.scala +++ /dev/null @@ -1,35 +0,0 @@ -package insynth.common - -import insynth.structures._ - -import insynth.testdomain._ - -object CommonDeclarations { - - import CommonDomainTypes._ - - val booleanDeclaration = TestDeclaration(typeBoolean) - val intDeclaration = TestDeclaration(typeInt) - val unitDeclaration = TestDeclaration(typeUnit) - - val functionBoolToIntDeclaration = TestDeclaration( - functionBoolToIntType - ) - - val functionFun1ToUnitDeclaration = TestDeclaration( - functionFun1ToUnitType - ) - - val functionIntToIntDeclaration = TestDeclaration( - functionIntToIntType - ) - - val threeParFunctionDeclaration = TestDeclaration( - threeParFunctionType - ) - - val functionFunsToFunDeclaration = TestDeclaration( - functionFunsToFunType - ) - -} \ No newline at end of file diff --git a/src/test/scala/insynth/common/CommonDomainTypes.scala b/src/test/scala/insynth/common/CommonDomainTypes.scala deleted file mode 100644 index 40ef1a9..0000000 --- a/src/test/scala/insynth/common/CommonDomainTypes.scala +++ /dev/null @@ -1,27 +0,0 @@ -package insynth.common - -import insynth.structures._ - -object CommonDomainTypes { - - val typeInt = Atom(Const("Int")) - val typeString = Atom(Const("String")) - val typeBoolean = Atom(Const("Boolean")) - val typeUnit = Atom(Const("Unit")) - - val functionBoolToIntType = - Function(List(typeBoolean), typeInt) - - val functionFun1ToUnitType = - Function(List(typeUnit, typeInt), typeBoolean) - - val functionIntToIntType = - Function(List(typeInt), typeInt) - - val threeParFunctionType = - Function(List(typeInt, typeInt, typeBoolean), typeInt) - - val functionFunsToFunType = - Function(List(functionBoolToIntType, functionFun1ToUnitType), functionIntToIntType) - -} \ No newline at end of file diff --git a/src/test/scala/insynth/common/CommonProofTrees.scala b/src/test/scala/insynth/common/CommonProofTrees.scala deleted file mode 100644 index 5963132..0000000 --- a/src/test/scala/insynth/common/CommonProofTrees.scala +++ /dev/null @@ -1,217 +0,0 @@ -package insynth.common - -import scala.collection.mutable.{ Map => MutableMap, Set => MutableSet } - -import org.junit.Assert._ -import org.junit.Test -import org.junit.Ignore - -import insynth.structures._ - -import insynth.testdomain.{ TestQueryBuilder => QueryBuilder, _ } - -object CommonProofTrees { - - import CommonDeclarations._ - import CommonSuccinctTypes._ - - val intNode = - new SimpleNode( - List(intDeclaration), - MutableMap.empty) - - def exampleBoolToInt = { - val queryBuilder = new QueryBuilder(typeInt) - - val query = queryBuilder.getQuery - - val queryDeclaration = query.getDeclaration - - val getBooleanNode = - new SimpleNode( - List(booleanDeclaration), - MutableMap.empty) - - val getIntNode = - new SimpleNode( - List(functionBoolToIntDeclaration), - MutableMap( // for each parameter type - how can we resolve it - Const("Boolean") -> - new ContainerNode( - MutableSet(getBooleanNode)))) - - val queryNode = - new SimpleNode( - List(queryDeclaration), - MutableMap( // for each parameter type - how can we resolve it - Const("Int") -> - new ContainerNode( - MutableSet(getIntNode)))) - - (queryNode, query) - } - - def exampleIntToInt = { - val queryBuilder = new QueryBuilder(typeInt) - - val query = queryBuilder.getQuery - - val queryDeclaration = query.getDeclaration - - val getIntNode = - new SimpleNode( - List(functionIntToIntDeclaration), - MutableMap()) - - getIntNode.getParams += - ( - Const("Int") -> - new ContainerNode( - MutableSet(intNode, getIntNode))) - - val queryNode = - new SimpleNode( - List(queryDeclaration), - MutableMap( // for each parameter type - how can we resolve it - Const("Int") -> - new ContainerNode( - MutableSet(getIntNode)))) - - queryNode - } - - - def exampleIntToIntBool = { - val queryBuilder = new QueryBuilder(typeInt) - - val query = queryBuilder.getQuery - - val queryDeclaration = query.getDeclaration - - val getBooleanNode = - new SimpleNode( - List(booleanDeclaration), - MutableMap.empty) - - val getIntNodeFromBoolean = - new SimpleNode( - List(functionBoolToIntDeclaration), - MutableMap( // for each parameter type - how can we resolve it - Const("Boolean") -> - new ContainerNode( - MutableSet(getBooleanNode)))) - - val getIntNodeFromIntToInt = - new SimpleNode( - List(functionIntToIntDeclaration), - MutableMap()) - - getIntNodeFromIntToInt.getParams += - ( - Const("Int") -> - new ContainerNode( - MutableSet(getIntNodeFromBoolean, getIntNodeFromIntToInt))) - - val queryNode = - new SimpleNode( - List(queryDeclaration), - MutableMap( // for each parameter type - how can we resolve it - Const("Int") -> - new ContainerNode( - MutableSet(getIntNodeFromBoolean, getIntNodeFromIntToInt)))) - - queryNode - } - - - def exampleIntToIntBoth = { - val queryBuilder = new QueryBuilder(typeInt) - - val query = queryBuilder.getQuery - - val queryDeclaration = query.getDeclaration - - val intNode = - new SimpleNode( - List(intDeclaration), - MutableMap.empty) - - val getBooleanNode = - new SimpleNode( - List(booleanDeclaration), - MutableMap.empty) - - val getIntNodeFromBoolean = - new SimpleNode( - List(functionBoolToIntDeclaration), - MutableMap( // for each parameter type - how can we resolve it - Const("Boolean") -> - new ContainerNode( - MutableSet(getBooleanNode)))) - - val getIntNodeFromIntToInt = - new SimpleNode( - List(functionIntToIntDeclaration), - MutableMap()) - - getIntNodeFromIntToInt.getParams += - ( - Const("Int") -> - new ContainerNode( - MutableSet(intNode, getIntNodeFromBoolean, getIntNodeFromIntToInt))) - - val queryNode = - new SimpleNode( - List(queryDeclaration), - MutableMap( // for each parameter type - how can we resolve it - Const("Int") -> - new ContainerNode( - MutableSet(getIntNodeFromBoolean, getIntNodeFromIntToInt)))) - - queryNode - } - - // TODO do if we need abstraction (high-order functions) -// def exampleFunctionIntToInt = { -// val queryBuilder = new QueryBuilder(FunctionType(List(typeInt), typeInt)) -// -// val query = queryBuilder.getQuery -// -// val queryDeclaration = query.getDeclaration -// -// val getBooleanNode = -// new SimpleNode( -// List(booleanDeclaration), -// MutableMap.empty) -// -// val getIntNodeFromBoolean = -// new SimpleNode( -// List(functionBoolToIntDeclaration), -// MutableMap( // for each parameter type - how can we resolve it -// Const("Boolean") -> -// new ContainerNode( -// MutableSet(getBooleanNode)))) -// -// val getIntNodeFromIntToInt = -// new SimpleNode( -// List(functionIntToIntDeclaration), -// MutableMap()) -// -// getIntNodeFromIntToInt.getParams += -// ( -// Const("Int") -> -// new ContainerNode( -// MutableSet(getIntNodeFromBoolean, getIntNodeFromIntToInt))) -// -// val queryNode = -// new SimpleNode( -// List(queryDeclaration), -// MutableMap( // for each parameter type - how can we resolve it -// Const("Int") -> -// new ContainerNode( -// MutableSet(getIntNodeFromBoolean, getIntNodeFromIntToInt)))) -// -// queryNode -// } - -} \ No newline at end of file diff --git a/src/test/scala/insynth/common/CommonSuccinctTypes.scala b/src/test/scala/insynth/common/CommonSuccinctTypes.scala deleted file mode 100644 index 771404f..0000000 --- a/src/test/scala/insynth/common/CommonSuccinctTypes.scala +++ /dev/null @@ -1,24 +0,0 @@ -package insynth.common - -import insynth.structures._ - -object CommonSuccinctTypes { - - val typeInt = Const("Int") - val typeString = Const("String") - val typeBoolean = Const("Boolean") - val typeUnit = Const("Unit") - - val functionBoolToIntType = - Arrow(TSet(typeBoolean), typeInt) - - val functionFun1ToUnitType = - Arrow(TSet(typeUnit, typeInt), typeBoolean) - - val functionIntToIntType = - Arrow(TSet(typeInt), typeInt) - - val functionFunsToFunType = - Arrow(TSet(functionBoolToIntType, functionFun1ToUnitType, typeInt), typeInt) - -} \ No newline at end of file diff --git a/src/test/scala/insynth/load/DeclarationTest.scala b/src/test/scala/insynth/load/DeclarationTest.scala deleted file mode 100644 index 196d0ec..0000000 --- a/src/test/scala/insynth/load/DeclarationTest.scala +++ /dev/null @@ -1,34 +0,0 @@ -package insynth.load - -import org.scalatest._ - -import insynth.testdomain._ -import insynth.common._ - -class DeclarationTest extends FunSuite with Matchers { - - import CommonDeclarations._ - val dt = CommonDomainTypes - val st = CommonSuccinctTypes - - test("declarations build from domain types and corresponding sucinct types should match") { - booleanDeclaration should equal(TestDeclaration(dt.typeBoolean, st.typeBoolean)) - intDeclaration should equal(TestDeclaration(dt.typeInt, st.typeInt)) - unitDeclaration should equal(TestDeclaration(dt.typeUnit, st.typeUnit)) - - functionBoolToIntDeclaration should equal(TestDeclaration(dt.functionBoolToIntType, st.functionBoolToIntType)) - functionFun1ToUnitDeclaration should equal(TestDeclaration(dt.functionFun1ToUnitType, st.functionFun1ToUnitType)) - functionIntToIntDeclaration should equal(TestDeclaration(dt.functionIntToIntType, st.functionIntToIntType)) - - functionFunsToFunDeclaration should equal(TestDeclaration(dt.functionFunsToFunType, st.functionFunsToFunType)) - } - - test("declarations should have default weight 1.0f") { - booleanDeclaration should equal(TestDeclaration(dt.typeBoolean, st.typeBoolean, 1f)) - } - - test("declarations created through factory methods should be the same") { - TestDeclaration(dt.typeInt) should equal (TestDeclaration(dt.typeInt)) - TestDeclaration(dt.typeInt, "name") should equal (TestDeclaration(dt.typeInt, "name")) - } -} \ No newline at end of file diff --git a/src/test/scala/insynth/load/DeclarationTestJUnit.scala b/src/test/scala/insynth/load/DeclarationTestJUnit.scala deleted file mode 100644 index 0a164ea..0000000 --- a/src/test/scala/insynth/load/DeclarationTestJUnit.scala +++ /dev/null @@ -1,23 +0,0 @@ -package insynth.load - -import org.scalatest.junit.JUnitSuite -import org.junit.{ Test, Ignore } -import org.junit.Assert._ - -import insynth.testdomain._ -import insynth.common._ - -// just to be sure JUnit behaves as expected -class DeclarationTestJUnit extends JUnitSuite { - - import CommonDeclarations._ - val dt = CommonDomainTypes - val st = CommonSuccinctTypes - - @Test - def declarationsThroughFactoryMethods { - assertEquals(TestDeclaration(dt.typeInt), TestDeclaration(dt.typeInt)) - assertEquals(TestDeclaration(dt.typeInt, "name"), TestDeclaration(dt.typeInt, "name")) - } - -} \ No newline at end of file diff --git a/src/test/scala/insynth/structures/DomainTypeTest.scala b/src/test/scala/insynth/structures/DomainTypeTest.scala deleted file mode 100644 index c1181ed..0000000 --- a/src/test/scala/insynth/structures/DomainTypeTest.scala +++ /dev/null @@ -1,44 +0,0 @@ -package insynth.structures - -import scala.util.Random - -import org.scalatest._ - -// enable implicit conversions -import scala.language.implicitConversions - -class DomainTypeTest extends FunSuite with Matchers { - - implicit def singletonList(x: DomainType) = List(x) - implicit def singletonTSet(x: SuccinctType) = TSet(x) - - val stringType = Const("String") - val intType = Const("Int") - - val stringAtom = Atom(stringType) - val intAtom = Atom(intType) - - val fun1 = Function(stringAtom, intAtom) - val fun2 = Function(intAtom, stringAtom) - - val funFun1 = Function(stringAtom, fun2) - val funFun2 = Function(List(fun1, fun2), intAtom) - val funFun3 = Function(List(fun1, fun2), fun2) - - test("transform to succinct type of simple types") { - stringAtom.toSuccinctType should be (stringType) - intAtom.toSuccinctType should be (intType) - } - - test("transform to succinct type of function types") { - fun1.toSuccinctType should be (Arrow(stringType, intType)) - fun2.toSuccinctType should be (Arrow(intType, stringType)) - } - - test("transform to succinct type of function types with function arguments") { - funFun1.toSuccinctType should be (Arrow(TSet(stringType, intType), stringType)) - funFun2.toSuccinctType should be (Arrow(TSet(Arrow(stringType, intType), Arrow(intType, stringType)), intType)) - funFun3.toSuccinctType should be (Arrow(TSet(Arrow(stringType, intType), Arrow(intType, stringType), intType), stringType)) - } - -} \ No newline at end of file diff --git a/src/test/scala/insynth/structures/SuccinctTypeTest.scala b/src/test/scala/insynth/structures/SuccinctTypeTest.scala deleted file mode 100644 index 10e226a..0000000 --- a/src/test/scala/insynth/structures/SuccinctTypeTest.scala +++ /dev/null @@ -1,57 +0,0 @@ -package insynth.structures - -import org.scalatest.junit.JUnitSuite - -import org.junit.Assert._ -import org.junit.Test - -class SuccinctTypeTest extends JUnitSuite { - - @Test - def testTree1 { - assertEquals (Const("A"),Const("A")) - } - - @Test - def testTree2 { - assertEquals (TSet(List(Const("A"),Const("B"))),TSet(List(Const("A"),Const("B")))) - } - - @Test - def testTree3 { - assert (TSet(List(Const("A"),Const("B"))) equals TSet(List(Const("A"),Const("B")))) - } - - - @Test - def testTree4 { - assert (TSet(List(Const("A"),Const("B"))) == TSet(List(Const("A"),Const("B")))) - } - - @Test - def testTree5 { - assert (TSet(List.empty[SuccinctType]) == TSet(List.empty[SuccinctType])) - } - - - @Test - def testTree6 { - assert (TSet(List(Const("A"))) subsetOf TSet(List(Const("A"),Const("B")))) - } - - @Test - def testTree7 { - assert (TSet(List()) subsetOf TSet(List(Const("A"),Const("B")))) - } - - @Test - def testTree8 { - assert (TSet(List(Const("A"),Const("B"))) subsetOf TSet(List(Const("A"),Const("B")))) - } - - @Test - def testTree9 { - assert (TSet(List(Const("B"), Const("A"))) subsetOf TSet(List(Const("A"),Const("B")))) - } - -} \ No newline at end of file diff --git a/src/test/scala/insynth/testdomain/TestDeclaration.scala b/src/test/scala/insynth/testdomain/TestDeclaration.scala deleted file mode 100644 index f8f4dd2..0000000 --- a/src/test/scala/insynth/testdomain/TestDeclaration.scala +++ /dev/null @@ -1,36 +0,0 @@ -package insynth -package testdomain - -import insynth.structures._ -import insynth.structures.Weight._ - -// need name to differentiate declarations if needed -case class TestDeclaration( - domainType: DomainType, override val inSynthType: SuccinctType, - name: String = "testDeclaration", override val weight: Weight = 1.0f -) -extends insynth.load.Declaration(inSynthType, weight) { - - def this(domainType: DomainType, name: String = "testDeclaration", weight: Weight = 1.0f) = - this(domainType, domainType.toSuccinctType, name, weight) - - override def getSimpleName = name + ":" + domainType.toString// + - //"(" + inSynthType.toString + ")" + weight - - override def getDomainType = domainType - -} - -object TestDeclaration { - def apply(domainType: DomainType, succinctType: SuccinctType, weight: Weight) = - new TestDeclaration(domainType, succinctType, "testDeclaration", weight) - - def apply(domainType: DomainType, weight: Weight) = - new TestDeclaration(domainType, "testDeclaration", weight) - - def apply(domainType: DomainType, name: String) = - new TestDeclaration(domainType, name) - - def apply(domainType: DomainType) = - new TestDeclaration(domainType) -} \ No newline at end of file diff --git a/src/test/scala/insynth/testdomain/TestQuery.scala b/src/test/scala/insynth/testdomain/TestQuery.scala deleted file mode 100644 index 89b6c1b..0000000 --- a/src/test/scala/insynth/testdomain/TestQuery.scala +++ /dev/null @@ -1,17 +0,0 @@ -package insynth -package testdomain - -import insynth.query._ -import insynth.engine.InitialSender -import insynth.structures.SuccinctType - -case class TestQuery(override val inSynthRetType: SuccinctType, decl: TestDeclaration, sender: InitialSender) -extends Query(inSynthRetType) { - - def getSolution = sender.getAnswers - - def getDeclaration = decl - - def getSender = sender - -} \ No newline at end of file diff --git a/src/test/scala/insynth/testdomain/TestQueryBuilder.scala b/src/test/scala/insynth/testdomain/TestQueryBuilder.scala deleted file mode 100644 index 2499f01..0000000 --- a/src/test/scala/insynth/testdomain/TestQueryBuilder.scala +++ /dev/null @@ -1,18 +0,0 @@ -package insynth -package testdomain - -import insynth.query._ -import insynth.structures._ -import insynth.engine._ - -case class TestQueryBuilder(goalType: SuccinctType) extends QueryBuilder(goalType) { - - val inSynthRetType = BottomType - val inSynthType = Arrow(TSet(tpe), inSynthRetType) - - val domainRetType = Atom(BottomType) - val domainType = Function(List(Atom(goalType)), domainRetType) - - def getQuery = TestQuery(inSynthRetType, TestDeclaration(domainType), new InitialSender()) - -} \ No newline at end of file diff --git a/src/test/scala/insynth/enumeration/CombinatorsTest.scala b/src/test/scala/scife/enumeration/CombinatorsTest.scala similarity index 99% rename from src/test/scala/insynth/enumeration/CombinatorsTest.scala rename to src/test/scala/scife/enumeration/CombinatorsTest.scala index 28eb40e..dd67552 100644 --- a/src/test/scala/insynth/enumeration/CombinatorsTest.scala +++ b/src/test/scala/scife/enumeration/CombinatorsTest.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration import lzy._ diff --git a/src/test/scala/insynth/enumeration/EnumStreamTest.scala b/src/test/scala/scife/enumeration/EnumStreamTest.scala similarity index 96% rename from src/test/scala/insynth/enumeration/EnumStreamTest.scala rename to src/test/scala/scife/enumeration/EnumStreamTest.scala index 78c97e9..7e4af93 100644 --- a/src/test/scala/insynth/enumeration/EnumStreamTest.scala +++ b/src/test/scala/scife/enumeration/EnumStreamTest.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration import util.EnumStream diff --git a/src/test/scala/insynth/enumeration/EnumTest.scala b/src/test/scala/scife/enumeration/EnumTest.scala similarity index 98% rename from src/test/scala/insynth/enumeration/EnumTest.scala rename to src/test/scala/scife/enumeration/EnumTest.scala index 41923e6..cf9acf8 100644 --- a/src/test/scala/insynth/enumeration/EnumTest.scala +++ b/src/test/scala/scife/enumeration/EnumTest.scala @@ -1,4 +1,4 @@ -package insynth +package scife package enumeration import org.scalatest._ diff --git a/src/test/scala/insynth/enumeration/FiniteTest.scala b/src/test/scala/scife/enumeration/FiniteTest.scala similarity index 97% rename from src/test/scala/insynth/enumeration/FiniteTest.scala rename to src/test/scala/scife/enumeration/FiniteTest.scala index ffba7db..e726551 100644 --- a/src/test/scala/insynth/enumeration/FiniteTest.scala +++ b/src/test/scala/scife/enumeration/FiniteTest.scala @@ -1,4 +1,4 @@ -package insynth +package scife package enumeration import org.scalatest._ diff --git a/src/test/scala/insynth/enumeration/SingletonTest.scala b/src/test/scala/scife/enumeration/SingletonTest.scala similarity index 95% rename from src/test/scala/insynth/enumeration/SingletonTest.scala rename to src/test/scala/scife/enumeration/SingletonTest.scala index f30f4e3..fa873b4 100644 --- a/src/test/scala/insynth/enumeration/SingletonTest.scala +++ b/src/test/scala/scife/enumeration/SingletonTest.scala @@ -1,4 +1,4 @@ -package insynth +package scife package enumeration import org.scalatest._ diff --git a/src/test/scala/insynth/enumeration/Util.scala b/src/test/scala/scife/enumeration/Util.scala similarity index 98% rename from src/test/scala/insynth/enumeration/Util.scala rename to src/test/scala/scife/enumeration/Util.scala index cda08cc..738cb5f 100644 --- a/src/test/scala/insynth/enumeration/Util.scala +++ b/src/test/scala/scife/enumeration/Util.scala @@ -1,4 +1,4 @@ -package insynth +package scife package enumeration import org.scalatest._ diff --git a/src/test/scala/insynth/enumeration/benchmarks/DependentBenchmark.scala b/src/test/scala/scife/enumeration/benchmarks/DependentBenchmark.scala similarity index 97% rename from src/test/scala/insynth/enumeration/benchmarks/DependentBenchmark.scala rename to src/test/scala/scife/enumeration/benchmarks/DependentBenchmark.scala index 913c167..27078bb 100644 --- a/src/test/scala/insynth/enumeration/benchmarks/DependentBenchmark.scala +++ b/src/test/scala/scife/enumeration/benchmarks/DependentBenchmark.scala @@ -1,16 +1,16 @@ -package insynth +package scife package enumeration package benchmarks import org.scalameter.api._ import org.scalameter.reporting.DsvReporter -import insynth.{ enumeration => e } +import scife.{ enumeration => e } import dependent._ import memoization._ -import insynth.util._ -import insynth.util.logging._ +import scife.util._ +import scife.util.logging._ trait DependentMemoizedBenchmark[I, DepEnumType] extends PerformanceTest.OfflineReport with java.io.Serializable with HasLogger { diff --git a/src/test/scala/insynth/enumeration/benchmarks/StructuresBenchmark.scala b/src/test/scala/scife/enumeration/benchmarks/StructuresBenchmark.scala similarity index 78% rename from src/test/scala/insynth/enumeration/benchmarks/StructuresBenchmark.scala rename to src/test/scala/scife/enumeration/benchmarks/StructuresBenchmark.scala index 5c85880..15060b3 100644 --- a/src/test/scala/insynth/enumeration/benchmarks/StructuresBenchmark.scala +++ b/src/test/scala/scife/enumeration/benchmarks/StructuresBenchmark.scala @@ -1,4 +1,4 @@ -package insynth +package scife package enumeration package benchmarks @@ -7,10 +7,10 @@ import org.scalameter.api._ 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._ trait StructuresBenchmark[DepEnumType] extends DependentMemoizedBenchmark[Int, DepEnumType] { diff --git a/src/test/scala/insynth/enumeration/benchmarks/test/BinarySearchTreeBenchmarkTest.scala b/src/test/scala/scife/enumeration/benchmarks/test/BinarySearchTreeBenchmarkTest.scala similarity index 96% rename from src/test/scala/insynth/enumeration/benchmarks/test/BinarySearchTreeBenchmarkTest.scala rename to src/test/scala/scife/enumeration/benchmarks/test/BinarySearchTreeBenchmarkTest.scala index c5a18b0..a8ff5ab 100644 --- a/src/test/scala/insynth/enumeration/benchmarks/test/BinarySearchTreeBenchmarkTest.scala +++ b/src/test/scala/scife/enumeration/benchmarks/test/BinarySearchTreeBenchmarkTest.scala @@ -1,14 +1,14 @@ -package insynth +package scife package enumeration package benchmarks package test 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 @@ import scala.language.existentials class BinarySearchTreeBenchmarkTest extends FunSuite with Matchers with GeneratorDrivenPropertyChecks with HasLogger with ProfileLogger { - import common._ - import Util.CheckerHelper + import Util.CheckerHelper import Checks._ test("correctness") { diff --git a/src/test/scala/insynth/enumeration/benchmarks/test/BinarySearchTreeCompBenchmarkTest.scala b/src/test/scala/scife/enumeration/benchmarks/test/BinarySearchTreeCompBenchmarkTest.scala similarity index 95% rename from src/test/scala/insynth/enumeration/benchmarks/test/BinarySearchTreeCompBenchmarkTest.scala rename to src/test/scala/scife/enumeration/benchmarks/test/BinarySearchTreeCompBenchmarkTest.scala index af503a4..29669d9 100644 --- a/src/test/scala/insynth/enumeration/benchmarks/test/BinarySearchTreeCompBenchmarkTest.scala +++ b/src/test/scala/scife/enumeration/benchmarks/test/BinarySearchTreeCompBenchmarkTest.scala @@ -1,14 +1,14 @@ -package insynth +package scife package enumeration package benchmarks package test 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._ @@ -23,8 +23,7 @@ import scala.language.postfixOps class BinarySearchTreeCompBenchmarkTest extends FunSuite with Matchers with GeneratorDrivenPropertyChecks with HasLogger with ProfileLogger { - import common._ - import Util.CheckerHelper + import Util.CheckerHelper import Checks._ type Output = Tree//(List[Int], Tree) diff --git a/src/test/scala/insynth/enumeration/benchmarks/test/BinarySearchTreeOld.scala b/src/test/scala/scife/enumeration/benchmarks/test/BinarySearchTreeOld.scala similarity index 95% rename from src/test/scala/insynth/enumeration/benchmarks/test/BinarySearchTreeOld.scala rename to src/test/scala/scife/enumeration/benchmarks/test/BinarySearchTreeOld.scala index d45db8b..d7b1c3e 100644 --- a/src/test/scala/insynth/enumeration/benchmarks/test/BinarySearchTreeOld.scala +++ b/src/test/scala/scife/enumeration/benchmarks/test/BinarySearchTreeOld.scala @@ -1,14 +1,14 @@ -package insynth +package scife package enumeration package benchmarks package test 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._ @@ -23,8 +23,7 @@ class BinarySearchTreeBenchmarkOld //extends PerformanceTest.Quickbenchmark with Matchers with HasLogger with ProfileLogger { - import common._ - import Structures._ + import Structures._ import BSTrees._ performance of "scife enumerators" in { diff --git a/src/test/scala/insynth/enumeration/benchmarks/test/HeapArrayBenchmark.scala b/src/test/scala/scife/enumeration/benchmarks/test/HeapArrayBenchmark.scala similarity index 92% rename from src/test/scala/insynth/enumeration/benchmarks/test/HeapArrayBenchmark.scala rename to src/test/scala/scife/enumeration/benchmarks/test/HeapArrayBenchmark.scala index 0a742e6..3bdf845 100644 --- a/src/test/scala/insynth/enumeration/benchmarks/test/HeapArrayBenchmark.scala +++ b/src/test/scala/scife/enumeration/benchmarks/test/HeapArrayBenchmark.scala @@ -1,13 +1,13 @@ -//package insynth +//package scife //package enumeration -//package insynth.enumeration.benchmarks.test +//package scife.enumeration.benchmarks.test // //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 @@ // extends StructuresBenchmark[Depend[(Int, Array[Int]), Tree]] //// extends DependentMemoizedBenchmark[Int, Depend[(Int, List[Int]), Tree]] // with java.io.Serializable with HasLogger { -// import common._ -// import e.Enum +// // import e.Enum // // override def name = "HeapArray" // diff --git a/src/test/scala/insynth/enumeration/benchmarks/test/RedBlackTreeDependentBenchmarkTest.scala b/src/test/scala/scife/enumeration/benchmarks/test/RedBlackTreeDependentBenchmarkTest.scala similarity index 97% rename from src/test/scala/insynth/enumeration/benchmarks/test/RedBlackTreeDependentBenchmarkTest.scala rename to src/test/scala/scife/enumeration/benchmarks/test/RedBlackTreeDependentBenchmarkTest.scala index 5de328a..a208b86 100644 --- a/src/test/scala/insynth/enumeration/benchmarks/test/RedBlackTreeDependentBenchmarkTest.scala +++ b/src/test/scala/scife/enumeration/benchmarks/test/RedBlackTreeDependentBenchmarkTest.scala @@ -1,14 +1,14 @@ -package insynth +package scife package enumeration package benchmarks package test 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.RedBlackTrees._ @@ -22,8 +22,7 @@ import scala.language.existentials class RedBlackTreeDependentBenchmarkTest extends FunSuite with Matchers with GeneratorDrivenPropertyChecks with HasLogger with ProfileLogger { - import common._ - import Util._ + import Util._ import Checks._ def checker(seq: Seq[Tree]) { diff --git a/src/test/scala/insynth/enumeration/benchmarks/test/SortedListDependentBenchmark.scala b/src/test/scala/scife/enumeration/benchmarks/test/SortedListDependentBenchmark.scala similarity index 95% rename from src/test/scala/insynth/enumeration/benchmarks/test/SortedListDependentBenchmark.scala rename to src/test/scala/scife/enumeration/benchmarks/test/SortedListDependentBenchmark.scala index 30cca90..29c4184 100644 --- a/src/test/scala/insynth/enumeration/benchmarks/test/SortedListDependentBenchmark.scala +++ b/src/test/scala/scife/enumeration/benchmarks/test/SortedListDependentBenchmark.scala @@ -1,13 +1,13 @@ -//package insynth +//package scife //package enumeration -//package insynth.enumeration.benchmarks.test +//package scife.enumeration.benchmarks.test // //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/src/test/scala/insynth/enumeration/dependent/ChainTest.scala b/src/test/scala/scife/enumeration/dependent/ChainTest.scala similarity index 83% rename from src/test/scala/insynth/enumeration/dependent/ChainTest.scala rename to src/test/scala/scife/enumeration/dependent/ChainTest.scala index dddca8e..e722582 100644 --- a/src/test/scala/insynth/enumeration/dependent/ChainTest.scala +++ b/src/test/scala/scife/enumeration/dependent/ChainTest.scala @@ -1,7 +1,7 @@ -package insynth.enumeration +package scife.enumeration package dependent -import _root_.insynth.{ enumeration => e } +import _root_.scife.{ enumeration => e } import org.scalatest._ import util._ diff --git a/src/test/scala/insynth/enumeration/dependent/CombinationsTest.scala b/src/test/scala/scife/enumeration/dependent/CombinationsTest.scala similarity index 99% rename from src/test/scala/insynth/enumeration/dependent/CombinationsTest.scala rename to src/test/scala/scife/enumeration/dependent/CombinationsTest.scala index 3571f62..0cddc90 100644 --- a/src/test/scala/insynth/enumeration/dependent/CombinationsTest.scala +++ b/src/test/scala/scife/enumeration/dependent/CombinationsTest.scala @@ -1,13 +1,13 @@ -package insynth +package scife package enumeration package dependent -import _root_.insynth.{ enumeration => e } +import _root_.scife.{ enumeration => e } import org.scalatest._ class CombinationsTest extends FunSuite with Matchers { - import insynth.util.Checks._ + import scife.util.Checks._ import Util._ test("sorted lists") { diff --git a/src/test/scala/insynth/enumeration/dependent/DependentTest.scala b/src/test/scala/scife/enumeration/dependent/DependentTest.scala similarity index 97% rename from src/test/scala/insynth/enumeration/dependent/DependentTest.scala rename to src/test/scala/scife/enumeration/dependent/DependentTest.scala index c52dbe6..6ea4ff8 100644 --- a/src/test/scala/insynth/enumeration/dependent/DependentTest.scala +++ b/src/test/scala/scife/enumeration/dependent/DependentTest.scala @@ -1,4 +1,4 @@ -package insynth +package scife package enumeration package dependent diff --git a/src/test/scala/insynth/enumeration/lzy/ConcatFiniteTest.scala b/src/test/scala/scife/enumeration/lzy/ConcatFiniteTest.scala similarity index 96% rename from src/test/scala/insynth/enumeration/lzy/ConcatFiniteTest.scala rename to src/test/scala/scife/enumeration/lzy/ConcatFiniteTest.scala index 739f955..de040f3 100644 --- a/src/test/scala/insynth/enumeration/lzy/ConcatFiniteTest.scala +++ b/src/test/scala/scife/enumeration/lzy/ConcatFiniteTest.scala @@ -1,7 +1,7 @@ -package insynth.enumeration +package scife.enumeration package lzy -import insynth.util.RunnableJUnit +import scife.util.RunnableJUnit import org.scalatest._ class ConcatFiniteTest extends FunSuite with Matchers with RunnableJUnit { diff --git a/src/test/scala/insynth/enumeration/lzy/ProductFiniteTest.scala b/src/test/scala/scife/enumeration/lzy/ProductFiniteTest.scala similarity index 92% rename from src/test/scala/insynth/enumeration/lzy/ProductFiniteTest.scala rename to src/test/scala/scife/enumeration/lzy/ProductFiniteTest.scala index 691b039..b206c09 100644 --- a/src/test/scala/insynth/enumeration/lzy/ProductFiniteTest.scala +++ b/src/test/scala/scife/enumeration/lzy/ProductFiniteTest.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package lzy import org.scalatest._ diff --git a/src/test/scala/insynth/enumeration/lzy/ProductInfiniteTest.scala b/src/test/scala/scife/enumeration/lzy/ProductInfiniteTest.scala similarity index 94% rename from src/test/scala/insynth/enumeration/lzy/ProductInfiniteTest.scala rename to src/test/scala/scife/enumeration/lzy/ProductInfiniteTest.scala index 9260ad5..604efd4 100644 --- a/src/test/scala/insynth/enumeration/lzy/ProductInfiniteTest.scala +++ b/src/test/scala/scife/enumeration/lzy/ProductInfiniteTest.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package lzy import org.scalatest._ diff --git a/src/test/scala/insynth/enumeration/reverse/BinarySearchTreeTest.scala b/src/test/scala/scife/enumeration/reverse/BinarySearchTreeTest.scala similarity index 97% rename from src/test/scala/insynth/enumeration/reverse/BinarySearchTreeTest.scala rename to src/test/scala/scife/enumeration/reverse/BinarySearchTreeTest.scala index 743012e..44eee7c 100644 --- a/src/test/scala/insynth/enumeration/reverse/BinarySearchTreeTest.scala +++ b/src/test/scala/scife/enumeration/reverse/BinarySearchTreeTest.scala @@ -1,14 +1,14 @@ -package insynth.enumeration +package scife.enumeration package reverse -import insynth.{ enumeration => e } +import scife.{ enumeration => e } import reverse.{ dependent => rd } import memoization._ import e.dependent._ import util._ -import insynth.util.logging._ -import insynth.util._ +import scife.util.logging._ +import scife.util._ import org.scalatest._ import org.scalatest.prop._ diff --git a/src/test/scala/insynth/enumeration/reverse/ReverseTest.scala b/src/test/scala/scife/enumeration/reverse/ReverseTest.scala similarity index 94% rename from src/test/scala/insynth/enumeration/reverse/ReverseTest.scala rename to src/test/scala/scife/enumeration/reverse/ReverseTest.scala index f7d28be..6fd46d4 100644 --- a/src/test/scala/insynth/enumeration/reverse/ReverseTest.scala +++ b/src/test/scala/scife/enumeration/reverse/ReverseTest.scala @@ -1,7 +1,7 @@ -package insynth.enumeration +package scife.enumeration package reverse -import insynth.{ enumeration => e } +import scife.{ enumeration => e } import reverse.{ dependent => rd } import memoization._ import e.dependent._ diff --git a/src/test/scala/insynth/enumeration/reverse/SortedListTest.scala b/src/test/scala/scife/enumeration/reverse/SortedListTest.scala similarity index 97% rename from src/test/scala/insynth/enumeration/reverse/SortedListTest.scala rename to src/test/scala/scife/enumeration/reverse/SortedListTest.scala index 3a66b63..43d6188 100644 --- a/src/test/scala/insynth/enumeration/reverse/SortedListTest.scala +++ b/src/test/scala/scife/enumeration/reverse/SortedListTest.scala @@ -1,14 +1,14 @@ -package insynth.enumeration +package scife.enumeration package reverse -import insynth.{ enumeration => e } +import scife.{ enumeration => e } import reverse.{ dependent => rd } import memoization._ import e.dependent._ import util._ -import insynth.util.logging._ -import insynth.util._ +import scife.util.logging._ +import scife.util._ import org.scalatest._ import org.scalatest.prop._ diff --git a/src/test/scala/insynth/enumeration/showcase/BinarySearchTree.scala b/src/test/scala/scife/enumeration/showcase/BinarySearchTree.scala similarity index 98% rename from src/test/scala/insynth/enumeration/showcase/BinarySearchTree.scala rename to src/test/scala/scife/enumeration/showcase/BinarySearchTree.scala index f25d88d..9377697 100644 --- a/src/test/scala/insynth/enumeration/showcase/BinarySearchTree.scala +++ b/src/test/scala/scife/enumeration/showcase/BinarySearchTree.scala @@ -1,13 +1,13 @@ -package insynth +package scife package enumeration package showcase 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._ @@ -20,8 +20,7 @@ import scala.language.existentials import scala.language.implicitConversions class BinarySearchTree extends FunSuite with Matchers with GeneratorDrivenPropertyChecks with HasLogger with ProfileLogger { - import common._ - import Util.CheckerHelper + import Util.CheckerHelper import Checks._ // DSL diff --git a/src/test/scala/insynth/enumeration/showcase/PedagogicalExample.scala b/src/test/scala/scife/enumeration/showcase/PedagogicalExample.scala similarity index 95% rename from src/test/scala/insynth/enumeration/showcase/PedagogicalExample.scala rename to src/test/scala/scife/enumeration/showcase/PedagogicalExample.scala index 1c414b0..f359758 100644 --- a/src/test/scala/insynth/enumeration/showcase/PedagogicalExample.scala +++ b/src/test/scala/scife/enumeration/showcase/PedagogicalExample.scala @@ -1,16 +1,16 @@ -package insynth +package scife package enumeration package showcase import dependent._ import memoization._ -import insynth.{ enumeration => e } +import scife.{ enumeration => e } -import insynth.util._ +import scife.util._ import Structures._ import BSTrees._ -import insynth.util.logging._ +import scife.util.logging._ import scala.language.existentials import scala.language.implicitConversions @@ -20,8 +20,7 @@ import org.scalatest.prop._ import org.scalameter.api._ class PedagogicalExample extends FunSuite with Matchers with GeneratorDrivenPropertyChecks with HasLogger with ProfileLogger { - import common._ - import Util.CheckerHelper + import Util.CheckerHelper import Checks._ // import DSL diff --git a/src/test/scala/insynth/enumeration/testcases/BinarySearchTreeTest.scala b/src/test/scala/scife/enumeration/testcases/BinarySearchTreeTest.scala similarity index 97% rename from src/test/scala/insynth/enumeration/testcases/BinarySearchTreeTest.scala rename to src/test/scala/scife/enumeration/testcases/BinarySearchTreeTest.scala index 750c5c4..3e69864 100644 --- a/src/test/scala/insynth/enumeration/testcases/BinarySearchTreeTest.scala +++ b/src/test/scala/scife/enumeration/testcases/BinarySearchTreeTest.scala @@ -1,16 +1,16 @@ -package insynth.enumeration +package scife.enumeration package testcases import org.scalatest._ import org.scalatest.prop._ import org.scalatest.matchers._ -import insynth.{ enumeration => e } +import scife.{ enumeration => e } import e.dependent._ import util._ -import insynth.util.logging._ -import insynth.util._ +import scife.util.logging._ +import scife.util._ import scala.language.existentials diff --git a/src/test/scala/insynth/enumeration/testcases/ClassDAGTest.scala b/src/test/scala/scife/enumeration/testcases/ClassDAGTest.scala similarity index 97% rename from src/test/scala/insynth/enumeration/testcases/ClassDAGTest.scala rename to src/test/scala/scife/enumeration/testcases/ClassDAGTest.scala index 8ca9d94..87b8fa7 100644 --- a/src/test/scala/insynth/enumeration/testcases/ClassDAGTest.scala +++ b/src/test/scala/scife/enumeration/testcases/ClassDAGTest.scala @@ -1,16 +1,16 @@ -package insynth.enumeration.testcases +package scife.enumeration.testcases import org.scalatest._ import org.scalatest.prop._ import org.scalatest.matchers._ -import insynth.enumeration._ +import scife.enumeration._ 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._ @@ -36,7 +36,7 @@ class ClassDAGTest extends FunSuite with Matchers with GeneratorDrivenPropertyCh val defMap = Predef.Map( -1 -> Set[Int](), 0 -> Set[Int]() ) def toGraph(i: Input, o: Output) = { - import insynth.enumeration.testcases.classdag._ + import scife.enumeration.testcases.classdag._ val (size, myId, classes, overridableMethods, sealedMap) = i diff --git a/src/test/scala/insynth/enumeration/testcases/ClassInterfaceDAGTest.scala b/src/test/scala/scife/enumeration/testcases/ClassInterfaceDAGTest.scala similarity index 98% rename from src/test/scala/insynth/enumeration/testcases/ClassInterfaceDAGTest.scala rename to src/test/scala/scife/enumeration/testcases/ClassInterfaceDAGTest.scala index cbe2b00..5e71b5b 100644 --- a/src/test/scala/insynth/enumeration/testcases/ClassInterfaceDAGTest.scala +++ b/src/test/scala/scife/enumeration/testcases/ClassInterfaceDAGTest.scala @@ -1,16 +1,16 @@ -package insynth.enumeration.testcases +package scife.enumeration.testcases import org.scalatest._ import org.scalatest.prop._ import org.scalatest.matchers._ -import insynth.enumeration._ +import scife.enumeration._ 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._ @@ -49,7 +49,7 @@ class ClassInterfaceDAGTest extends FunSuite with Matchers with GeneratorDrivenP } def toGraph(i: Input, o: Output) = { - import insynth.enumeration.testcases.classinterfacedag._ + import scife.enumeration.testcases.classinterfacedag._ val (size, myId, classes, interfaces, overridableMethods, sealedMap) = i diff --git a/src/test/scala/insynth/enumeration/testcases/DAGTest.scala b/src/test/scala/scife/enumeration/testcases/DAGTest.scala similarity index 98% rename from src/test/scala/insynth/enumeration/testcases/DAGTest.scala rename to src/test/scala/scife/enumeration/testcases/DAGTest.scala index 20b9e89..0245a5c 100644 --- a/src/test/scala/insynth/enumeration/testcases/DAGTest.scala +++ b/src/test/scala/scife/enumeration/testcases/DAGTest.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package testcases import org.scalatest._ @@ -6,11 +6,11 @@ import org.scalatest.prop._ import org.scalatest.matchers._ 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._ diff --git a/src/test/scala/insynth/enumeration/testcases/DAGTestStructure.scala b/src/test/scala/scife/enumeration/testcases/DAGTestStructure.scala similarity index 96% rename from src/test/scala/insynth/enumeration/testcases/DAGTestStructure.scala rename to src/test/scala/scife/enumeration/testcases/DAGTestStructure.scala index 7049440..67e56e6 100644 --- a/src/test/scala/insynth/enumeration/testcases/DAGTestStructure.scala +++ b/src/test/scala/scife/enumeration/testcases/DAGTestStructure.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package testcases import org.scalatest._ @@ -6,11 +6,11 @@ import org.scalatest.prop._ import org.scalatest.matchers._ 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._ diff --git a/src/test/scala/insynth/enumeration/testcases/HeapArrayEqualTest.scala b/src/test/scala/scife/enumeration/testcases/HeapArrayEqualTest.scala similarity index 99% rename from src/test/scala/insynth/enumeration/testcases/HeapArrayEqualTest.scala rename to src/test/scala/scife/enumeration/testcases/HeapArrayEqualTest.scala index ffcbf02..0b897a9 100644 --- a/src/test/scala/insynth/enumeration/testcases/HeapArrayEqualTest.scala +++ b/src/test/scala/scife/enumeration/testcases/HeapArrayEqualTest.scala @@ -1,4 +1,4 @@ -package insynth.enumeration +package scife.enumeration package testcases import org.scalatest._ @@ -6,11 +6,11 @@ import org.scalatest.prop._ import org.scalatest.matchers._ 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._ diff --git a/src/test/scala/insynth/enumeration/testcases/HeapArrayTest.scala b/src/test/scala/scife/enumeration/testcases/HeapArrayTest.scala similarity index 98% rename from src/test/scala/insynth/enumeration/testcases/HeapArrayTest.scala rename to src/test/scala/scife/enumeration/testcases/HeapArrayTest.scala index db77777..54faaa8 100644 --- a/src/test/scala/insynth/enumeration/testcases/HeapArrayTest.scala +++ b/src/test/scala/scife/enumeration/testcases/HeapArrayTest.scala @@ -1,16 +1,16 @@ -package insynth.enumeration +package scife.enumeration package testcases import org.scalatest._ import org.scalatest.prop._ import org.scalatest.matchers._ -import insynth.{ enumeration => e } +import scife.{ enumeration => e } import e.dependent._ import util._ -import insynth.util.logging._ -import insynth.util._ +import scife.util.logging._ +import scife.util._ import scala.language.existentials import scala.language.postfixOps diff --git a/src/test/scala/insynth/util/Checks.scala b/src/test/scala/scife/util/Checks.scala similarity index 99% rename from src/test/scala/insynth/util/Checks.scala rename to src/test/scala/scife/util/Checks.scala index 99ff99c..0ea7763 100644 --- a/src/test/scala/insynth/util/Checks.scala +++ b/src/test/scala/scife/util/Checks.scala @@ -1,4 +1,4 @@ -package insynth.util +package scife.util import org.scalatest._ diff --git a/src/test/scala/insynth/util/MemoryLeak.scala b/src/test/scala/scife/util/MemoryLeak.scala similarity index 97% rename from src/test/scala/insynth/util/MemoryLeak.scala rename to src/test/scala/scife/util/MemoryLeak.scala index ae2ec87..90b126d 100644 --- a/src/test/scala/insynth/util/MemoryLeak.scala +++ b/src/test/scala/scife/util/MemoryLeak.scala @@ -1,4 +1,4 @@ -package insynth.util +package scife.util import java.lang.ref._ diff --git a/src/test/scala/insynth/util/RBMap.scala b/src/test/scala/scife/util/RBMap.scala similarity index 99% rename from src/test/scala/insynth/util/RBMap.scala rename to src/test/scala/scife/util/RBMap.scala index 2c4998f..cf92d3f 100644 --- a/src/test/scala/insynth/util/RBMap.scala +++ b/src/test/scala/scife/util/RBMap.scala @@ -1,4 +1,4 @@ -package insynth.util +package scife.util import RBTreeItems._ diff --git a/src/test/scala/insynth/util/RunnableJUnit.scala b/src/test/scala/scife/util/RunnableJUnit.scala similarity index 83% rename from src/test/scala/insynth/util/RunnableJUnit.scala rename to src/test/scala/scife/util/RunnableJUnit.scala index 7e74bea..cafece3 100644 --- a/src/test/scala/insynth/util/RunnableJUnit.scala +++ b/src/test/scala/scife/util/RunnableJUnit.scala @@ -1,4 +1,4 @@ -package insynth.util +package scife.util import org.scalatest.junit.JUnitRunner diff --git a/src/test/scala/insynth/util/Structures.scala b/src/test/scala/scife/util/Structures.scala similarity index 99% rename from src/test/scala/insynth/util/Structures.scala rename to src/test/scala/scife/util/Structures.scala index 75506ca..5fc1b7d 100644 --- a/src/test/scala/insynth/util/Structures.scala +++ b/src/test/scala/scife/util/Structures.scala @@ -1,4 +1,4 @@ -package insynth.util +package scife.util import org.scalatest._ import org.scalatest.prop._