From bb1c86e0c99adead52edde0cb60dcb7f7ef6ea2d Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Sun, 25 Feb 2018 22:39:10 -0500 Subject: Alloy solver use the als file for logging only And not for parsing --- .../mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend') diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend index b78165dc..51cc8c42 100644 --- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend +++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend @@ -48,7 +48,7 @@ class AlloyHandler { //val fileName = "problem.als" - public def callSolver(ALSDocument problem, ReasonerWorkspace workspace, AlloySolverConfiguration configuration, String path, String alloyCode) { + public def callSolver(ALSDocument problem, ReasonerWorkspace workspace, AlloySolverConfiguration configuration,String alloyCode) { val writeToFile = ( configuration.documentationLevel===DocumentationLevel::NORMAL || configuration.documentationLevel===DocumentationLevel::FULL) @@ -83,11 +83,7 @@ class AlloyHandler { // Start: Alloy -> Kodkod val kodkodTransformStart = System.currentTimeMillis(); try { - if(writeToFile) { - compModule = CompUtil.parseEverything_fromFile(reporter,null,path) - } else { - compModule = CompUtil.parseEverything_fromString(reporter,alloyCode) - } + compModule = CompUtil.parseEverything_fromString(reporter,alloyCode) if(compModule.allCommands.size != 1) throw new UnsupportedOperationException('''Alloy files with multiple commands are not supported!''') command = compModule.allCommands.head -- cgit v1.2.3-54-g00ecf