1 files changed, 17 insertions, 4 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/CbcCpsMain.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/CbcCpsMain.xtend
index 0203a6b6..1a07e26e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/CbcCpsMain.xtend
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/CbcCpsMain.xtend
@@ -6,14 +6,16 @@ import java.io.BufferedReader
 import java.io.BufferedWriter
 import java.io.FileReader
 import java.io.FileWriter
+import java.util.concurrent.TimeUnit
+import java.util.regex.Pattern
 import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
-import java.util.concurrent.TimeUnit
 
 class CbcCpsMain {
         static val PROBLEM_FILE = "problem.lp"
         static val SOLUTION_FILE = "solution.txt"
+        static val VALUE_REGEX = Pattern.compile("Optimal - objective value\\s*([0-9]+(\\.[0-9]+)?)")
 
         private new() {
                 new IllegalStateException("This is a static utility class and should not be instantiated directly.")
@@ -23,7 +25,7 @@ class CbcCpsMain {
                 Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
                         new XMIResourceFactoryImpl)
                 EPackage.Registry.INSTANCE.put(CpsPackage.eNS_URI, CpsPackage.eINSTANCE)
-                val generator = new CpsGenerator(1, 4, 2)
+                val generator = new CpsGenerator(1, 4, 1)
                 val problem = generator.generateCpsProblem
                 val toLp = new CpsToLpTranslator(problem, 10, true)
                 val lp = toLp.lpProblem
@@ -44,11 +46,22 @@ class CbcCpsMain {
                         System.exit(-1)
                 }
                 val reader = new BufferedReader(new FileReader(SOLUTION_FILE))
+                var double value = Double.NaN
                 try {
-                        reader.lines.forEach[println(it)]
+                        var String line
+                        while ((line = reader.readLine) !== null) {
+                                println(line)
+                                val matcher = VALUE_REGEX.matcher(line)
+                                if (matcher.matches) {
+                                        value = Double.parseDouble(matcher.group(1))
+                                }
+                        }
                 } finally {
                         reader.close
                 }
-                println("Additional cost: " + problem.requests.flatMap[requirements.map[count]].reduce[p1, p2|p1 + p2] * 5)
+                val applicationCost = problem.requests.flatMap[requirements.map[count]].reduce[p1, p2|p1 + p2] * 5
+                val cost = applicationCost + value
+                println
+                println("Cost: " + cost)
         }
 }