chore: remove code moved to appropriate branches (feat/exact-qrisp-sa…

…t-solver, feat/update-docker-image, feat/sharp-sat)^
ProvideQ · Jan 13, 2025 · 9e6c9e3 · 9e6c9e3
1 parent bd3e549
commit 9e6c9e3
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 195 deletions.
diff --git a/.github/workflows/ci-cd-develop.yml b/.github/workflows/ci-cd-develop.yml
@@ -7,7 +7,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     container:
-      image: debian:bookworm-slim # use the same image as our docker runner
+      image: debian:bullseye-slim # use the same image as our docker runner
     steps:
       - name: Clone repo (shallow)
         uses: actions/checkout@v3

diff --git a/Dockerfile b/Dockerfile
@@ -29,7 +29,7 @@ RUN jlink \
     --compress=2
 
 # Step 2: Install the toolbox + external dependencies to a runner container
-FROM debian:bookworm-slim AS runner
+FROM debian:bullseye-slim AS runner
 WORKDIR /app
 
 COPY scripts scripts

diff --git a/solvers/custom/sharp-sat/README.md b/solvers/custom/sharp-sat/README.md
diff --git a/solvers/custom/sharp-sat/sharp-sat-solver-linux b/solvers/custom/sharp-sat/sharp-sat-solver-linux
diff --git a/solvers/qrisp/sat/exact_sat.py b/solvers/qrisp/sat/exact_sat.py
diff --git a/...in/java/edu/kit/provideq/toolbox/featuremodel/anomaly/dead/SatBasedDeadFeatureSolver.java b/...in/java/edu/kit/provideq/toolbox/featuremodel/anomaly/dead/SatBasedDeadFeatureSolver.java
@@ -20,7 +20,6 @@
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
-// TODO: understand timeout error for qrisp sat solver.
 /**
  * This problem solver solves the {@link DeadFeatureConfiguration#FEATURE_MODEL_ANOMALY_DEAD}
  * problem by building {@link SatConfiguration#SAT} formulae that are solved by a corresponding

diff --git a/src/main/java/edu/kit/provideq/toolbox/sat/SatConfiguration.java b/src/main/java/edu/kit/provideq/toolbox/sat/SatConfiguration.java
@@ -6,7 +6,6 @@
 import edu.kit.provideq.toolbox.meta.Problem;
 import edu.kit.provideq.toolbox.meta.ProblemManager;
 import edu.kit.provideq.toolbox.meta.ProblemType;
-import edu.kit.provideq.toolbox.sat.solvers.ExactQrispSatSolver;
 import edu.kit.provideq.toolbox.sat.solvers.GamsSatSolver;
 import edu.kit.provideq.toolbox.sat.solvers.QrispSatSolver;
 import java.io.IOException;
@@ -35,12 +34,11 @@ public class SatConfiguration {
   ProblemManager<String, DimacsCnfSolution> getSatManager(
       GamsSatSolver gamsSolver,
       QrispSatSolver qrispSolver,
-      ExactQrispSatSolver exactQrispSolver,
       ResourceProvider resourceProvider
   ) {
     return new ProblemManager<>(
         SAT,
-        Set.of(gamsSolver, qrispSolver, exactQrispSolver),
+        Set.of(gamsSolver, qrispSolver),
         loadExampleProblems(resourceProvider)
     );
   }

diff --git a/src/main/java/edu/kit/provideq/toolbox/sat/solvers/ExactQrispSatSolver.java b/src/main/java/edu/kit/provideq/toolbox/sat/solvers/ExactQrispSatSolver.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -28,7 +28,6 @@ qrisp.directory=${solvers.directory}/qrisp
 qrisp.script.vrp=${qrisp.directory}/vrp/grover.py
 qrisp.script.qubo=${qrisp.directory}/qubo/qaoa.py
 qrisp.script.sat=${qrisp.directory}/sat/sat.py
-qrisp.script.exact-sat=${qrisp.directory}/sat/exact_sat.py
 
 dwave.directory=${solvers.directory}/dwave
 dwave.script.qubo=${dwave.directory}/qubo/main.py
@@ -37,7 +36,6 @@ dwave.script.qubo=${dwave.directory}/qubo/main.py
 custom.directory=${solvers.directory}/custom
 custom.script.hs_knapsack=${custom.directory}/hs-knapsack/knapsack.py
 custom.directory.lkh.directory=${custom.directory}/lkh
-custom.directory.sharp-sat.directory=${custom.directory}/sharp-sat
 custom.script.lkh=${custom.directory.lkh.directory}/vrp_lkh.py
 custom.directory.berger-vrp=${custom.directory}/berger-vrp
 

diff --git a/src/test/java/edu/kit/provideq/toolbox/api/FeatureModelAnomalySolversTest.java b/src/test/java/edu/kit/provideq/toolbox/api/FeatureModelAnomalySolversTest.java
@@ -10,7 +10,6 @@
 import edu.kit.provideq.toolbox.meta.ProblemSolver;
 import edu.kit.provideq.toolbox.meta.ProblemState;
 import edu.kit.provideq.toolbox.meta.ProblemType;
-import edu.kit.provideq.toolbox.sat.solvers.ExactQrispSatSolver;
 import edu.kit.provideq.toolbox.sat.solvers.QrispSatSolver;
 import java.time.Duration;
 import java.util.stream.Stream;
@@ -56,8 +55,7 @@ <InputT, ResultT> Stream<Arguments> getArguments(
     var satManager = problemManagerProvider.findProblemManagerForType(SAT).get();
 
     var satSolver = satManager.getSolvers().stream()
-        .filter(solver -> !(solver instanceof QrispSatSolver
-            || solver instanceof ExactQrispSatSolver))
+        .filter(solver -> !(solver instanceof QrispSatSolver))
         .toList();
 
     return ApiTestHelper.getAllArgumentCombinations(featureModelManager, satSolver)