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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flamapy-sdd
-Version: 2.6.0.dev6
+Version: 2.6.0.dev11
 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.dev11
+Requires-Dist: flamapy-fm~=2.6.0.dev11
 Requires-Dist: PySDD~=1.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"

{flamapy_sdd-2.6.0.dev6 → flamapy_sdd-2.6.0.dev11}/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.dev11}/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.dev11
 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.dev11
+Requires-Dist: flamapy-fm~=2.6.0.dev11
 Requires-Dist: PySDD~=1.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"

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

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

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

@@ -4,16 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flamapy-sdd"
-version = "2.6.0.dev6"
+version = "2.6.0.dev11"
 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.dev11",
+    "flamapy-fm~=2.6.0.dev11",
     "PySDD~=1.0",
 ]
 

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