flamapy-fw 2.0.0.dev7__tar.gz → 2.0.2.dev0__tar.gz

{flamapy-fw-2.0.0.dev7 → flamapy-fw-2.0.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flamapy-fw
-Version: 2.0.0.dev7
+Version: 2.0.2.dev0
 Summary: Flamapy is a Python-based AAFM framework that takes into consideration previous AAFM tool designs and enables multi-solver and multi-metamodel support for the integration of AAFM tooling on the Python ecosystem.
 Home-page: https://github.com/flamapy/core
 Author: Flamapy

{flamapy-fw-2.0.0.dev7 → flamapy-fw-2.0.2.dev0}/flamapy/core/discover.py

@@ -179,12 +179,14 @@ class DiscoverMetamodels:
         operation = plugin.get_operation(operation_name)
         return plugin.use_operation(operation, src)
 
+    # pylint: disable=too-many-arguments
     def use_operation_from_vm(
         self,
         operation_name: str,
         vm_orig: VariabilityModel,
         plugin_name: Optional[str] = None,
-        configuration_file: Optional[str] = None
+        configuration_file: Optional[str] = None,
+        is_full: Optional[bool] = False
     ) -> Any:
 
         if operation_name not in self.get_name_operations():
@@ -212,18 +214,23 @@ class DiscoverMetamodels:
             if configuration_file is None:
                 raise ConfigurationNotFound()
             configuration = self.__transform_to_model_from_file(configuration_file)
-            operation.set_configuration(cast(Configuration, configuration))
+            configuration = cast(Configuration, configuration)
+            is_full_value = is_full if is_full is not None else False
+            configuration.set_full(is_full_value)
+            operation.set_configuration(configuration)
 
         operation = plugin.use_operation(operation, vm_temp)
 
         return operation.get_result()
 
+    # pylint: disable=too-many-arguments
     def use_operation_from_file(
         self,
         operation_name: str,
         file: str,
         plugin_name: Optional[str] = None,
-        configuration_file: Optional[str] = None
+        configuration_file: Optional[str] = None,
+        is_full: Optional[bool] = False
     ) -> Any:
 
         if operation_name not in self.get_name_operations():
@@ -251,7 +258,10 @@ class DiscoverMetamodels:
             if configuration_file is None:
                 raise ConfigurationNotFound()
             configuration = self.__transform_to_model_from_file(configuration_file)
-            operation.set_configuration(cast(Configuration, configuration))
+            configuration = cast(Configuration, configuration)
+            is_full_value = is_full if is_full is not None else False
+            configuration.set_full(is_full_value)
+            operation.set_configuration(configuration)
 
         operation = plugin.use_operation(operation, vm_temp)
         return operation.get_result()

{flamapy-fw-2.0.0.dev7 → flamapy-fw-2.0.2.dev0}/flamapy/core/models/ast.py

@@ -1,8 +1,10 @@
+import string
 from typing import Any
 from enum import Enum
 
 
 class ASTOperation(Enum):
+    # logical operators
     REQUIRES = 'REQUIRES'
     EXCLUDES = 'EXCLUDES'
     AND = 'AND'
@@ -33,6 +35,35 @@ class ASTOperation(Enum):
     CEIL = 'CEIL'
 
 
+LOGICAL_OPERATORS = [ASTOperation.REQUIRES, 
+                     ASTOperation.EXCLUDES, 
+                     ASTOperation.AND,
+                     ASTOperation.OR, 
+                     ASTOperation.XOR, 
+                     ASTOperation.IMPLIES,
+                     ASTOperation.NOT, 
+                     ASTOperation.EQUIVALENCE]
+
+
+ARITHMETIC_OPERATORS = [ASTOperation.ADD, 
+                        ASTOperation.SUB, 
+                        ASTOperation.MUL, 
+                        ASTOperation.DIV,
+                        ASTOperation.EQUALS,
+                        ASTOperation.LOWER,
+                        ASTOperation.GREATER,
+                        ASTOperation.LOWER_EQUALS,
+                        ASTOperation.GREATER_EQUALS,
+                        ASTOperation.NOT_EQUALS]
+
+
+AGGREGATION_OPERATORS = [ASTOperation.SUM, 
+                         ASTOperation.AVG, 
+                         ASTOperation.LEN,
+                         ASTOperation.FLOOR,
+                         ASTOperation.CEIL]
+
+  
 class Node:
 
     def __init__(self, data: Any, left: 'Node' = None, right: 'Node' = None):  # type: ignore
@@ -53,7 +84,10 @@ class Node:
         return not self.is_op() and self.left is None
 
     def is_binary_op(self) -> bool:
-        return not self.is_unique_term() and not self.is_unary_op()
+        return not self.is_unique_term() and not self.is_unary_op() and not self.is_aggregate_op()
+
+    def is_aggregate_op(self) -> bool:
+        return self.is_op() and self.data in AGGREGATION_OPERATORS
 
     def __str__(self) -> str:
         data = self.data.value if self.is_op() else safename(str(self.data))
@@ -85,6 +119,9 @@ class Node:
             res = f'{data}'
         elif self.is_unary_op():
             res = f'{data} {left}'
+        elif self.is_aggregate_op():
+            if self.right is not None:
+                res = f'{data}({left}, {right})'
         else:  # binary operation
             res = f'{left} {data} {right}'
         return res
@@ -120,6 +157,36 @@ class AST:
         ast = self.to_cnf()
         return get_clauses(ast)
 
+    def get_operators(self) -> list[ASTOperation]:
+        operators = list()
+        stack = [self.root]
+        while stack:
+            node = stack.pop()
+            if node is not None:
+                if node.is_op():
+                    operators.append(node.data)
+                if node.is_unary_op():
+                    stack.append(node.left)
+                elif node.is_binary_op():
+                    stack.append(node.right)
+                    stack.append(node.left)
+        return operators
+
+    def get_operands(self) -> list[Any]:
+        operands = list()
+        stack = [self.root]
+        while stack:
+            node = stack.pop()
+            if node is not None:    
+                if node.is_term():
+                    operands.append(node.data)
+                elif node.is_unary_op():
+                    stack.append(node.left)
+                elif node.is_binary_op():
+                    stack.append(node.right)
+                    stack.append(node.left)
+        return operands
+    
     def __str__(self) -> str:
         return str(self.root)
 
@@ -305,4 +372,16 @@ def get_clause_from_or_node(node: Node) -> list[Any]:
 
 
 def safename(name: str) -> str:
-    return f'"{name}"' if ' ' in name else name
+    if '.' in name:
+        return '.'.join([safe_simple_name(simple_name) for simple_name in name.split('.')])
+    return safe_simple_name(name)
+
+
+def safe_simple_name(name: str) -> str:
+    if name.startswith("'") and name.endswith("'"):
+        return name
+    return f'"{name}"' if any(char not in safecharacters() for char in name) else name
+
+
+def safecharacters() -> str:
+    return string.ascii_letters + string.digits + '_'

{flamapy-fw-2.0.0.dev7 → flamapy-fw-2.0.2.dev0}/flamapy/core/operations/metrics_operation.py

@@ -69,7 +69,7 @@ class Metrics(Operation, metaclass=ABCMeta):
                     return m_to_m
         except FlamaException:
             LOGGER.exception("No transformation found that is required in the Metrics operation")
-        raise FlamaException("No transformation found")
+        raise FlamaException(f"No transformation found for {orig} -> {dest}")
 
     def get_result(self) -> list[dict[str, Any]]:
         return self.result
@@ -92,8 +92,8 @@ class Metrics(Operation, metaclass=ABCMeta):
     def construct_result(name: str,
                          doc: str,
                          result: Any, 
-                         size: int = 0, 
-                         ratio: float = 0.0,
+                         size: Optional[int] = None, 
+                         ratio: Optional[float] = None,
                          parent: Optional[Any] = None,
                          level: int = 0
                          ) -> dict[str, Any]:  

{flamapy-fw-2.0.0.dev7 → flamapy-fw-2.0.2.dev0}/flamapy/core/operations/satisfiable_configuration.py

@@ -11,7 +11,7 @@ class SatisfiableConfiguration(Operation):
         pass
 
     @abstractmethod
-    def set_configuration(self, configuration: Configuration, is_full: bool) -> None:
+    def set_configuration(self, configuration: Configuration) -> None:
         pass
 
     @abstractmethod

{flamapy-fw-2.0.0.dev7 → flamapy-fw-2.0.2.dev0}/flamapy/metamodels/configuration_metamodel/models/configuration.py

@@ -10,6 +10,10 @@ class Configuration(VariabilityModel):
 
     def __init__(self, elements: dict[Any, bool]) -> None:
         self.elements = elements
+        self.is_full = False
+
+    def set_full(self, is_full: bool) -> None:
+        self.is_full = is_full
 
     def get_selected_elements(self) -> list[Any]:
         return [e for e in self.elements if self.elements[e]]

{flamapy-fw-2.0.0.dev7 → flamapy-fw-2.0.2.dev0}/flamapy_fw.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flamapy-fw
-Version: 2.0.0.dev7
+Version: 2.0.2.dev0
 Summary: Flamapy is a Python-based AAFM framework that takes into consideration previous AAFM tool designs and enables multi-solver and multi-metamodel support for the integration of AAFM tooling on the Python ecosystem.
 Home-page: https://github.com/flamapy/core
 Author: Flamapy

{flamapy-fw-2.0.0.dev7 → flamapy-fw-2.0.2.dev0}/setup.py

@@ -13,7 +13,7 @@ dev_requirements = read_requirements("requirements-dev.txt")
 
 setuptools.setup(
     name="flamapy-fw",
-    version="2.0.0.dev7",
+    version="2.0.2.dev0",
     author="Flamapy",
     author_email="flamapy@us.es",
     description="Flamapy is a Python-based AAFM framework that takes into consideration previous AAFM tool designs and enables multi-solver and multi-metamodel support for the integration of AAFM tooling on the Python ecosystem.",