flamapy-bdd 2.1.0.dev0__tar.gz → 2.1.0.dev1__tar.gz

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/PKG-INFO

@@ -1,18 +1,35 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: flamapy-bdd
-Version: 2.1.0.dev0
+Version: 2.1.0.dev1
 Summary: bdd-plugin for the automated analysis of feature models
 Home-page: https://github.com/flamapy/bdd_metamodel
 Author: Flamapy
 Author-email: flamapy@us.es
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+Requires-Dist: flamapy-fw~=2.1.0.dev1
+Requires-Dist: flamapy-fm~=2.1.0.dev1
+Requires-Dist: dd~=0.5.7
+Requires-Dist: graphviz~=0.20
 Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-mock; extra == "dev"
+Requires-Dist: prospector; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # BDD plugin for flamapy
 - [BDD plugin for flamapy](#bdd-plugin-for-flamapy)
@@ -212,5 +229,3 @@ Please try to follow the standards code quality to contribute to this plugin bef
 
     `make mypy`
 
-
-

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy/metamodels/bdd_metamodel/models/bdd_model.py

@@ -39,6 +39,8 @@ class BDDModel(VariabilityModel):
         self.variables_features: dict[Any, Any] = {}
         self._levels_variables: dict[int, Any] = {}
         self._formula: Any = None
+        self.mapping_secure_names: dict[str, str] = {}
+        self.mapping_secure_names_inverted: dict[str, str] = {}
 
     def build_bdd(self, expression: str) -> None:
         """Built a BDD from an expression representing a logical formula.
@@ -79,33 +81,6 @@ class BDDModel(VariabilityModel):
         self.variables_features = dict(self.features_variables)
         self._levels_variables = {level: var for var, level in self._bdd.var_levels.items()}
 
-    # @classmethod
-    # def from_logic_formula(cls,
-    #                        formula: str,
-    #                        variables: list[Any]) -> 'BDDModel':
-    #     """Build the BDD from a logic formula, and the list of variables.
-
-    #     The logic formula can be a CNF formula or a propositional logic formula.
-    #     An optional features_variables and variables_features mapping can be provided
-    #     to track safe features' and variables' names.
-    #     """
-    #     bdd_model = cls()
-    #     # Store variables
-    #     bdd_model._variables = variables
-    #     # Declare variables
-    #     bdd_model._bdd.declare(*variables)
-    #     # Build the BDD
-    #     bdd_model._root = bdd_model._bdd.add_expr(formula)
-
-    #     # Reorder for optimization
-    #     # Warning! Reordering may make the root starting to level > 0, and thus,
-    #     # operations won't work correctly.
-    #     #bdd_model._bdd.reorder()
-
-    #     # Levels and variables (dict for optimization)
-    #     bdd_model._levels_variables = {l: v for v, l in bdd_model._bdd.var_levels.items()}
-    #     return bdd_model
-
     def level_of_var(self, var: Any) -> Optional[int]:
         """Return the level of a given variable."""
         return self._bdd.var_levels.get(var, None)

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy/metamodels/bdd_metamodel/operations/bdd_configurations.py

@@ -39,10 +39,12 @@ def configurations(
         care_vars = set(bdd_model.variables_features)
         elements = {}
     else:
-        values = dict(partial_config.elements.items())
+        values = {bdd_model.mapping_secure_names[f]: selected
+                  for f, selected in partial_config.elements.items()}
         u_func = bdd_model.bdd.let(values, bdd_model.root)
         care_vars = set(bdd_model.variables_features) - set(values.keys())
-        elements = partial_config.elements
+        elements = {bdd_model.mapping_secure_names[f]: selected
+                    for f, selected in partial_config.elements.items()}
 
     configs = []
     for assignment in bdd_model.bdd.pick_iter(u_func, care_vars=care_vars):
@@ -50,5 +52,6 @@ def configurations(
             bdd_model.variables_features[f]: True for f in assignment.keys() if assignment[f]
         }
         features = features | elements
-        configs.append(Configuration(features))
+        new_features = {bdd_model.mapping_secure_names_inverted[f]: v for f, v in features.items()}
+        configs.append(Configuration(new_features))
     return configs

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy/metamodels/bdd_metamodel/operations/bdd_configurations_number.py

@@ -39,7 +39,7 @@ def configurations_number(
         n_vars = len(bdd_model.variables_features)
     else:
         values = {
-            bdd_model.features_variables[f]: selected
+            bdd_model.features_variables[bdd_model.mapping_secure_names[f]]: selected
             for f, selected in partial_configuration.elements.items()
         }
         u_func = bdd_model.bdd.let(values, bdd_model.root)

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy/metamodels/bdd_metamodel/operations/bdd_feature_inclusion_probability.py

@@ -51,17 +51,20 @@ def feature_inclusion_probability(
             values = {variable: True}
             u_func = bdd_model.bdd.let(values, bdd_model.root)
             n_vars = len(bdd_model.variables_features) - len(values)
-            prob[feature] = bdd_model.bdd.count(u_func, nvars=n_vars) / total_configs
+            feature_real_name = bdd_model.mapping_secure_names_inverted[feature]
+            prob[feature_real_name] = bdd_model.bdd.count(u_func, nvars=n_vars) / total_configs
     else:
         values = {
-            bdd_model.features_variables[f]: selected for f, selected in config.elements.items()
+            bdd_model.features_variables[bdd_model.mapping_secure_names[f]]: selected
+            for f, selected in config.elements.items()
         }
         for variable, feature in bdd_model.variables_features.items():
             feature_selected = values.get(variable, None)
             values = {variable: True}
             u_func = bdd_model.bdd.let(values, bdd_model.root)
             n_vars = len(bdd_model.variables_features) - len(values)
-            prob[feature] = bdd_model.bdd.count(u_func, nvars=n_vars) / total_configs
+            feature_real_name = bdd_model.mapping_secure_names_inverted[feature]
+            prob[feature_real_name] = bdd_model.bdd.count(u_func, nvars=n_vars) / total_configs
             if feature_selected is None:
                 values.pop(variable)
             else:

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy/metamodels/bdd_metamodel/operations/bdd_homogeneity.py

@@ -28,7 +28,8 @@ def homogeneity(bdd_model: BDDModel) -> float:
     commonality_op = BDDCommonalityFactor()
 
     for feature in bdd_model.features_variables:
-        config = Configuration(elements={feature: True})
+        feature_real_name = bdd_model.mapping_secure_names_inverted[feature]
+        config = Configuration(elements={feature_real_name: True})
         commonality_op.set_configuration(config)
         commonality_sum += commonality_op.execute(bdd_model).get_result()
     return commonality_sum / len(bdd_model.variables_features)

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy/metamodels/bdd_metamodel/operations/bdd_sampling.py

@@ -80,7 +80,8 @@ def random_configuration(
         values = {}
     else:
         values = {
-            bdd_model.features_variables[f]: selected for f, selected in p_config.elements.items()
+            bdd_model.features_variables[bdd_model.mapping_secure_names[f]]: selected
+            for f, selected in p_config.elements.items()
         }
 
     # Set the BDD nodes with the already known features values
@@ -107,5 +108,6 @@ def random_configuration(
 
         n_vars -= 1
     return Configuration(
-        {bdd_model.variables_features[v]: selected for v, selected in values.items()}
+        {bdd_model.mapping_secure_names_inverted[bdd_model.variables_features[v]]: selected
+         for v, selected in values.items()}
     )

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy/metamodels/bdd_metamodel/operations/bdd_unique_features.py

@@ -38,7 +38,8 @@ def unique_features(bdd_model: BDDModel, config: Optional[Configuration] = None)
                 unique_features_list.append(feature)
     else:
         values = {
-            bdd_model.features_variables[f]: selected for f, selected in config.elements.items()
+            bdd_model.features_variables[bdd_model.mapping_secure_names[f]]: selected
+            for f, selected in config.elements.items()
         }
         for variable, feature in bdd_model.variables_features.items():
             feature_selected = values.get(variable, None)

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy/metamodels/bdd_metamodel/transformations/__init__.py

@@ -1,4 +1,4 @@
-from .fm_to_bdd_pl import FmToBDD
+from .fm_to_bdd import FmToBDD
 from .json_writer import JSONWriter
 from .json_reader import JSONReader
 from .pickle_writer import PickleWriter

flamapy-bdd-2.1.0.dev0/flamapy/metamodels/bdd_metamodel/transformations/fm_to_bdd_pl.py → flamapy_bdd-2.1.0.dev1/flamapy/metamodels/bdd_metamodel/transformations/fm_to_bdd.py

@@ -6,6 +6,7 @@ from flamapy.core.models.ast import ASTOperation
 from flamapy.core.transformations import ModelToModel
 from flamapy.metamodels.fm_metamodel.models import FeatureModel, Feature, Relation, Constraint
 from flamapy.metamodels.bdd_metamodel.models import BDDModel
+from flamapy.metamodels.fm_metamodel.transformations import FMSecureFeaturesNames
 
 
 class FmToBDD(ModelToModel):
@@ -23,11 +24,17 @@ class FmToBDD(ModelToModel):
         self._counter: int = 0
 
     def transform(self) -> BDDModel:
+        fm_secure_names_op = FMSecureFeaturesNames(self.source_model)
+        self.source_model = fm_secure_names_op.transform()
         self.destination_model = BDDModel()
         for feature in self.source_model.get_features():
             self._add_feature(feature)
         formula = self._traverse_feature_tree()
         self.destination_model.build_bdd(formula)
+
+        self.destination_model.mapping_secure_names = fm_secure_names_op.mapping_names
+        msn_inverted = {val: key for key, val in fm_secure_names_op.mapping_names.items()}
+        self.destination_model.mapping_secure_names_inverted = msn_inverted
         return self.destination_model
 
     def _add_feature(self, feature: Feature) -> str:

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy_bdd.egg-info/PKG-INFO

@@ -1,18 +1,35 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: flamapy-bdd
-Version: 2.1.0.dev0
+Version: 2.1.0.dev1
 Summary: bdd-plugin for the automated analysis of feature models
 Home-page: https://github.com/flamapy/bdd_metamodel
 Author: Flamapy
 Author-email: flamapy@us.es
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+Requires-Dist: flamapy-fw~=2.1.0.dev1
+Requires-Dist: flamapy-fm~=2.1.0.dev1
+Requires-Dist: dd~=0.5.7
+Requires-Dist: graphviz~=0.20
 Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-mock; extra == "dev"
+Requires-Dist: prospector; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # BDD plugin for flamapy
 - [BDD plugin for flamapy](#bdd-plugin-for-flamapy)
@@ -212,5 +229,3 @@ Please try to follow the standards code quality to contribute to this plugin bef
 
     `make mypy`
 
-
-

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy_bdd.egg-info/SOURCES.txt

@@ -37,18 +37,16 @@ flamapy/metamodels/bdd_metamodel/transformations/_bdd_writer.py
 flamapy/metamodels/bdd_metamodel/transformations/dddmp_reader.py
 flamapy/metamodels/bdd_metamodel/transformations/dddmp_writer.py
 flamapy/metamodels/bdd_metamodel/transformations/fm_to_bdd.py
-flamapy/metamodels/bdd_metamodel/transformations/fm_to_bdd_cnf.py
-flamapy/metamodels/bdd_metamodel/transformations/fm_to_bdd_pl.py
 flamapy/metamodels/bdd_metamodel/transformations/json_reader.py
 flamapy/metamodels/bdd_metamodel/transformations/json_writer.py
 flamapy/metamodels/bdd_metamodel/transformations/pdf_writer.py
 flamapy/metamodels/bdd_metamodel/transformations/pickle_reader.py
 flamapy/metamodels/bdd_metamodel/transformations/pickle_writer.py
 flamapy/metamodels/bdd_metamodel/transformations/png_writer.py
-flamapy/metamodels/bdd_metamodel/transformations/sat_to_bdd.py
 flamapy/metamodels/bdd_metamodel/transformations/svg_writer.py
 flamapy_bdd.egg-info/PKG-INFO
 flamapy_bdd.egg-info/SOURCES.txt
 flamapy_bdd.egg-info/dependency_links.txt
 flamapy_bdd.egg-info/requires.txt
-flamapy_bdd.egg-info/top_level.txt
+flamapy_bdd.egg-info/top_level.txt
+tests/test_bdd_metamodel.py

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/flamapy_bdd.egg-info/requires.txt

@@ -1,5 +1,5 @@
-flamapy-fw~=2.1.0.dev0
-flamapy-fm~=2.1.0.dev0
+flamapy-fw~=2.1.0.dev1
+flamapy-fm~=2.1.0.dev1
 dd~=0.5.7
 graphviz~=0.20
 

{flamapy-bdd-2.1.0.dev0 → flamapy_bdd-2.1.0.dev1}/setup.py

@@ -18,7 +18,7 @@ dev_requirements = read_requirements("requirements-dev.txt")
 
 setuptools.setup(
     name="flamapy-bdd",
-    version="2.1.0.dev0",
+    version="2.1.0.dev1",
     author="Flamapy",
     author_email="flamapy@us.es",
     description="bdd-plugin for the automated analysis of feature models",