2 files changed, 7 insertions, 2 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationStatistics.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationStatistics.xtend
index bd5bf807..ab4fa039 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationStatistics.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationStatistics.xtend
@@ -2,7 +2,12 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra
 
 class ModelGenerationStatistics {
         public var long transformationExecutionTime = 0
-
+        public var long metricCalculationTime = 0
+        
+        
+        synchronized def addMetricCalculationTime(long amount) {
+                metricCalculationTime+=amount
+        }
         synchronized def addExecutionTime(long amount) {
                 transformationExecutionTime += amount
         }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ExtendedLinearExpressionBuilderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ExtendedLinearExpressionBuilderFactory.xtend
index 6054affe..e97fa5d7 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ExtendedLinearExpressionBuilderFactory.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ExtendedLinearExpressionBuilderFactory.xtend
@@ -112,7 +112,7 @@ class ExtendedPolyhedronBuilder implements ExtendedLinearExpressionBuilderFactor
                 }
 
                 override build() {
-                        val filteredCoefficients = ImmutableMap.copyOf(coefficients.filter [ _, coefficient |
+                        val filteredCoefficients = ImmutableMap.copyOf(coefficients.filter [ x, coefficient |
                                 coefficient != 0
                         ])
                         polyhedronBuilder.expressionsCache.computeIfAbsent(filteredCoefficients) [ map |