fix: bring updates from master to develop

flamapy/core/discover.py

@@ -169,7 +169,11 @@ def use_transformation_t2m(self, src: str, dst: str) -> VariabilityModel:
     def use_transformation_m2m(self, src: VariabilityModel, dst: str) -> VariabilityModel:
         plugin = self.plugins.get_plugin_by_extension(dst)
         return plugin.use_transformation_m2m(src, dst)
-
+
+    def get_operation(self, src: VariabilityModel, operation_name: str) -> Operation:
+        plugin = self.plugins.get_plugin_by_variability_model(src)
+        return plugin.get_operation(operation_name)
+
     def use_operation(self, src: VariabilityModel, operation_name: str) -> Operation:
         plugin = self.plugins.get_plugin_by_variability_model(src)
         operation = plugin.get_operation(operation_name)
@@ -275,4 +279,4 @@ def __search_recursive_way(
             if way and output_extension == way[-1][1]:
                 return way
 
-        raise NotImplementedError('Way to execute operation not found')
+        raise NotImplementedError('Way to execute operation not found')

flamapy/core/models/ast.py

@@ -134,11 +134,11 @@ def simplify_formula(ast: AST) -> AST:
         right = simplify_formula(AST(right)).root
         result = AST.create_binary_operation(ASTOperation.OR, Node(ASTOperation.NOT, left), right)
     elif logic_op == ASTOperation.EXCLUDES:
-        # Replace P EXCLUDES Q with P => !Q.
+        # Replace P EXCLUDES Q with !P v !Q.
         left = simplify_formula(AST(left)).root
         right = simplify_formula(AST(right)).root
-        result = AST.create_binary_operation(ASTOperation.IMPLIES,
-                                             left, Node(ASTOperation.NOT, right))
+        result = AST.create_binary_operation(ASTOperation.OR, Node(ASTOperation.NOT, left), 
+                                             Node(ASTOperation.NOT, right))
     elif logic_op == ASTOperation.EQUIVALENCE:
         # Replace P <=> Q with P => Q ∧ Q => P.
         left = simplify_formula(AST.create_binary_operation(ASTOperation.IMPLIES,

flamapy/endpoint/diverso_lab.py

@@ -1,4 +1,4 @@
-from typing import Any, NewType, Optional
+from typing import Any, NewType
 
 import hug
 from flamapy.core.discover import DiscoverMetamodels
@@ -37,15 +37,16 @@ def get_operations_name_by_plugin(plugin: str, versions: int = 1) -> OperationDi
 def use_operation_from_file(
     operation: str,
     filename: str,
-    plugin: Optional[str] = None,
+    plugin: str = None,
+    configuration_file: str = None,
     versions: int = 1
 ) -> OperationResult:
     """
     Execute an operation gave an operation and one input file. Optionally you
     can give a plugin as last parameter.
     """
     try:
-        result = dm.use_operation_from_file(operation, filename, plugin)
+        result = dm.use_operation_from_file(operation, filename, plugin, configuration_file)
     except OperationNotFound:
         return OperationResult({'Error': 'Operation not found'})
     except PluginNotFound: