From fa9ba0fea121a161c1d9106a3cc1b11e18975aa3 Mon Sep 17 00:00:00 2001 From: Daniel Le Berre Date: Sun, 11 Nov 2018 17:01:51 +0100 Subject: [PATCH] Fixed raw type warnings --- .../java/org/sat4j/minisat/SolverFactory.java | 61 +++++++++++-------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/org.sat4j.core/src/main/java/org/sat4j/minisat/SolverFactory.java b/org.sat4j.core/src/main/java/org/sat4j/minisat/SolverFactory.java index 311a1f81..90b57389 100644 --- a/org.sat4j.core/src/main/java/org/sat4j/minisat/SolverFactory.java +++ b/org.sat4j.core/src/main/java/org/sat4j/minisat/SolverFactory.java @@ -153,8 +153,9 @@ public final class SolverFactory extends ASolverFactory { DataStructureFactory dsf) { MiniSATLearning learning = new MiniSATLearning(); Solver solver = new Solver( - learning, dsf, new VarOrderHeap( - new RSATPhaseSelectionStrategy()), new ArminRestarts()); + learning, dsf, + new VarOrderHeap(new RSATPhaseSelectionStrategy()), + new ArminRestarts()); solver.setSearchParams(new SearchParams(1.1, 100)); solver.setSimplifier(solver.EXPENSIVE_SIMPLIFICATION); return solver; @@ -168,8 +169,9 @@ public final class SolverFactory extends ASolverFactory { MiniSATLearning learning = new MiniSATLearning(); Solver solver = new Solver( learning, new MixedDataStructureDanielWL(), - new RandomWalkDecorator(new VarOrderHeap( - new RSATPhaseSelectionStrategy())), new NoRestarts()); + new RandomWalkDecorator( + new VarOrderHeap(new RSATPhaseSelectionStrategy())), + new NoRestarts()); // solver.setSearchParams(new SearchParams(1.1, 100)); solver.setSimplifier(solver.EXPENSIVE_SIMPLIFICATION); return solver; @@ -198,7 +200,8 @@ public final class SolverFactory extends ASolverFactory { * @since 2.1 */ public static Solver newBestWL() { - return newBestCurrentSolverConfiguration(new MixedDataStructureDanielWL()); + return newBestCurrentSolverConfiguration( + new MixedDataStructureDanielWL()); } /** @@ -206,7 +209,8 @@ public final class SolverFactory extends ASolverFactory { * @since 2.1 */ public static ICDCL newBestHT() { - return newBestCurrentSolverConfiguration(new MixedDataStructureDanielHT()); + return newBestCurrentSolverConfiguration( + new MixedDataStructureDanielHT()); } /** @@ -214,9 +218,11 @@ public final class SolverFactory extends ASolverFactory { * @since 2.2 */ public static ICDCL newBest17() { - Solver solver = newBestCurrentSolverConfiguration(new MixedDataStructureSingleWL()); + Solver solver = newBestCurrentSolverConfiguration( + new MixedDataStructureSingleWL()); solver.setSimplifier(solver.EXPENSIVE_SIMPLIFICATION_WLONLY); - solver.setLearnedConstraintsDeletionStrategy(solver.activity_based_low_memory); + solver.setLearnedConstraintsDeletionStrategy( + solver.activity_based_low_memory); LimitedLearning learning = new PercentLengthLearning( 10); solver.setLearningStrategy(learning); @@ -273,8 +279,8 @@ public final class SolverFactory extends ASolverFactory { LimitedLearning learning = new PercentLengthLearning( 10); Solver solver = new Solver( - learning, new MixedDataStructureDanielWL(), new SearchParams( - Integer.MAX_VALUE), new VarOrderHeap(), + learning, new MixedDataStructureDanielWL(), + new SearchParams(Integer.MAX_VALUE), new VarOrderHeap(), new MiniSATRestarts()); learning.setSolver(solver); solver.setSimplifier(solver.SIMPLE_SIMPLIFICATION); @@ -288,8 +294,9 @@ public final class SolverFactory extends ASolverFactory { LimitedLearning learning = new PercentLengthLearning( 10); Solver solver = new Solver( - learning, new MixedDataStructureDanielWL(), new SearchParams( - 1000), new VarOrderHeap(), new MiniSATRestarts()); + learning, new MixedDataStructureDanielWL(), + new SearchParams(1000), new VarOrderHeap(), + new MiniSATRestarts()); learning.setSolver(solver); solver.setSimplifier(solver.SIMPLE_SIMPLIFICATION); return solver; @@ -421,7 +428,7 @@ public final class SolverFactory extends ASolverFactory { } public static ISolver newParallel() { - return new ManyCore(newSAT(), newUNSAT(), + return new ManyCore(newSAT(), newUNSAT(), newMiniLearningHeapRsatExpSimpLuby(), newMiniLearningHeapRsatExpSimp(), newDefaultAutoErasePhaseSaving(), newMiniLearningHeap(), @@ -435,7 +442,7 @@ public final class SolverFactory extends ASolverFactory { * @return a parallel solver for both SAT and UNSAT problems. */ public static ISolver newSATUNSAT() { - return new ManyCore(newSAT(), newUNSAT()); + return new ManyCore(newSAT(), newUNSAT()); } /** @@ -443,10 +450,11 @@ public final class SolverFactory extends ASolverFactory { * * @return a solver for satisfiable benchmarks. */ - public static Solver newSAT() { - Solver solver = (Solver) newGlucose21(); + public static Solver newSAT() { + Solver solver = (Solver) newGlucose21(); solver.setRestartStrategy(new LubyRestarts(100)); - solver.setLearnedConstraintsDeletionStrategy(solver.activity_based_low_memory); + solver.setLearnedConstraintsDeletionStrategy( + solver.activity_based_low_memory); return solver; } @@ -455,23 +463,24 @@ public final class SolverFactory extends ASolverFactory { * * @return a solver for unsatisfiable benchmarks. */ - public static Solver newUNSAT() { - Solver solver = (Solver) newGlucose21(); + public static Solver newUNSAT() { + Solver solver = (Solver) newGlucose21(); solver.setRestartStrategy(new NoRestarts()); solver.setSimplifier(solver.SIMPLE_SIMPLIFICATION); return solver; } - public static Solver newConcise() { - Solver solver = (Solver) newGlucose21(); - solver.setDataStructureFactory(new MixedDataStructureDanielWLConciseBinary()); - solver.setSimplifier(solver.NO_SIMPLIFICATION); + public static Solver newConcise() { + Solver solver = (Solver) newGlucose21(); + solver.setDataStructureFactory( + new MixedDataStructureDanielWLConciseBinary()); + solver.setSimplifier(Solver.NO_SIMPLIFICATION); return solver; } - public static Solver newNoSimplification() { - Solver solver = (Solver) newGlucose21(); - solver.setSimplifier(solver.NO_SIMPLIFICATION); + public static Solver newNoSimplification() { + Solver solver = (Solver) newGlucose21(); + solver.setSimplifier(Solver.NO_SIMPLIFICATION); return solver; } } -- GitLab