flamapy-sdd 2.6.0.dev6__tar.gz → 2.6.0.dev12__tar.gz

{flamapy_sdd-2.6.0.dev6 → flamapy_sdd-2.6.0.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flamapy-sdd
-Version: 2.6.0.dev6
+Version: 2.6.0.dev12
 Summary: flamapy-sdd is a plugin to flamapy providing Sentential Decision Diagram (SDD) knowledge compilation for exact analysis of feature models
 Author-email: Flamapy <flamapy@us.es>
 License-Expression: GPL-3.0-or-later
@@ -8,9 +8,8 @@ Project-URL: Homepage, https://github.com/flamapy/sdd_metamodel
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flamapy-fw~=2.6.0.dev5
-Requires-Dist: flamapy-fm~=2.6.0.dev5
-Requires-Dist: flamapy-sat~=2.6.0.dev5
+Requires-Dist: flamapy-fw~=2.6.0.dev12
+Requires-Dist: flamapy-fm~=2.6.0.dev12
 Requires-Dist: PySDD~=1.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"

{flamapy_sdd-2.6.0.dev6 → flamapy_sdd-2.6.0.dev12}/flamapy/metamodels/sdd_metamodel/transformations/fm_to_sdd.py

@@ -1,15 +1,14 @@
 from pysdd.sdd import SddManager, Vtree
 
 from flamapy.core.transformations import ModelToModel
-from flamapy.metamodels.fm_metamodel.models import FeatureModel
-from flamapy.metamodels.pysat_metamodel.transformations import FmToPysat
+from flamapy.metamodels.fm_metamodel.models import FeatureModel, ClauseSet
 from flamapy.metamodels.sdd_metamodel.models import SDDModel
 
 
 class FmToSDD(ModelToModel):
     """Transform a feature model into an SDD by compiling its CNF with PySDD.
 
-    The CNF is produced by reusing the SAT metamodel's ``FmToPysat`` transformation, then
+    The CNF is produced by the feature-model ``ClauseSet`` (no SAT-solver dependency), then
     conjoined clause by clause into an SDD over a balanced vtree.
     """
 
@@ -27,14 +26,8 @@ class FmToSDD(ModelToModel):
         self.destination_model = SDDModel()
 
     def transform(self) -> SDDModel:
-        # Only pass cnf_method for a non-default encoding, so the plugin also works against
-        # releases of flamapy-sat that predate the Tseytin cnf_method option.
-        if self.cnf_method == 'distributive':
-            sat_model = FmToPysat(self.source_model).transform()
-        else:
-            sat_model = FmToPysat(self.source_model, cnf_method=self.cnf_method).transform()
-
-        clauses = [list(clause) for clause in sat_model.get_all_clauses().clauses]
+        clause_set = ClauseSet.from_feature_model(self.source_model, cnf_method=self.cnf_method)
+        clauses = [list(clause) for clause in clause_set.clauses]
         var_count = max((abs(literal) for clause in clauses for literal in clause), default=1)
 
         vtree = Vtree(var_count=var_count, vtree_type='balanced')
@@ -49,7 +42,7 @@ class FmToSDD(ModelToModel):
         model = self.destination_model
         model.manager = manager
         model.root = root
-        model.variables = dict(sat_model.variables)
-        model.features = dict(sat_model.features)
+        model.variables = dict(clause_set.variables)
+        model.features = dict(clause_set.features)
         model.original_model = self.source_model
         return model

{flamapy_sdd-2.6.0.dev6 → flamapy_sdd-2.6.0.dev12}/flamapy_sdd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flamapy-sdd
-Version: 2.6.0.dev6
+Version: 2.6.0.dev12
 Summary: flamapy-sdd is a plugin to flamapy providing Sentential Decision Diagram (SDD) knowledge compilation for exact analysis of feature models
 Author-email: Flamapy <flamapy@us.es>
 License-Expression: GPL-3.0-or-later
@@ -8,9 +8,8 @@ Project-URL: Homepage, https://github.com/flamapy/sdd_metamodel
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flamapy-fw~=2.6.0.dev5
-Requires-Dist: flamapy-fm~=2.6.0.dev5
-Requires-Dist: flamapy-sat~=2.6.0.dev5
+Requires-Dist: flamapy-fw~=2.6.0.dev12
+Requires-Dist: flamapy-fm~=2.6.0.dev12
 Requires-Dist: PySDD~=1.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"

flamapy_sdd-2.6.0.dev12/flamapy_sdd.egg-info/requires.txt

@@ -0,0 +1,10 @@
+flamapy-fw~=2.6.0.dev12
+flamapy-fm~=2.6.0.dev12
+PySDD~=1.0
+
+[dev]
+pytest
+pytest-mock
+prospector
+mypy
+coverage

{flamapy_sdd-2.6.0.dev6 → flamapy_sdd-2.6.0.dev12}/pyproject.toml

@@ -4,16 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flamapy-sdd"
-version = "2.6.0.dev6"
+version = "2.6.0.dev12"
 description = "flamapy-sdd is a plugin to flamapy providing Sentential Decision Diagram (SDD) knowledge compilation for exact analysis of feature models"
 readme = "README.md"
 license = "GPL-3.0-or-later"
 authors = [{ name = "Flamapy", email = "flamapy@us.es" }]
 requires-python = ">=3.11"
 dependencies = [
-    "flamapy-fw~=2.6.0.dev5",
-    "flamapy-fm~=2.6.0.dev5",
-    "flamapy-sat~=2.6.0.dev5",
+    "flamapy-fw~=2.6.0.dev12",
+    "flamapy-fm~=2.6.0.dev12",
     "PySDD~=1.0",
 ]
 

flamapy_sdd-2.6.0.dev12/tests/test_sdd.py

@@ -0,0 +1,108 @@
+"""Tests for the SDD metamodel: exact counting, satisfiability, core/dead features.
+
+Oracles are computed by brute-forcing the CNF from fm_metamodel's solver-agnostic ClauseSet,
+so CI needs no SAT plugin — only flamapy-fm, which is already a declared dependency.
+"""
+import os
+import tempfile
+from itertools import product
+
+from flamapy.metamodels.fm_metamodel.transformations import UVLReader
+from flamapy.metamodels.fm_metamodel.models import FeatureModel, ClauseSet
+from flamapy.metamodels.sdd_metamodel.transformations import FmToSDD
+from flamapy.metamodels.sdd_metamodel.operations import (
+    SDDConfigurationsNumber,
+    SDDSatisfiable,
+    SDDCoreFeatures,
+    SDDDeadFeatures,
+)
+
+
+def _valid_configs(fm: FeatureModel) -> tuple:
+    """(valid configurations as frozensets of selected names, all feature names)."""
+    clause_set = ClauseSet.from_feature_model(fm)
+    name_of = {vid: name for name, vid in clause_set.variables.items()}
+    var_ids = sorted({abs(lit) for clause in clause_set.clauses for lit in clause}
+                     | set(clause_set.variables.values()))
+    configs = set()
+    for bits in product((False, True), repeat=len(var_ids)):
+        assignment = dict(zip(var_ids, bits))
+        if all(any((lit > 0) == assignment[abs(lit)] for lit in clause)
+               for clause in clause_set.clauses):
+            configs.add(frozenset(name_of[v] for v in var_ids if assignment[v] and v in name_of))
+    return configs, set(clause_set.variables)
+
+
+def _exact_count(fm: FeatureModel) -> int:
+    return len(_valid_configs(fm)[0])
+
+
+def _core_features(fm: FeatureModel) -> set:
+    configs, names = _valid_configs(fm)
+    return {name for name in names if configs and all(name in cfg for cfg in configs)}
+
+
+def _dead_features(fm: FeatureModel) -> set:
+    configs, names = _valid_configs(fm)
+    return names - (set().union(*configs) if configs else set())
+
+_UVL = """features
+    Root {abstract}
+        mandatory
+            Base
+        optional
+            A
+            B
+            C
+constraints
+    A => B
+    A | B
+"""
+
+_UNSAT_UVL = """features
+    Root {abstract}
+        mandatory
+            A
+constraints
+    !A
+"""
+
+
+def _fm(uvl):
+    handle, path = tempfile.mkstemp(suffix='.uvl')
+    try:
+        with os.fdopen(handle, 'w') as file:
+            file.write(uvl)
+        return UVLReader(path).transform()
+    finally:
+        os.remove(path)
+
+
+def test_count_matches_sat_enumeration():
+    fm = _fm(_UVL)
+    exact = _exact_count(fm)
+    sdd = SDDConfigurationsNumber().execute(FmToSDD(fm).transform()).get_result()
+    assert sdd == exact
+
+
+def test_satisfiable():
+    assert SDDSatisfiable().execute(FmToSDD(_fm(_UVL)).transform()).get_result() is True
+
+
+def test_unsatisfiable_model():
+    assert SDDSatisfiable().execute(FmToSDD(_fm(_UNSAT_UVL)).transform()).get_result() is False
+
+
+def test_core_features_match_sat():
+    fm = _fm(_UVL)
+    expected = _core_features(fm)
+    sdd = set(SDDCoreFeatures().execute(FmToSDD(fm).transform()).get_result())
+    assert sdd == expected
+    assert 'Base' in sdd and 'Root' in sdd  # mandatory chain is core
+
+
+def test_dead_features_match_sat():
+    fm = _fm(_UVL)
+    expected = _dead_features(fm)
+    sdd = set(SDDDeadFeatures().execute(FmToSDD(fm).transform()).get_result())
+    assert sdd == expected  # no dead features in this model

flamapy_sdd-2.6.0.dev6/flamapy_sdd.egg-info/requires.txt

@@ -1,11 +0,0 @@
-flamapy-fw~=2.6.0.dev5
-flamapy-fm~=2.6.0.dev5
-flamapy-sat~=2.6.0.dev5
-PySDD~=1.0
-
-[dev]
-pytest
-pytest-mock
-prospector
-mypy
-coverage

flamapy_sdd-2.6.0.dev6/tests/test_sdd.py

@@ -1,82 +0,0 @@
-"""Tests for the SDD metamodel: exact counting, satisfiability, core/dead features.
-
-Oracles come from the SAT backend (a declared dependency) so CI needs no extra plugin.
-"""
-import os
-import tempfile
-
-from flamapy.metamodels.fm_metamodel.transformations import UVLReader
-from flamapy.metamodels.sdd_metamodel.transformations import FmToSDD
-from flamapy.metamodels.sdd_metamodel.operations import (
-    SDDConfigurationsNumber,
-    SDDSatisfiable,
-    SDDCoreFeatures,
-    SDDDeadFeatures,
-)
-from flamapy.metamodels.pysat_metamodel.transformations import FmToPysat
-from flamapy.metamodels.pysat_metamodel.operations.pysat_configurations_number import (
-    PySATConfigurationsNumber,
-)
-from flamapy.metamodels.pysat_metamodel.operations.pysat_core_features import PySATCoreFeatures
-from flamapy.metamodels.pysat_metamodel.operations.pysat_dead_features import PySATDeadFeatures
-
-_UVL = """features
-    Root {abstract}
-        mandatory
-            Base
-        optional
-            A
-            B
-            C
-constraints
-    A => B
-    A | B
-"""
-
-_UNSAT_UVL = """features
-    Root {abstract}
-        mandatory
-            A
-constraints
-    !A
-"""
-
-
-def _fm(uvl):
-    handle, path = tempfile.mkstemp(suffix='.uvl')
-    try:
-        with os.fdopen(handle, 'w') as file:
-            file.write(uvl)
-        return UVLReader(path).transform()
-    finally:
-        os.remove(path)
-
-
-def test_count_matches_sat_enumeration():
-    fm = _fm(_UVL)
-    exact = PySATConfigurationsNumber().execute(FmToPysat(fm).transform()).get_result()
-    sdd = SDDConfigurationsNumber().execute(FmToSDD(fm).transform()).get_result()
-    assert sdd == exact
-
-
-def test_satisfiable():
-    assert SDDSatisfiable().execute(FmToSDD(_fm(_UVL)).transform()).get_result() is True
-
-
-def test_unsatisfiable_model():
-    assert SDDSatisfiable().execute(FmToSDD(_fm(_UNSAT_UVL)).transform()).get_result() is False
-
-
-def test_core_features_match_sat():
-    fm = _fm(_UVL)
-    sat = set(PySATCoreFeatures().execute(FmToPysat(fm).transform()).get_result())
-    sdd = set(SDDCoreFeatures().execute(FmToSDD(fm).transform()).get_result())
-    assert sdd == sat
-    assert 'Base' in sdd and 'Root' in sdd  # mandatory chain is core
-
-
-def test_dead_features_match_sat():
-    fm = _fm(_UVL)
-    sat = set(PySATDeadFeatures().execute(FmToPysat(fm).transform()).get_result())
-    sdd = set(SDDDeadFeatures().execute(FmToSDD(fm).transform()).get_result())
-    assert sdd == sat  # no dead features in this model