Implemented loading of variables file as feature model. Each variable identified by KernelHaven is represented by an optional feature in the model. There are no constraints between the features.

Author: AlexanderSchultheiss

src/main/java/org/variantsync/vevos/simulation/io/data/VariabilityDatasetLoader.java

@@ -25,6 +25,7 @@ public class VariabilityDatasetLoader implements ResourceLoader<VariabilityDatas
     private final static String PRESENCE_CONDITIONS_FILE = "code-variability.spl.csv";
     private final static String PARENTS_FILE = "PARENTS.txt";
     private final static String MESSAGE_FILE = "MESSAGE.txt";
+    private final static String VARIABLES_FILE = "VARIABLES.txt";
     private static final String DATA_DIR_NAME = "data";
     private static final String LOG_DIR_NAME = "log";
     private static final String FILTER_COUNTS_FILE = "FILTERED.txt";
@@ -135,7 +136,12 @@ private Path resolvePathToCommitOutputDir(final Path rootDir, final String commi
     }
 
     private SPLCommit.FeatureModelPath resolvePathToFeatureModel(final Path rootDir, final String commitId) {
-        final Path p = resolvePathToCommitOutputDir(rootDir, commitId).resolve(FEATURE_MODEL_FILE);
+        Path p = resolvePathToCommitOutputDir(rootDir, commitId).resolve(FEATURE_MODEL_FILE);
+        if (!Files.exists(p)) {
+            // If no feature model is found, we instead set the variables file, as feature model
+            // TODO: Move this logic to VEVOS_extraction, if we convert a feature model a FeatureIDE format?
+            p = resolvePathToCommitOutputDir(rootDir, commitId).resolve(VARIABLES_FILE);
+        }
         return new SPLCommit.FeatureModelPath(p);
     }
 

src/main/java/org/variantsync/vevos/simulation/io/kernelhaven/VariabilityModelLoader.java

@@ -1,26 +1,40 @@
 package org.variantsync.vevos.simulation.io.kernelhaven;
 
+import de.ovgu.featureide.fm.core.base.FeatureUtils;
+import de.ovgu.featureide.fm.core.base.IFeature;
 import de.ovgu.featureide.fm.core.base.IFeatureModel;
+import de.ovgu.featureide.fm.core.base.impl.DefaultFeatureModelFactory;
 import net.ssehub.kernel_haven.variability_model.JsonVariabilityModelCache;
 import org.variantsync.functjonal.Result;
 import org.variantsync.vevos.simulation.io.ResourceLoader;
 import org.variantsync.vevos.simulation.util.fide.FeatureModelUtils;
 import org.variantsync.vevos.simulation.util.io.PathUtils;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class VariabilityModelLoader implements ResourceLoader<IFeatureModel> {
 
     @Override
     public boolean canLoad(Path p) {
-        return PathUtils.hasExtension(p,".json");
+        return PathUtils.hasExtension(p,".json", ".txt");
     }
 
     @Override
     public Result<IFeatureModel, ? extends Exception> load(Path p) {
         return Result.Try(() -> {
-            JsonVariabilityModelCache cache = new JsonVariabilityModelCache(p.getParent().toFile());
-            return FeatureModelUtils.FromVariabilityModel(cache.readFixed(p.toFile()));
+            if (p.endsWith(".json")) {
+                JsonVariabilityModelCache cache = new JsonVariabilityModelCache(p.getParent().toFile());
+                return FeatureModelUtils.FromVariabilityModel(cache.readFixed(p.toFile()));
+            } else {
+                List<String> variables = Files.readAllLines(p).stream().map(String::trim).collect(Collectors.toList());
+                final IFeatureModel featureModel = DefaultFeatureModelFactory.getInstance().create();
+                IFeature root = DefaultFeatureModelFactory.getInstance().createFeature(featureModel, "ROOT");
+                FeatureUtils.setRoot(featureModel, root);
+                return FeatureModelUtils.FillFeatureModel(featureModel, variables);
+            }
         });
     }
 

src/main/java/org/variantsync/vevos/simulation/util/fide/FeatureModelUtils.java

@@ -150,14 +150,20 @@ public static IFeatureModel FromVariabilityModel(VariabilityModel vm) throws Res
         final Set<String> featureNames = new HashSet<>(vm.getVariableMap().keySet());
         // We only want to add features that are not part of the model yet
         fm.getFeatures().stream().map(IFeatureModelElement::getName).forEach(featureNames::remove);
+
+        return FillFeatureModel(fm, featureNames);
+    }
+
+    /// Create optional features from a collection of feature names and add them to the feature model
+    public static IFeatureModel FillFeatureModel(IFeatureModel fm, Collection<String> featureNames) {
         final IFeatureModelFactory factory = FMFactoryManager.getInstance().getFactory(fm);
         final IFeature root = FeatureUtils.getRoot(fm);
         // Add all remaining feature from the variability model to the feature model
         featureNames.stream().map(name -> factory.createFeature(fm, name)).forEach(feature -> {
             FeatureUtils.addFeature(fm, feature);
             FeatureUtils.addChild(root, feature);
         });
-        Logger.debug("Added all feature from VariabilityModel to FeatureModel.");
+        Logger.debug("Added all optional features to the FeatureModel.");
         return fm;
     }
 

src/test/java/org/variantsync/vevos/simulation/FeatureModelLoading.java

@@ -0,0 +1,32 @@
+package org.variantsync.vevos.simulation;
+
+import de.ovgu.featureide.fm.core.base.IFeature;
+import de.ovgu.featureide.fm.core.base.IFeatureModel;
+import de.ovgu.featureide.fm.core.base.IFeatureModelElement;
+import org.junit.Test;
+import org.variantsync.vevos.simulation.variability.SPLCommit;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+public class FeatureModelLoading {
+
+    static {
+        VEVOS.Initialize();
+    }
+
+    @Test
+    public void fromVariables() throws IOException {
+        Path variablesPath = Path.of("src/test/java/org/variantsync/vevos/simulation/variability/TEST_VARIABLES.txt");
+        SPLCommit commit = new SPLCommit("aaaaa", null, null, new SPLCommit.FeatureModelPath(variablesPath), null, null, null);
+        IFeatureModel featureModel = commit.featureModel().run().orElseThrow();
+        Collection<String> features = featureModel.getFeatures().stream().map(IFeatureModelElement::getName).collect(Collectors.toList());
+        assert features.size() == 5;
+        for (String feature : Files.readAllLines(variablesPath)) {
+            assert features.contains(feature);
+        }
+    }
+}

src/test/java/org/variantsync/vevos/simulation/variability/TEST_VARIABLES.txt

@@ -0,0 +1,5 @@
+First Feature
+Feature A
+Feature B
+Feature C
+Last Feature