diff --git a/build.gradle b/build.gradle index da85d657..7c999150 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' implementation 'com.bpodgursky:jbool_expressions:1.24' - implementation 'com.github.ProvideQ.jplex:input:ad6a034668' + implementation 'com.github.ProvideQ.jplex:input:703b4d0086' implementation files('lib/de.ovgu.featureide.lib.fm-v3.9.1.jar', 'lib/uvl-parser.jar') testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.mockito:mockito-core:5.+' diff --git a/src/main/java/edu/kit/provideq/toolbox/qubo/solvers/KipuQuboSolver.java b/src/main/java/edu/kit/provideq/toolbox/qubo/solvers/KipuQuboSolver.java index d0b94b81..6bb6a5f8 100644 --- a/src/main/java/edu/kit/provideq/toolbox/qubo/solvers/KipuQuboSolver.java +++ b/src/main/java/edu/kit/provideq/toolbox/qubo/solvers/KipuQuboSolver.java @@ -15,8 +15,6 @@ import edu.kit.provideq.toolbox.meta.setting.SolverSetting; import edu.kit.provideq.toolbox.meta.setting.basic.TextSetting; import edu.kit.provideq.toolbox.qubo.QuboConfiguration; -import java.io.BufferedReader; -import java.io.StringReader; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -62,12 +60,8 @@ public Mono> solve( return Mono.just(Solution.failed(this, "No PlanQK token provided.")); } - // Convert problem data string to buffered reader - var problemDataReader = new BufferedReader(new StringReader(input)); - // Parse lp data - LpFileReader lpReader = new LpFileReader(problemDataReader); - KipuQuboProblem kipuQubo; + LpFileReader lpReader = LpFileReader.fromInput(input); try { kipuQubo = parseKipuQubo(lpReader); } catch (ConversionException e) { diff --git a/src/main/java/edu/kit/provideq/toolbox/qubo/solvers/QuantagoniaQuboSolver.java b/src/main/java/edu/kit/provideq/toolbox/qubo/solvers/QuantagoniaQuboSolver.java index 84f078a2..86bb044d 100644 --- a/src/main/java/edu/kit/provideq/toolbox/qubo/solvers/QuantagoniaQuboSolver.java +++ b/src/main/java/edu/kit/provideq/toolbox/qubo/solvers/QuantagoniaQuboSolver.java @@ -14,8 +14,6 @@ import edu.kit.provideq.toolbox.meta.setting.SolverSetting; import edu.kit.provideq.toolbox.meta.setting.basic.TextSetting; import edu.kit.provideq.toolbox.qubo.QuboConfiguration; -import java.io.BufferedReader; -import java.io.StringReader; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -61,12 +59,8 @@ public Mono> solve( return Mono.just(Solution.failed(this, "No PlanQK token provided.")); } - // Convert problem data string to buffered reader - var problemDataReader = new BufferedReader(new StringReader(input)); - // Parse lp data - LpFileReader lpReader = new LpFileReader(problemDataReader); - QuantagoniaQuboProblem quantagoniaQubo; + LpFileReader lpReader = LpFileReader.fromInput(input); try { quantagoniaQubo = parseQuantagoniaQubo(lpReader); } catch (ConversionException e) {