flamapy-sat 2.0.0.dev1__tar.gz → 2.0.0.dev6__tar.gz

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flamapy-sat
-Version: 2.0.0.dev1
+Version: 2.0.0.dev6
 Summary: flamapy-sat is a plugin to flamapy module
 Home-page: https://github.com/flamapy/pysat_metamodel
 Author: Flamapy

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy/metamodels/pysat_diagnosis_metamodel/models/pysat_diagnosis_model.py

@@ -3,6 +3,7 @@ from typing import List, Dict
 from flamapy.metamodels.configuration_metamodel.models import Configuration
 
 from flamapy.metamodels.pysat_metamodel.models import PySATModel
+from flamapy.metamodels.fm_metamodel.models.feature_model import Feature
 
 
 class DiagnosisModel(PySATModel):
@@ -164,24 +165,31 @@ class DiagnosisModel(PySATModel):
 
         return id_assumption
 
+    def _convert_keys_to_features(self, configuration: 'Configuration') -> 'Configuration':
+        new_elements = {Feature(key) if isinstance(key, str)
+                        else key: value for key, value 
+                        in configuration.elements.items()}
+        return Configuration(new_elements)
+
     def _prepare_assumptions_for_configuration(self, assumption: List[int],
                                                configuration: Configuration,
                                                id_assumption: int) -> int:
+        configuration = self._convert_keys_to_features(configuration)
         config = [feat.name for feat in configuration.elements]
         for feat in config:
             if feat not in self.variables.keys():
                 raise KeyError(f'Feature {feat} is not in the model.')
 
-        for feat in configuration.elements.items():
+        for feat, value in configuration.elements.items():
             desc = ''
             clause = []
 
-            if feat[1]:
-                desc = f'{feat[0].name} = true'
-                clause = [self.variables[feat[0].name], -1 * id_assumption]
-            elif not feat[1]:
-                desc = f'{feat[0].name} = false'
-                clause = [-1 * self.variables[feat[0].name], -1 * id_assumption]
+            if value:
+                desc = f'{feat.name} = true'
+                clause = [self.variables[feat.name], -1 * id_assumption]
+            else:
+                desc = f'{feat.name} = false'
+                clause = [-1 * self.variables[feat.name], -1 * id_assumption]
 
             assumption.append(id_assumption)
             self.set_kb.append(clause)
@@ -189,4 +197,4 @@ class DiagnosisModel(PySATModel):
 
             id_assumption += 1
 
-        return id_assumption
+        return id_assumption

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/__init__.py

@@ -1,3 +1,5 @@
+# pylint: disable=cyclic-import
+
 from .pysat_abstract_identifier import PySATAbstractIdentifier
 from .pysat_conflict import PySATConflict
 from .pysat_diagnosis import PySATDiagnosis

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/checker.py

@@ -8,7 +8,7 @@ from pysat.solvers import Solver
 
 
 class ConsistencyChecker:
-  
+
     def __init__(self, solver_name: str, set_kb: List[List[int]]) -> None:
         self.result = False
 

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/hsdag/hsdag.py

@@ -2,7 +2,7 @@
 A Java version of this implementation is available at:
 https://github.com/HiConfiT/hiconfit-core/blob/main/ca-cdr-package/src/main/java/at/tugraz/ist/ase/cacdr/algorithms/hs/HSDAG.java
 """
-from typing import List, Optional, Dict
+from typing import List, Optional, Dict, Union
 
 from .labeler.labeler import IHSLabelable, LabelerType, AbstractHSParameters
 from .node import Node, NodeStatus
@@ -234,7 +234,7 @@ class HSDAG:
                 labels.append(label)
         return labels
 
-    def get_reusable_node(self, path_labels: List[int], arc_label: int) -> Node | None:
+    def get_reusable_node(self, path_labels: List[int], arc_label: int) -> Union[Node, None]:
         if len(path_labels) == 0:
             new_path_labels = [arc_label]
         else:

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy/metamodels/pysat_diagnosis_metamodel/transformations/fm_to_diag_pysat.py

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any
 
 from flamapy.metamodels.fm_metamodel.models.feature_model import (
     FeatureModel,
@@ -23,11 +23,8 @@ class FmToDiagPysat(FmToPysat):
     def __init__(self, source_model: FeatureModel) -> None:
         super().__init__(source_model)
         self.destination_model = DiagnosisModel()
-        
 
     def add_root(self, feature: Feature) -> None:
-        #self.r_cnf.append([self.destination_model.variables.get(feature.name)])
-        
         var = self.destination_model.variables.get(feature.name)
         if var is None:
             raise KeyError(f'Feature {feature.name} not found in the model')
@@ -35,9 +32,22 @@ class FmToDiagPysat(FmToPysat):
         self.destination_model.add_clause([var])
         self.destination_model.add_clause_to_map(str(feature), [[var]])
 
-    def _store_constraint_relation(self, relation: Relation, clauses: List[List[int]]) -> None:
-        for clause in clauses:
-            self.destination_model.add_clause(clause)
+    #def _store_constraint_relation(self, relation: Relation, clauses: List[List[int]]) -> None:
+    #    for clause in clauses:
+    #        self.destination_model.add_clause(clause)
+    #    self.destination_model.add_clause_to_map(str(relation), clauses)
+    def add_relation(self, relation: Relation) -> None:
+        if relation.is_mandatory():
+            clauses = self._add_mandatory_relation(relation)
+        elif relation.is_optional():
+            clauses = self._add_optional_relation(relation)
+        elif relation.is_or():
+            clauses = self._add_or_relation(relation)
+        elif relation.is_alternative():
+            clauses = self._add_alternative_relation(relation)
+        else:
+            clauses = self._add_constraint_relation(relation)
+        self._store_constraint_clauses(clauses)
         self.destination_model.add_clause_to_map(str(relation), clauses)
 
     def add_constraint(self, ctc: Constraint) -> None:
@@ -48,7 +58,7 @@ class FmToDiagPysat(FmToPysat):
                 negated = True
 
             var = self.destination_model.get_variable(term)
-            
+
             if negated:
                 return -var
             return var
@@ -60,5 +70,4 @@ class FmToDiagPysat(FmToPysat):
             ctc_clauses.append(clause_variables)
             self.destination_model.add_clause(clause_variables)
 
-        self.destination_model.add_clause_to_map(str(ctc), ctc_clauses)
-
+        self.destination_model.add_clause_to_map(str(ctc), ctc_clauses)

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy/metamodels/pysat_metamodel/models/__init__.py

@@ -1,3 +1,5 @@
+# pylint: disable=cyclic-import
+
 from .pysat_model import PySATModel
 from .txtcnf_model import (
     TextCNFModel,

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy/metamodels/pysat_metamodel/models/txtcnf_model.py

@@ -201,8 +201,8 @@ def extract_variables(cnf_formula: str) -> list[str]:
     if ')' in clauses[len(clauses) - 1]:
         clauses[len(clauses) - 1] = clauses[len(clauses) - 1][:-1]
 
-    for clause in clauses:
-        tokens = flamapy.metamodels.pysat_metamodel.operations.diagnosis.utils.split(' ')
+    for _clause in clauses: 
+        tokens = flamapy.metamodels.pysat_metamodel.operations.diagnosis.utils.split(' ')  # type: ignore[name-defined] # pylint: disable=undefined-variable  # noqa: F821, E501
         tokens = list(filter(lambda t: t != cnf_notation.value[CNFLogicConnective.OR], tokens))
         for feature in tokens:
             if feature == cnf_notation.value[CNFLogicConnective.NOT]:

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy/metamodels/pysat_metamodel/operations/pysat_metrics.py

@@ -7,7 +7,7 @@ from flamapy.metamodels.pysat_metamodel.models import PySATModel
 from flamapy.metamodels.pysat_metamodel import operations as sat_operations
 
 
-def metric_method(func: Callable) -> Callable:
+def metric_method(func: Callable[..., Any]) -> Callable[..., Any]:
     """Decorator to mark a method as a metric method.
     It has the value of the measure, it can also have a size and a ratio.
     Example:
@@ -55,13 +55,14 @@ class PySATMetrics(Metrics):
         return [method() for method in metric_methods]
 
     @metric_method
-    def valid(self) -> dict[str, Any]:
-        """A feature model is valid if it represents at least one configuration."""
+    def satisfiable(self) -> dict[str, Any]:
+        """A feature model is satisfiable if it represents at least one configuration."""
         if self.model is None:
             raise FlamaException('Model not initialized.')
-        name = "Valid (not void)"
-        _valid = sat_operations.PySATValid().execute(self.model).get_result()
-        result = self.construct_result(name=name, doc=self.valid.__doc__, result=_valid)
+        name = "Satisfiable"
+        _satisfiable = sat_operations.PySATSatisfiable().execute(self.model).get_result()
+        result = self.construct_result(name=name, 
+                                       doc=self.satisfiable.__doc__, result=_satisfiable)
         return result
 
     @metric_method
@@ -154,7 +155,7 @@ class PySATMetrics(Metrics):
         if self.model is None:
             raise FlamaException('Model not initialized.')
         name = "Configurations"
-        _configurations = sat_operations.PySATProducts().execute(self.model).get_result()
+        _configurations = sat_operations.PySATConfigurations().execute(self.model).get_result()
         result = self.construct_result(name=name,
                                        doc=self.configurations.__doc__,
                                        result=_configurations,

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy/metamodels/pysat_metamodel/operations/pysat_satisfiable_configuration.py

@@ -28,10 +28,10 @@ class PySATSatisfiableConfiguration(SatisfiableConfiguration):
 
     def execute(self, model: VariabilityModel) -> 'PySATSatisfiableConfiguration':
         sat_model = cast(PySATModel, model)
-        
+
         for clause in sat_model.get_all_clauses():  # AC es conjunto de conjuntos
             self.solver.add_clause(clause)  # añadimos la constraint
-    
+
         if not self.is_full:
             assumptions = []
             for feature, selected in self.configuration.elements.items():
@@ -40,18 +40,19 @@ class PySATSatisfiableConfiguration(SatisfiableConfiguration):
                 else:
                     assumptions.append(-sat_model.variables[feature])
         else:
-            missing_features = [feature for feature in self.configuration.elements.keys() if feature not in sat_model.variables.keys()]
-            
+            missing_features = [feature for feature in self.configuration.elements.keys() 
+                                if feature not in sat_model.variables.keys()]
+
             if missing_features:
-                print("The features that are missing are:", [feature for feature in missing_features])
-                print("The feature model contains the following features:", list(sat_model.variables.keys()))
+                print("The features that are missing are:", list(missing_features))
+                print("The feature model contains the following features:", 
+                      list(sat_model.variables.keys()))
                 self.result = False
                 return self
-            
 
             assumptions = []
             for feature in sat_model.features.values():
-                
+
                 if feature in self.configuration.elements.keys():
                     assumptions.append(sat_model.variables[feature])
                 else:
@@ -59,4 +60,4 @@ class PySATSatisfiableConfiguration(SatisfiableConfiguration):
 
         self.result = self.solver.solve(assumptions=assumptions)
         self.solver.delete()
-        return self
+        return self

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy/metamodels/pysat_metamodel/transformations/cnf_to_pysat.py

@@ -61,7 +61,7 @@ class CNFReader(TextToModel):
             clauses[len(clauses) - 1] = clauses[len(clauses) - 1][:-1]
 
         for _c in clauses:
-            tokens = flamapy.metamodels.pysat_metamodel.operations.diagnosis.utils.split(' ')
+            tokens = flamapy.metamodels.pysat_metamodel.operations.diagnosis.utils.split(' ')  # type: ignore[name-defined] # noqa: F821, E501
             tokens = list(filter(lambda t: t != cnf_notation.value[CNFLogicConnective.OR], tokens))
             logic_not = False
             cnf_clause = []

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/flamapy_sat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flamapy-sat
-Version: 2.0.0.dev1
+Version: 2.0.0.dev6
 Summary: flamapy-sat is a plugin to flamapy module
 Home-page: https://github.com/flamapy/pysat_metamodel
 Author: Flamapy

flamapy-sat-2.0.0.dev6/flamapy_sat.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

flamapy-sat-2.0.0.dev6/flamapy_sat.egg-info/requires.txt

@@ -0,0 +1,10 @@
+flamapy-fw==2.0.0.dev6
+flamapy-fm==2.0.0.dev6
+python-sat~=0.1.7.dev1
+
+[dev]
+pytest
+pytest-mock
+prospector
+mypy
+coverage

{flamapy-sat-2.0.0.dev1 → flamapy-sat-2.0.0.dev6}/setup.py

@@ -4,10 +4,19 @@ import setuptools
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
+def read_requirements(file):
+    with open(file, "r") as fh:
+        return fh.read().splitlines()
+
+# Read requirements from the requirements.txt file
+requirements = read_requirements("requirements.txt")
+
+# Read development requirements from the dev-requirements.txt file
+dev_requirements = read_requirements("requirements-dev.txt")
 
 setuptools.setup(
     name="flamapy-sat",
-    version="2.0.0.dev1",
+    version="2.0.0.dev6",
     author="Flamapy",
     author_email="flamapy@us.es",
     description="flamapy-sat is a plugin to flamapy module",
@@ -21,21 +30,8 @@ setuptools.setup(
         "Operating System :: OS Independent",
     ],
     python_requires='>=3.9',
-    install_requires=[
-        'flamapy-fw~=2.0.0.dev1',
-        'flamapy-fm~=2.0.0.dev1',
-        'python-sat>=0.1.7.dev1'
-    ],
+    install_requires=requirements,
     extras_require={
-        'dev': [
-            'pytest',
-            'pytest-mock',
-            'prospector',
-            'mypy',
-            'coverage',
-        ]
-    },
-    dependency_links=[
-        'flamapy~=2.0.0.dev1',
-    ]
+        'dev':dev_requirements
+    }
 )

flamapy-sat-2.0.0.dev1/flamapy_sat.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-flamapy~=2.0.0.dev1

flamapy-sat-2.0.0.dev1/flamapy_sat.egg-info/requires.txt

@@ -1,10 +0,0 @@
-flamapy-fw~=2.0.0.dev1
-flamapy-fm~=2.0.0.dev1
-python-sat>=0.1.7.dev1
-
-[dev]
-pytest
-pytest-mock
-prospector
-mypy
-coverage