From afdf794a5fbd3c1c8ab519c0c24a2940fe2b12e5 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Mon, 11 Jan 2021 18:20:21 +0100
Subject: [PATCH] clean up
---
.../strategies/restriction/CompositeRestriction.kt | 4 ----
.../strategies/restriction/LowerBoundRestriction.kt | 1 -
.../strategies/restriction/PrimitiveRestriction.kt | 7 -------
.../theodolite/strategies/restriction/Restriction.kt | 5 -----
.../{searchstrategy => restriction}/RestrictionStrategy.kt | 2 +-
.../strategies/searchstrategy/CompositeStrategy.kt | 1 +
6 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/CompositeRestriction.kt
delete mode 100644 theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/PrimitiveRestriction.kt
delete mode 100644 theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/Restriction.kt
rename theodolite-quarkus/src/main/kotlin/theodolite/strategies/{searchstrategy => restriction}/RestrictionStrategy.kt (86%)
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/CompositeRestriction.kt b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/CompositeRestriction.kt
deleted file mode 100644
index 6f61dc2ad..000000000
--- a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/CompositeRestriction.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package theodolite.strategies.restriction
-
-abstract class CompositeRestriction(val childRestriction: Restriction): Restriction {
-}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/LowerBoundRestriction.kt b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/LowerBoundRestriction.kt
index fc5b6d538..73792f3ce 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/LowerBoundRestriction.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/LowerBoundRestriction.kt
@@ -1,7 +1,6 @@
package theodolite.strategies.restriction
import theodolite.util.Results
-import theodolite.strategies.searchstrategy.RestrictionStrategy
import theodolite.util.LoadDimension
import theodolite.util.Resource
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/PrimitiveRestriction.kt b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/PrimitiveRestriction.kt
deleted file mode 100644
index 0e1873ec2..000000000
--- a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/PrimitiveRestriction.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package theodolite.strategies.restriction
-
-import theodolite.strategies.searchstrategy.SearchStrategy
-
-abstract class PrimitiveRestriction(val searchStrategy: SearchStrategy): Restriction {
-
-}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/Restriction.kt b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/Restriction.kt
deleted file mode 100644
index 4dc5ca524..000000000
--- a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/Restriction.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package theodolite.strategies.restriction
-
-interface Restriction {
- fun restrict(loads: List<Int>, resources: List<Int>): List<Int>;
-}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/RestrictionStrategy.kt b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/RestrictionStrategy.kt
similarity index 86%
rename from theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/RestrictionStrategy.kt
rename to theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/RestrictionStrategy.kt
index 7a6e43ce0..bf0415628 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/RestrictionStrategy.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/restriction/RestrictionStrategy.kt
@@ -1,4 +1,4 @@
-package theodolite.strategies.searchstrategy
+package theodolite.strategies.restriction
import theodolite.util.Results
import theodolite.util.LoadDimension
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/CompositeStrategy.kt b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/CompositeStrategy.kt
index 79c34e326..e69ee0bad 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/CompositeStrategy.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/strategies/searchstrategy/CompositeStrategy.kt
@@ -1,6 +1,7 @@
package theodolite.strategies.searchstrategy
import theodolite.execution.BenchmarkExecutor
+import theodolite.strategies.restriction.RestrictionStrategy
import theodolite.util.LoadDimension
import theodolite.util.Resource
--
GitLab