From 8b8e3796af60a9b09f1a31cabbfc098008d8702c Mon Sep 17 00:00:00 2001
From: Andreas Bayha <bayha@fortiss.org>
Date: Wed, 11 Oct 2023 14:30:18 +0200
Subject: [PATCH] YELLOW
Issue-ref: 4240
Issue-URL: https://git.fortiss.org/af3/af3/-/issues/4240
Signed-off-by: Andreas Bayha <bayha@fortiss.org>
---
.../src/org/fortiss/variability/analysis/.ratings | 2 +-
.../analysis/GenericProductLineAnalysis.java | 15 ---------------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/org.fortiss.variability/src/org/fortiss/variability/analysis/.ratings b/org.fortiss.variability/src/org/fortiss/variability/analysis/.ratings
index dda761e91..d969de516 100644
--- a/org.fortiss.variability/src/org/fortiss/variability/analysis/.ratings
+++ b/org.fortiss.variability/src/org/fortiss/variability/analysis/.ratings
@@ -1,7 +1,7 @@
BucketSetMap.java 665a28c80a9693b9b9e31b7ebe59f2de4195d56c YELLOW
DualKeyMap.java 75fbe85a54e5a655aaf67108ae004f98ed2879d8 YELLOW
EMFProductLineTranslation.java a62c588bd806fdf98d1e2fb4138c359528edcaad YELLOW
-GenericProductLineAnalysis.java 6f6d48544ec2b872fa0a4f747a85657889ad463e YELLOW
+GenericProductLineAnalysis.java 314f4de5be3ac7f6589192e7b41540153e032199 YELLOW
GenericProductLineTranslation.java e00248a4b17430f58afc2a60aa51f340eca77db3 RED
IProductLineConstraint.java 1b0e1231cc578a6e7e544441ac33533b4feafeb1 YELLOW
IProductLineTranslation.java 733dae03e2baae237b6f0b33f0dd618a4f47cf73 YELLOW
diff --git a/org.fortiss.variability/src/org/fortiss/variability/analysis/GenericProductLineAnalysis.java b/org.fortiss.variability/src/org/fortiss/variability/analysis/GenericProductLineAnalysis.java
index 6f6d48544..314f4de5b 100644
--- a/org.fortiss.variability/src/org/fortiss/variability/analysis/GenericProductLineAnalysis.java
+++ b/org.fortiss.variability/src/org/fortiss/variability/analysis/GenericProductLineAnalysis.java
@@ -1,8 +1,5 @@
package org.fortiss.variability.analysis;
-import static java.lang.System.currentTimeMillis;
-import static org.fortiss.variability.util.VariabilityUtilsInternal.logInfo;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -14,7 +11,6 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
-import org.fortiss.tooling.kernel.model.INamedElement;
import com.microsoft.z3.BoolExpr;
import com.microsoft.z3.Expr;
@@ -59,8 +55,6 @@ public abstract class GenericProductLineAnalysis {
* analysis. 'false' otherwise.
*/
public List<ProductLineConstraintViolation> doCheck() {
- final long start = currentTimeMillis();
-
plConstraints = createConstriants();
setTranslatedMetamodelElements();
@@ -70,17 +64,8 @@ public abstract class GenericProductLineAnalysis {
translation.translateConstraints(plConstraints);
Solver solver = translation.createSolver();
- String modelName = ((INamedElement)model).getName();
-
- final long startSmt = currentTimeMillis();
-
Status result = solver.check();
- final long end = currentTimeMillis();
-
- logInfo("Runtime product-line analysis for " + modelName + ": " + (end - start) +
- " total, " + (startSmt - start) + " translation, " + (end - startSmt) + " SMT");
-
List<ProductLineConstraintViolation> ret = new ArrayList<ProductLineConstraintViolation>();
if(result.equals(Status.SATISFIABLE)) {
--
GitLab