flamapy-sharpsat 2.6.0.dev5__tar.gz → 2.6.0.dev12__tar.gz

{flamapy_sharpsat-2.6.0.dev5/flamapy_sharpsat.egg-info → flamapy_sharpsat-2.6.0.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flamapy-sharpsat
-Version: 2.6.0.dev5
+Version: 2.6.0.dev12
 Summary: flamapy-sharpsat is a plugin to flamapy providing approximate model counting and almost-uniform sampling
 Author-email: Flamapy <flamapy@us.es>
 License-Expression: GPL-3.0-or-later
@@ -8,9 +8,8 @@ Project-URL: Homepage, https://github.com/flamapy/sharpsat_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: pyunigen~=2.5
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"

flamapy_sharpsat-2.6.0.dev12/flamapy/metamodels/sharpsat_metamodel/transformations/fm_to_sharpsat.py

@@ -0,0 +1,35 @@
+from flamapy.core.transformations import ModelToModel
+from flamapy.metamodels.fm_metamodel.models import FeatureModel, ClauseSet
+from flamapy.metamodels.sharpsat_metamodel.models import SharpSATModel
+
+
+class FmToSharpSAT(ModelToModel):
+    """Transform a feature model into a SharpSAT (CNF) model.
+
+    The CNF is produced by the feature-model ``ClauseSet`` (no SAT-solver dependency), so the
+    same constraint encoding (and the optional Tseytin encoding via ``cnf_method``) is available
+    here.
+    """
+
+    @staticmethod
+    def get_source_extension() -> str:
+        return 'fm'
+
+    @staticmethod
+    def get_destination_extension() -> str:
+        return 'sharpsat'
+
+    def __init__(self, source_model: FeatureModel, cnf_method: str = 'distributive') -> None:
+        self.source_model = source_model
+        self.cnf_method = cnf_method
+        self.destination_model = SharpSATModel()
+
+    def transform(self) -> SharpSATModel:
+        clause_set = ClauseSet.from_feature_model(self.source_model, cnf_method=self.cnf_method)
+        model = self.destination_model
+        model.clauses = [list(clause) for clause in clause_set.clauses]
+        model.variables = dict(clause_set.variables)
+        model.features = dict(clause_set.features)
+        model.auxiliary_variables = set(clause_set.auxiliary_variables)
+        model.original_model = self.source_model
+        return model

{flamapy_sharpsat-2.6.0.dev5 → flamapy_sharpsat-2.6.0.dev12/flamapy_sharpsat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flamapy-sharpsat
-Version: 2.6.0.dev5
+Version: 2.6.0.dev12
 Summary: flamapy-sharpsat is a plugin to flamapy providing approximate model counting and almost-uniform sampling
 Author-email: Flamapy <flamapy@us.es>
 License-Expression: GPL-3.0-or-later
@@ -8,9 +8,8 @@ Project-URL: Homepage, https://github.com/flamapy/sharpsat_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: pyunigen~=2.5
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"

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

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

{flamapy_sharpsat-2.6.0.dev5 → flamapy_sharpsat-2.6.0.dev12}/pyproject.toml

@@ -4,16 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flamapy-sharpsat"
-version = "2.6.0.dev5"
+version = "2.6.0.dev12"
 description = "flamapy-sharpsat is a plugin to flamapy providing approximate model counting and almost-uniform sampling"
 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",
     "pyunigen~=2.5",
 ]
 

{flamapy_sharpsat-2.6.0.dev5 → flamapy_sharpsat-2.6.0.dev12}/tests/test_sharpsat.py

@@ -1,28 +1,42 @@
 """Tests for the sharpsat metamodel: approximate counting and almost-uniform sampling."""
 import os
 import tempfile
+from itertools import product
 
 import pytest
 
 from flamapy.metamodels.fm_metamodel.transformations import UVLReader
-from flamapy.metamodels.fm_metamodel.models import FeatureModel
+from flamapy.metamodels.fm_metamodel.models import FeatureModel, ClauseSet
 from flamapy.metamodels.sharpsat_metamodel.transformations import FmToSharpSAT
 from flamapy.metamodels.sharpsat_metamodel.operations import (
     SharpSATConfigurationsNumber,
     SharpSATSampling,
 )
-
-# Exact oracle and validity oracle via SAT (a declared dependency, unlike BDD).
-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_satisfiable_configuration import (
-    PySATSatisfiableConfiguration,
-)
 from flamapy.metamodels.configuration_metamodel.models.configuration import Configuration
 
 
+# Exact oracle: enumerate the valid configurations by brute-forcing the CNF produced by
+# fm_metamodel's solver-agnostic ClauseSet — no SAT backend, so the tests only depend on
+# flamapy-fm (already required) and match sharpsat's own encoding path.
+def _valid_configs(fm: FeatureModel) -> set:
+    """Valid configurations as frozensets of selected 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
+
+
+def _exact_count(fm: FeatureModel) -> int:
+    return len(_valid_configs(fm))
+
+
 _UVL = """features
     Root {abstract}
         optional
@@ -51,13 +65,7 @@ def _all_feature_names(fm: FeatureModel) -> list[str]:
 
 
 def _is_valid(fm: FeatureModel, selected: set) -> bool:
-    sat_model = FmToPysat(fm).transform()
-    elements = {name: (name in selected) for name in _all_feature_names(fm)}
-    configuration = Configuration(elements)
-    configuration.set_full(True)
-    op = PySATSatisfiableConfiguration()
-    op.set_configuration(configuration)
-    return op.execute(sat_model).get_result()
+    return frozenset(selected) in _valid_configs(fm)
 
 
 _IMPLIED_VARS_UVL = """features
@@ -87,7 +95,7 @@ def _fm_from(uvl):
 
 def test_approximate_count_matches_exact_on_small_model():
     fm = _fm()
-    exact = PySATConfigurationsNumber().execute(FmToPysat(fm).transform()).get_result()
+    exact = _exact_count(fm)
     approx = SharpSATConfigurationsNumber().execute(FmToSharpSAT(fm).transform()).get_result()
     # ApproxMC's default (epsilon, delta) is exact on a model this small.
     assert approx == exact
@@ -98,7 +106,7 @@ def test_count_is_correct_with_implied_variables():
     # must not be undercounted. The standalone pyapproxmc binding halved these; the UniGen
     # ApproxMC invocation used by the counter does not.
     fm = _fm_from(_IMPLIED_VARS_UVL)
-    exact = PySATConfigurationsNumber().execute(FmToPysat(fm).transform()).get_result()
+    exact = _exact_count(fm)
     approx = SharpSATConfigurationsNumber().execute(FmToSharpSAT(fm).transform()).get_result()
     assert approx == exact
 

flamapy_sharpsat-2.6.0.dev5/flamapy/metamodels/sharpsat_metamodel/transformations/fm_to_sharpsat.py

@@ -1,41 +0,0 @@
-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.sharpsat_metamodel.models import SharpSATModel
-
-
-class FmToSharpSAT(ModelToModel):
-    """Transform a feature model into a SharpSAT (CNF) model.
-
-    The CNF is produced by reusing the SAT metamodel's ``FmToPysat`` transformation, so
-    the same constraint encoding (and the optional Tseytin encoding via ``cnf_method``) is
-    available here.
-    """
-
-    @staticmethod
-    def get_source_extension() -> str:
-        return 'fm'
-
-    @staticmethod
-    def get_destination_extension() -> str:
-        return 'sharpsat'
-
-    def __init__(self, source_model: FeatureModel, cnf_method: str = 'distributive') -> None:
-        self.source_model = source_model
-        self.cnf_method = cnf_method
-        self.destination_model = SharpSATModel()
-
-    def transform(self) -> SharpSATModel:
-        # Only pass cnf_method when a non-default encoding is requested, 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()
-        model = self.destination_model
-        model.clauses = [list(clause) for clause in sat_model.get_all_clauses().clauses]
-        model.variables = dict(sat_model.variables)
-        model.features = dict(sat_model.features)
-        model.auxiliary_variables = set(sat_model.auxiliary_variables)
-        model.original_model = self.source_model
-        return model

flamapy_sharpsat-2.6.0.dev5/flamapy_sharpsat.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
-pyunigen~=2.5
-
-[dev]
-pytest
-pytest-mock
-prospector
-mypy
-coverage