Small fixes for UVL naming; submission version

Author: SundermannC

README.md

@@ -1,14 +1,14 @@
-# TraVarT Core
+# TraVarT Adaptation for Translating Feature Models to UVL and DIMACS
 
-This directory contains the core interfaces / classes to be used across the TraVarT Ecosystem.
+## Dependencies
+* Antlr 3.4 https://www.antlr.org/
+* FeatureIDE 3.11.1 https://github.com/FeatureIDE/FeatureIDE/releases/tag/v3.11.1
+* UVL Parser 1.0 https://github.com/Universal-Variability-Language/uvl-parser
 
-## CheckStyle
 
-Configure IntelliJ as follows:
+# How to compile
 
-1. Install Checkstyle plugin
-1. Go to Settings|Editor|Code Style, choose a code style you want to import CheckStyle configuration to.
-1. Click Manage...|Import.., choose "CheckStyle Configuration" and select a corresponding CheckStyle configuration file.
-   Click OK
+`mvn clean compile`
 
-[credit](http://biercoff.com/how-to-import-checkstyle-rules-into-intellij-idea-code-format-rules/)
+# How to run
+`mvn clean compile exec:java -Dexec.args="path/to/models"`

pom.xml

@@ -28,18 +28,16 @@
             <groupId>org.pf4j</groupId>
             <artifactId>pf4j</artifactId>
             <version>3.8.0</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.vill</groupId>
             <artifactId>uvl-parser</artifactId>
             <version>1.0-SNAPSHOT</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.ovgu.featureide</groupId>
             <artifactId>lib.fm</artifactId>
-            <version>3.9.2</version>
+            <version>3.11.1-2</version>
         </dependency>
         <dependency>
             <groupId>de.ovgu.featureide</groupId>

src/main/java/at/jku/cps/travart/core/ParserMain.java

@@ -13,6 +13,7 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
@@ -32,6 +33,7 @@
 import at.jku.cps.travart.core.formats.afm.parser.AFMVisitorImpl;
 import at.jku.cps.travart.core.formats.afm.parser.AFMParser.Feature_modelContext;
 import de.ovgu.featureide.fm.attributes.FMAttributesLibrary;
+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 de.ovgu.featureide.fm.core.init.FMCoreLibrary;
@@ -55,18 +57,23 @@ public class ParserMain {
     private static final String UVL_EXTENSION = "uvl";
     private static final String DIMACS_EXTENSION = "dimacs";
     private static final String ZIP_EXTENSION = "zip";
+    private static final String CFR_EXTENSION = "cfr";
+
+    private static final Set<String> EXTENSIONS_TO_SKIP = Set.of(
+        CFR_EXTENSION);
 
     public static void main(String[] args) throws IOException {
         FMCoreLibrary.getInstance().install();
         FMAttributesLibrary.getInstance().install();
-
+        if (args.length != 1) {
+            System.out.println("Expected number of arguments is 1. Found: " + args.length);
+            return;
+        }
         PrintStream out = new PrintStream(
                 new FileOutputStream("log.txt", false), true);
         System.setOut(out);
         System.setErr(out);
-        translateFeatureModels();
-        // filterAfm();
-
+        translateFeatureModels(args[0]);
     }
 
     private static void deleteDirectoryStream(String path) throws IOException {
@@ -78,8 +85,8 @@ private static void deleteDirectoryStream(String path) throws IOException {
         }
     }
 
-    private static void translateFeatureModels() throws IOException {
-        String featureModelDir = "../feature-model-benchmark/feature_models/dsads/";
+    private static void translateFeatureModels(String path) throws IOException {
+        String featureModelDir = path;
 
         List<File> featureModelFiles = new ArrayList<>();
         listf(featureModelDir, featureModelFiles); // Fill list bah
@@ -168,11 +175,16 @@ private static void handleFile(String path, String originalPath, boolean zipResu
             return;
         }
 
+        String extension = getFileExtension(path);
+        String originalExtension = getFileExtension(originalPath);
+
+        if (EXTENSIONS_TO_SKIP.contains(extension)) { // Currently only skips clafer
+            return;
+        }
+
         String subPath = originalPath.split("/original/")[1];
         String subDirectoryUvlPath = "uvl" + File.separator + subPath.substring(0, subPath.lastIndexOf("/"));
         String subDirectoryDimacsPath = "dimacs" + File.separator + subPath.substring(0, subPath.lastIndexOf("/"));
-        String extension = getFileExtension(path);
-        String originalExtension = getFileExtension(originalPath);
         Files.createDirectories(Paths.get(subDirectoryUvlPath));
         Files.createDirectories(Paths.get(subDirectoryDimacsPath));
 
@@ -198,6 +210,7 @@ private static void handleFile(String path, String originalPath, boolean zipResu
                     return;
                 }
             }
+            cleanFeatureIDENamesForUVL(model);
             if (!skipUvlExport) {
                 writeUvlModel(model, uvlPath.replace(".zip", ""));
                 if (zipResult) {
@@ -292,6 +305,8 @@ private static String getFileExtension(String path) {
         return path.substring(lastIndexOf + 1);
     }
 
+ 
+
     private static String process(final Tree t, final List<String> ruleNames) {
         if (t.getChildCount() == 0)
             return Utils.escapeWhitespace(Trees.getNodeText(t, ruleNames), false);
@@ -344,4 +359,36 @@ private static Set<String> getListOfFilesInDir(String dir) {
                 .map(File::getPath)
                 .collect(Collectors.toSet());
     }
+
+
+    // ------- Model cleaning 
+
+    private static void cleanFeatureIDENamesForUVL(IFeatureModel sourceModel) {
+        Collection<IFeature> iterateCopy = new ArrayList<>();
+        iterateCopy.addAll(sourceModel.getFeatures());
+        for (IFeature feat : iterateCopy) {
+            if (needsRenaming(feat.getName())) {
+                sourceModel.getRenamingsManager().renameFeature(feat.getName(), getCleanFeatureNameForUVL(feat.getName()));
+            }
+        }
+    }
+    public static final String[] FORBIDDEN_SYMBOLS = {".", "(", ")", "/", "{", "}", "[", "]", "\"", "'"};
+    public static final String[] REPLACEMENTS = {":", "-", "-", "-", "-", "-", "-", "-", "-","-"};
+
+    private static boolean needsRenaming(String name) {
+        for (String forbidden : FORBIDDEN_SYMBOLS) {
+            if (name.contains(forbidden)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static String getCleanFeatureNameForUVL(String original) {
+        String updated = original;
+        for (int i = 0; i < FORBIDDEN_SYMBOLS.length; i++) {
+            updated = updated.replace(FORBIDDEN_SYMBOLS[i], REPLACEMENTS[i]);
+        }
+        return updated;
+    }
 }

src/main/java/at/jku/cps/travart/core/formats/afm/parser/AFM.g4

@@ -24,8 +24,6 @@ optional_spec: SPACE? '[' WORD ']' SPACE?;
 
 non_cardinal_spec: (obligatory_spec | optional_spec);
 
-
-
 //attributes block
 
 attributes_block: '%Attributes' attribute_spec*;
@@ -50,22 +48,33 @@ value_spec: (WORD | INT | DOUBLE | STRING);
 
 //constraints block
 
-constraints_block: '%Constraints' constraint_spec*;	
+constraints_block: '%Constraints' constraint_spec*;
 
 constraint_spec: brackets_spec | simple_spec;
 brackets_spec:
 	SPACE? WORD SPACE? '{' SPACE? simple_spec* SPACE? '}' SPACE?;
 simple_spec: SPACE? expression SPACE? ';' SPACE?;
 
 expression:
-	SPACE? '(' SPACE? expression SPACE? ')' SPACE?			# parenthesisExp
-	| SPACE? NOT SPACE? expression							# notExp
+	SPACE? '(' SPACE? expression SPACE? ')' SPACE?				# parenthesisExp
+	| SPACE? NOT SPACE? expression								# notExp
 	| expression SPACE? arithmetic_operator SPACE? expression	# arithmeticExp
 	| expression SPACE? relational_operator SPACE? expression	# relationalExp
 	| expression SPACE? AND SPACE? expression					# andExp
 	| expression SPACE? OR SPACE? expression					# orExp
-	| expression SPACE? logical_operator SPACE? expression	# logicalExp
-	| SPACE? (variable | number) SPACE?			# atom;
+	| expression SPACE? logical_operator SPACE? expression		# logicalExp
+	| SPACE? (variable | number) SPACE?							# atom
+	| error_expression											# ERROR;
+
+error_expression: (
+		logical_operator
+		| arithmetic_operator
+		| relational_operator
+		| number
+		| variable
+		| '('
+		| ')'
+	)*;
 
 logical_operator: IFF | IMPLIES | REQUIRES | EXCLUDES;
 arithmetic_operator: ADD | SUB | MULT | DIV | MOD | POW | ASIG;
@@ -117,7 +126,7 @@ DISTINCT: '!=';
 
 INTEGER: 'Integer';
 
-WORD: [a-zA-Z]([a-z]|[A-Z]|[0-9]|'_')*;
+WORD: [a-zA-Z]([a-z] | [A-Z] | [0-9] | '_')*;
 INT: '0' | [1-9][0-9]*;
 DOUBLE: [1-9][0-9]* '.' [0-9]+;
 STRING: '"' (~'"')* '"';