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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flamapy-dnnf
-Version: 2.6.0.dev6
+Version: 2.6.0.dev12
 Summary: flamapy-dnnf is a plugin to flamapy providing exact analysis of feature models via d-DNNF knowledge compilation with the d4 compiler
 Author-email: Flamapy <flamapy@us.es>
 License-Expression: GPL-3.0-or-later
@@ -8,9 +8,8 @@ Project-URL: Homepage, https://github.com/flamapy/dnnf_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
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"

{flamapy_dnnf-2.6.0.dev6 → flamapy_dnnf-2.6.0.dev12}/flamapy/metamodels/dnnf_metamodel/transformations/fm_to_dnnf.py

@@ -3,16 +3,16 @@ import subprocess
 import tempfile
 
 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.dnnf_metamodel.models import DDNNFModel, locate_d4
 
 
 class FmToDDNNF(ModelToModel):
     """Transform a feature model into a d-DNNF-backed model.
 
-    Builds the CNF (reusing the SAT metamodel), writes it as DIMACS, and — when ``compile`` is
-    set — invokes d4 to dump the compiled d-DNNF artifact. Exact queries run d4 on the DIMACS.
+    Builds the CNF via the feature-model ``ClauseSet`` (no SAT-solver dependency), writes it as
+    DIMACS, and — when ``compile`` is set — invokes d4 to dump the compiled d-DNNF artifact.
+    Exact queries run d4 on the DIMACS.
     """
 
     @staticmethod
@@ -35,12 +35,8 @@ class FmToDDNNF(ModelToModel):
         self.destination_model = DDNNFModel()
 
     def transform(self) -> DDNNFModel:
-        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)
 
         dimacs_fd, dimacs_path = tempfile.mkstemp(suffix='.cnf', prefix='flamapy_dnnf_')
@@ -52,8 +48,8 @@ class FmToDDNNF(ModelToModel):
         model = self.destination_model
         model.dimacs_path = dimacs_path
         model.var_count = var_count
-        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
 
         if self.compile:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flamapy-dnnf
-Version: 2.6.0.dev6
+Version: 2.6.0.dev12
 Summary: flamapy-dnnf is a plugin to flamapy providing exact analysis of feature models via d-DNNF knowledge compilation with the d4 compiler
 Author-email: Flamapy <flamapy@us.es>
 License-Expression: GPL-3.0-or-later
@@ -8,9 +8,8 @@ Project-URL: Homepage, https://github.com/flamapy/dnnf_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
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"

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

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

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

@@ -4,16 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flamapy-dnnf"
-version = "2.6.0.dev6"
+version = "2.6.0.dev12"
 description = "flamapy-dnnf is a plugin to flamapy providing exact analysis of feature models via d-DNNF knowledge compilation with the d4 compiler"
 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",
 ]
 
 [project.optional-dependencies]

{flamapy_dnnf-2.6.0.dev6 → flamapy_dnnf-2.6.0.dev12}/tests/test_dnnf.py

@@ -1,25 +1,38 @@
 """Tests for the d-DNNF (d4) metamodel.
 
 d4 is a native binary with no PyPI distribution, so these tests are skipped unless d4 is
-available (on PATH or via FLAMAPY_D4_PATH). When present, exact counts are checked against the
-SAT backend oracle.
+available (on PATH or via FLAMAPY_D4_PATH). When present, exact counts are checked against an
+oracle brute-forced from fm_metamodel's solver-agnostic ClauseSet (no SAT plugin needed).
 """
 import os
 import shutil
 import tempfile
+from itertools import product
 
 import pytest
 
 from flamapy.metamodels.fm_metamodel.transformations import UVLReader
+from flamapy.metamodels.fm_metamodel.models import FeatureModel, ClauseSet
 from flamapy.metamodels.dnnf_metamodel.transformations import FmToDDNNF
 from flamapy.metamodels.dnnf_metamodel.operations import (
     DDNNFConfigurationsNumber,
     DDNNFSatisfiable,
 )
-from flamapy.metamodels.pysat_metamodel.transformations import FmToPysat
-from flamapy.metamodels.pysat_metamodel.operations.pysat_configurations_number import (
-    PySATConfigurationsNumber,
-)
+
+
+def _exact_count(fm: FeatureModel) -> int:
+    """Exact configuration count by brute-forcing the ClauseSet CNF (no SAT backend)."""
+    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 len(configs)
 
 _D4_AVAILABLE = bool(os.environ.get('FLAMAPY_D4_PATH') or shutil.which('d4'))
 requires_d4 = pytest.mark.skipif(not _D4_AVAILABLE, reason='the d4 compiler is not installed')
@@ -51,7 +64,7 @@ def _fm(uvl):
 @requires_d4
 def test_count_matches_sat():
     fm = _fm(_UVL)
-    exact = PySATConfigurationsNumber().execute(FmToPysat(fm).transform()).get_result()
+    exact = _exact_count(fm)
     dnnf = DDNNFConfigurationsNumber().execute(FmToDDNNF(fm).transform()).get_result()
     assert dnnf == exact
 

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

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