flamapy-sat 2.0.0.dev8__tar.gz → 2.1.0.dev0__tar.gz

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/PKG-INFO

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

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_diagnosis_metamodel/models/pysat_diagnosis_model.py

@@ -90,17 +90,16 @@ class DiagnosisModel(PySATModel):
             # C = configuration
             # B = {f0 = true} + CF (i.e., = PySATModel)
             self._prepare_assumptions(configuration=configuration)
+        elif test_case is None:
+            # Diagnosis the feature model
+            # C = CF (i.e., = PySATModel - {f0 = true})
+            # B = {f0 = true}
+            self._prepare_assumptions()
         else:
-            if test_case is None:
-                # Diagnosis the feature model
-                # C = CF (i.e., = PySATModel - {f0 = true})
-                # B = {f0 = true}
-                self._prepare_assumptions()
-            else:
-                # Diagnosis the error
-                # C = CF (i.e., = PySATModel - {f0 = true})
-                # B = {f0 = true} + test_case
-                self._prepare_assumptions(test_case=test_case)
+            # Diagnosis the error
+            # C = CF (i.e., = PySATModel - {f0 = true})
+            # B = {f0 = true} + test_case
+            self._prepare_assumptions(test_case=test_case)
 
     def prepare_redundancy_detection_task(self) -> None:
         """
@@ -136,13 +135,12 @@ class DiagnosisModel(PySATModel):
         if configuration is not None:
             self.set_b = assumption[:start_id_configuration]
             self.set_c = assumption[start_id_configuration:]
+        elif test_case is not None:
+            self.set_b = [assumption[0], *assumption[start_id_test_case:]]
+            self.set_c = assumption[1:start_id_test_case]
         else:
-            if test_case is not None:
-                self.set_b = [assumption[0]] + assumption[start_id_test_case:]
-                self.set_c = assumption[1:start_id_test_case]
-            else:
-                self.set_b = [assumption[0]]
-                self.set_c = assumption[1:]
+            self.set_b = [assumption[0]]
+            self.set_c = assumption[1:]
 
     def _prepare_assumptions_for_kb(self, assumption: List[int], id_assumption: int) -> int:
         cstr_map = self.constraint_map
@@ -167,7 +165,7 @@ class DiagnosisModel(PySATModel):
 
     def _convert_keys_to_features(self, configuration: 'Configuration') -> 'Configuration':
         new_elements = {Feature(key) if isinstance(key, str)
-                        else key: value for key, value 
+                        else key: value for key, value
                         in configuration.elements.items()}
         return Configuration(new_elements)
 
@@ -197,4 +195,4 @@ class DiagnosisModel(PySATModel):
 
             id_assumption += 1
 
-        return id_assumption
+        return id_assumption

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/__init__.py

@@ -7,6 +7,6 @@ from .pysat_diagnosis import PySATDiagnosis
 
 __all__ = [
     'PySATAbstractIdentifier',
-    'PySATDiagnosis',
-    'PySATConflict'
+    'PySATConflict',
+    'PySATDiagnosis'
 ]

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/__init__.py

@@ -6,4 +6,4 @@ __all__ = [
     "ConsistencyChecker",
     "FastDiag",
     "QuickXPlain"
-]
+]

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/checker.py

@@ -27,4 +27,4 @@ class ConsistencyChecker:
         return self.result
 
     def delete(self) -> None:
-        self.solver.delete()
+        self.solver.delete()

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/fastdiag.py

@@ -92,4 +92,4 @@ class FastDiag:
         logging.debug('<<< return [Δ1={Δ1} ∪ Δ2={Δ2}]')
 
         # return Δ1 + Δ2
-        return delta1 + delta2
+        return delta1 + delta2

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/hsdag/__init__.py

@@ -5,4 +5,4 @@ __all__ = [
     'HSDAG',
     'Node',
     'NodeStatus'
-]
+]

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/hsdag/labeler/__init__.py

@@ -3,11 +3,11 @@ from .labeler import IHSLabelable, AbstractHSParameters, LabelerType
 from .quickxplain_labeler import QuickXPlainParameters, QuickXPlainLabeler
 
 __all__ = [
-    'IHSLabelable',
     'AbstractHSParameters',
-    'LabelerType',
-    'FastDiagParameters',
     'FastDiagLabeler',
-    'QuickXPlainParameters',
-    'QuickXPlainLabeler'
-]
+    'FastDiagParameters',
+    'IHSLabelable',
+    'LabelerType',
+    'QuickXPlainLabeler',
+    'QuickXPlainParameters'
+]

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/pysat_abstract_identifier.py

@@ -83,4 +83,4 @@ class PySATAbstractIdentifier(Operation):
 
     @abstractmethod
     def set_result_messages(self, cs_mess: str, diag_mess: str) -> None:
-        pass
+        pass

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_diagnosis_metamodel/transformations/fm_to_diag_pysat.py

@@ -70,4 +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.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/models/pysat_model.py

@@ -25,3 +25,12 @@ class PySATModel(VariabilityModel):
 
     def get_all_clauses(self) -> CNF:
         return self._cnf
+
+    def __eq__(self, other: object) -> bool:
+        if other is None or not isinstance(other, PySATModel):
+            return False
+        return set(self.get_all_clauses().clauses) == set(other.get_all_clauses().clauses)
+
+    def __hash__(self) -> int:
+        clause_tuples = (tuple(clause) for clause in self.get_all_clauses().clauses)
+        return hash(frozenset(clause_tuples))

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/models/txtcnf_model.py

@@ -195,14 +195,16 @@ def extract_variables(cnf_formula: str) -> list[str]:
 
     # Remove initial and final parenthesis
     and_symbol_pattern = ' ' + cnf_notation.value[CNFLogicConnective.AND] + ' '
-    clauses = list(map(lambda c: c[1:len(c) - 1], cnf_formula.split(and_symbol_pattern)))
-
+    clauses = [
+        clause[1:-1]
+        for clause in cnf_formula.split(and_symbol_pattern)
+    ]
     # Remove final parenthesis of last clause (because of the possible end of line: '\n')
     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(' ')  # type: ignore[name-defined] # pylint: disable=undefined-variable  # noqa: F821, E501
+    for _clause in clauses:
+        tokens = flamapy.metamodels.pysat_metamodel.operations.diagnosis.utils.split(' ')  # type: ignore[name-defined] # pylint: disable=undefined-variable  # noqa: F821
         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.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/operations/pysat_commonality.py

@@ -24,7 +24,7 @@ class PySATCommonality(Commonality):
         pysat_products_op.execute(model)
         products = pysat_products_op.get_result()
 
-        feature = list(self.configuration.elements.keys())[0]
+        feature = next(iter(self.configuration.elements.keys()))
 
         count = 0
         for product in products:

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/operations/pysat_false_optional_features.py

@@ -34,7 +34,7 @@ class PySATFalseOptionalFeatures(FalseOptionalFeatures):
         try:
             feature_model = cast(FeatureModel, sat_model.original_model)
         except FlamaException:
-            LOGGER.exception("The transformation didn't attach the source model, " 
+            LOGGER.exception("The transformation didn't attach the source model, "
                              "which is required for this operation.")
 
         real_optional_features = [f for f in feature_model.get_features()
@@ -52,6 +52,6 @@ class PySATFalseOptionalFeatures(FalseOptionalFeatures):
                 assert variable is not None
                 satisfiable = self.solver.solve(assumptions=[parent_variable, -variable])
                 if not satisfiable:
-                    result.append(feature)
+                    result.append(feature.name)
         self.solver.delete()
         return result

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/operations/pysat_filter.py

@@ -24,20 +24,32 @@ class PySATFilter(Filter):
     def set_configuration(self, configuration: Configuration) -> None:
         self.configuration = configuration
 
-    def execute(self, model: VariabilityModel) -> 'PySATFilter':
+    def execute(self, model: VariabilityModel) -> 'PySATFilter': # noqa C901
         model = cast(PySATModel, model)
 
         for clause in model.get_all_clauses():  # AC es conjunto de conjuntos
             self.solver.add_clause(clause)  # añadimos la constraint
 
-        assumptions = []
-        for feat in self.configuration.elements.items():
-            variable = model.variables.get(feat[0])
-            if variable is not None:
-                if feat[1]:
-                    assumptions.append(variable)
+        if not self.configuration.is_full:
+            assumptions = []
+            for feature, selected in self.configuration.elements.items():
+                if selected:
+                    assumptions.append(model.variables[feature])
                 else:
-                    assumptions.append(-variable)
+                    assumptions.append(-model.variables[feature])
+        else:
+            missing_features = [feature for feature in self.configuration.elements.keys()
+                                if feature not in model.variables.keys()]
+            if missing_features:
+                raise ValueError("The configuration contains features that are \
+                                 not present in the feature model.",
+                                 list(missing_features))
+            assumptions = []
+            for feature in model.features.values():
+                if self.configuration.elements.get(feature, False):
+                    assumptions.append(model.variables[feature])
+                else:
+                    assumptions.append(-model.variables[feature])
 
         for solution in self.solver.enum_models(assumptions=assumptions):
             product = []

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/operations/pysat_metrics.py

@@ -29,11 +29,19 @@ class PySATMetrics(Metrics):
         super().__init__()
         self.model: Optional[VariabilityModel] = None
         self.result: list[dict[str, Any]] = []
-        self.model_type_extension = "pysat"
+        self._model_type_extension = "pysat"
         self._features: dict[int, str] = {}
         self._common_features: list[Any] = []
         self._dead_features: list[Any] = []
 
+    @property
+    def model_type_extension(self) -> str:
+        return self._model_type_extension
+
+    @model_type_extension.setter
+    def model_type_extension(self, ext: str) -> None:
+        self._model_type_extension = ext
+
     def get_result(self) -> list[dict[str, Any]]:
         return self.result
 
@@ -46,10 +54,10 @@ class PySATMetrics(Metrics):
         self._dead_features = sat_operations.PySATDeadFeatures().execute(self.model).get_result()
         # Get all methods that are marked with the metric_method decorator
         metric_methods = [getattr(self, method_name) for method_name in dir(self)
-                          if callable(getattr(self, method_name)) and 
+                          if callable(getattr(self, method_name)) and
                           hasattr(getattr(self, method_name), '_is_metric_method')]
         if self.filter is not None:
-            metric_methods = [method for method in metric_methods 
+            metric_methods = [method for method in metric_methods
                               if method.__name__ in self.filter]
 
         return [method() for method in metric_methods]
@@ -61,7 +69,7 @@ class PySATMetrics(Metrics):
             raise FlamaException('Model not initialized.')
         name = "Satisfiable"
         _satisfiable = sat_operations.PySATSatisfiable().execute(self.model).get_result()
-        result = self.construct_result(name=name, 
+        result = self.construct_result(name=name,
                                        doc=self.satisfiable.__doc__, result=_satisfiable)
         return result
 
@@ -81,8 +89,8 @@ class PySATMetrics(Metrics):
     def variant_features(self) -> dict[str, Any]:
         """Features that do not appear in all the configurations."""
         name = "Variant features"
-        _variant_features = [f for f in self._features.values() 
-                             if f not in self._common_features and 
+        _variant_features = [f for f in self._features.values()
+                             if f not in self._common_features and
                              f not in self._dead_features]
         result = self.construct_result(name=name,
                                        doc=self.variant_features.__doc__,
@@ -122,7 +130,7 @@ class PySATMetrics(Metrics):
                     seen_once.add(feature)
 
         # Step 3: Find features that are in seen_once but not in seen_multiple
-        _unique_features = seen_once - seen_multiple
+        _unique_features = list(seen_once - seen_multiple)
 
         result = self.construct_result(name=name,
                                        doc=self.unique_features.__doc__,
@@ -133,7 +141,7 @@ class PySATMetrics(Metrics):
 
     @metric_method
     def false_optional_features(self) -> dict[str, Any]:
-        """Features defined as optionals the selection of their parents make the feature itself 
+        """Features defined as optionals the selection of their parents make the feature itself
         selected as well."""
         if self.model is None:
             raise FlamaException('Model not initialized.')
@@ -148,7 +156,7 @@ class PySATMetrics(Metrics):
 
     @metric_method
     def configurations(self) -> dict[str, Any]:
-        """Number of configurations represented by the feature model. 
+        """Number of configurations represented by the feature model.
 
            If <= is shown, the number represents an upper estimation bound.
         """

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/operations/pysat_sampling.py

@@ -37,17 +37,17 @@ class PySATSampling(Sampling):
 
     def execute(self, model: VariabilityModel) -> 'PySATSampling':
         sat_model = cast(PySATModel, model)
-        self.result = sample(self.solver, 
-                             sat_model, 
-                             self.sample_size, 
-                             self.with_replacement, 
+        self.result = sample(self.solver,
+                             sat_model,
+                             self.sample_size,
+                             self.with_replacement,
                              self.partial_configuration)
         return self
 
 
 def sample(solver: Solver,
-           model: PySATModel, 
-           sample_size: int, 
+           model: PySATModel,
+           sample_size: int,
            with_replacement: bool,  # pylint: disable=unused-argument
            partial_configuration: Optional[Configuration]  # pylint: disable=unused-argument
            ) -> list[Configuration]:

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/operations/pysat_satisfiable_configuration.py

@@ -14,7 +14,6 @@ class PySATSatisfiableConfiguration(SatisfiableConfiguration):
         self.result = False
         self.configuration = Configuration(elements={})
         self.solver = Solver(name='glucose3')
-        self.is_full = False
 
     def is_satisfiable(self) -> bool:
         return self.result
@@ -22,9 +21,8 @@ class PySATSatisfiableConfiguration(SatisfiableConfiguration):
     def get_result(self) -> bool:
         return self.is_satisfiable()
 
-    def set_configuration(self, configuration: Configuration, is_full: bool) -> None:
+    def set_configuration(self, configuration: Configuration) -> None:
         self.configuration = configuration
-        self.is_full = is_full
 
     def execute(self, model: VariabilityModel) -> 'PySATSatisfiableConfiguration':
         sat_model = cast(PySATModel, model)
@@ -32,7 +30,7 @@ class PySATSatisfiableConfiguration(SatisfiableConfiguration):
         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:
+        if not self.configuration.is_full:
             assumptions = []
             for feature, selected in self.configuration.elements.items():
                 if selected:
@@ -40,12 +38,12 @@ class PySATSatisfiableConfiguration(SatisfiableConfiguration):
                 else:
                     assumptions.append(-sat_model.variables[feature])
         else:
-            missing_features = [feature for feature in self.configuration.elements.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:", list(missing_features))
-                print("The feature model contains the following features:", 
+                print("The feature model contains the following features:",
                       list(sat_model.variables.keys()))
                 self.result = False
                 return self
@@ -53,11 +51,11 @@ class PySATSatisfiableConfiguration(SatisfiableConfiguration):
             assumptions = []
             for feature in sat_model.features.values():
 
-                if feature in self.configuration.elements.keys():
+                if self.configuration.elements.get(feature, False):
                     assumptions.append(sat_model.variables[feature])
                 else:
                     assumptions.append(-sat_model.variables[feature])
 
         self.result = self.solver.solve(assumptions=assumptions)
         self.solver.delete()
-        return self
+        return self

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/transformations/__init__.py

@@ -5,8 +5,8 @@ from .dimacs_writer import DimacsWriter
 
 
 __all__ = [
-    'FmToPysat',
     'CNFReader',
     'DimacsReader',
-    'DimacsWriter'
+    'DimacsWriter',
+    'FmToPysat'
 ]

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/transformations/cnf_to_pysat.py

@@ -53,15 +53,17 @@ class CNFReader(TextToModel):
 
     def _extract_clauses(self, cnf_formula: str, cnf_notation: TextCNFNotation) -> None:
         and_symbol_pattern = ' ' + cnf_notation.value[CNFLogicConnective.AND] + ' '
-        clauses = list(map(lambda c: c[1:len(c) - 1], cnf_formula.split(and_symbol_pattern)))
         # Remove initial and final parenthesis
-
+        clauses = [
+            clause[1:-1]
+            for clause in cnf_formula.split(and_symbol_pattern)
+        ]
         # Remove final parenthesis of last clause (because of the possible end of line: '\n')
         if ')' in clauses[len(clauses) - 1]:
             clauses[len(clauses) - 1] = clauses[len(clauses) - 1][:-1]
 
         for _c in clauses:
-            tokens = flamapy.metamodels.pysat_metamodel.operations.diagnosis.utils.split(' ')  # type: ignore[name-defined] # noqa: F821, E501
+            tokens = flamapy.metamodels.pysat_metamodel.operations.diagnosis.utils.split(' ')  # type: ignore[name-defined] # noqa: F821
             tokens = list(filter(lambda t: t != cnf_notation.value[CNFLogicConnective.OR], tokens))
             logic_not = False
             cnf_clause = []
@@ -69,7 +71,10 @@ class CNFReader(TextToModel):
                 if feature == cnf_notation.value[CNFLogicConnective.NOT]:
                     logic_not = True
                 elif feature.startswith(cnf_notation.value[CNFLogicConnective.NOT]):
-                    feature = feature.replace(cnf_notation.value[CNFLogicConnective.NOT], '', 1)
+                    feature = feature.replace( #noqa: PLW2901
+                        cnf_notation.value[CNFLogicConnective.NOT],
+                        '', 1
+                    )
                     self._add_feature(feature)
                     cnf_clause.append(-1 * self.destination_model.variables[feature])
                 else:

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/transformations/fm_to_pysat.py

@@ -1,4 +1,5 @@
 import itertools
+import copy
 from typing import Any, List
 
 from flamapy.core.transformations import ModelToModel
@@ -8,6 +9,10 @@ from flamapy.metamodels.fm_metamodel.models.feature_model import (
     Feature,
     Relation,
 )
+from flamapy.metamodels.fm_metamodel.transformations.refactorings import (
+    FeatureCardinalityRefactoring
+)
+from flamapy.metamodels.fm_metamodel.transformations import FlatFM
 from flamapy.metamodels.pysat_metamodel.models.pysat_model import PySATModel
 
 
@@ -139,9 +144,9 @@ class FmToPysat(ModelToModel):
             clauses = self._add_mandatory_relation(relation)
         elif relation.is_optional():
             clauses = self._add_optional_relation(relation)
-        elif relation.is_or():  
+        elif relation.is_or():
             clauses = self._add_or_relation(relation)
-        elif relation.is_alternative():  
+        elif relation.is_alternative():
             clauses = self._add_alternative_relation(relation)
         else:
             clauses = self._add_constraint_relation(relation)
@@ -160,15 +165,24 @@ class FmToPysat(ModelToModel):
             self.destination_model.add_clause(clause_variables)
 
     def transform(self) -> PySATModel:
-        for feature in self.source_model.get_features():
+        # FlatFM if the feature model contains imports
+        feature_model = self.source_model
+        if feature_model.imports:
+            feature_model = FlatFM(feature_model).transform()
+        # Apply the feature cardinality refactoring to the source model
+        if FeatureCardinalityRefactoring(feature_model).is_applicable():
+            feature_model = copy.deepcopy(feature_model)
+            feature_model = FeatureCardinalityRefactoring(feature_model).transform()
+
+        for feature in feature_model.get_features():
             self.add_feature(feature)
 
-        self.add_root(self.source_model.root)
+        self.add_root(feature_model.root)
 
-        for relation in self.source_model.get_relations():
+        for relation in feature_model.get_relations():
             self.add_relation(relation)
 
-        for constraint in self.source_model.get_constraints():
+        for constraint in feature_model.get_logical_constraints():
             self.add_constraint(constraint)
 
         return self.destination_model

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy_sat.egg-info/PKG-INFO

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

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy_sat.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 README.md
+pyproject.toml
 setup.py
 flamapy/metamodels/pysat_diagnosis_metamodel/__init__.py
 flamapy/metamodels/pysat_diagnosis_metamodel/models/__init__.py

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy_sat.egg-info/requires.txt

@@ -1,5 +1,5 @@
-flamapy-fw==2.0.0.dev7
-flamapy-fm==2.0.0.dev8
+flamapy-fw~=2.1.0.dev0
+flamapy-fm~=2.1.0.dev0
 python-sat~=0.1.7.dev1
 
 [dev]

flamapy-sat-2.1.0.dev0/pyproject.toml

@@ -0,0 +1,53 @@
+[tool.ruff]
+line-length = 100  # Matches max-line-length from pycodestyle
+target-version = "py38"  # Adjust if using another Python version
+
+[tool.ruff.lint]
+select = ["E", "W", "F", "C", "PL", "RUF"]  # Includes pycodestyle, pylint, and McCabe complexity
+ignore = [
+    "RUF012",  # Equivalent to Pylint's super-init-not-called
+    "RUF002", # Weird symbols on docstring
+    "RUF001", # Weird symbols string
+]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 10  # Equivalent to enabling mccabe in Prospector
+
+[tool.ruff.lint.per-file-ignores]
+"flamapy/metamodels/fm_metamodel/transformations/pysat_to_fm.py" = ["ALL"]  # Ignore this file entirely
+"tests/*" = ["ALL"]  # Ignore all test files
+"build/*" = ["ALL"]
+"resources/*" = ["ALL"]
+".mypy_cache/*" = ["ALL"]
+"venv/*" = ["ALL"]
+".venv/*" = ["ALL"]
+"env/*" = ["ALL"]
+"flamapy_fm.egg-info/*" = ["ALL"]
+"__pycache__/*" = ["ALL"]
+
+[tool.ruff.lint.pycodestyle]
+max-line-length = 100  # Matches your existing pycodestyle setting
+
+# MYPY CONFIGURATION
+[tool.mypy]
+scripts_are_modules = true
+show_traceback = true
+
+# Strict checking
+check_untyped_defs = true
+disallow_untyped_defs = true
+disallow_any_generics = true
+warn_no_return = true
+strict_optional = true
+no_implicit_optional = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+
+# Show error codes for type: ignore comments
+show_error_codes = true
+
+# Suppress missing imports errors
+ignore_missing_imports = true
+
+# Warn about unreachable or redundant code
+warn_unreachable = true

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/setup.py

@@ -16,7 +16,7 @@ dev_requirements = read_requirements("requirements-dev.txt")
 
 setuptools.setup(
     name="flamapy-sat",
-    version="2.0.0.dev8",
+    version="2.1.0.dev0",
     author="Flamapy",
     author_email="flamapy@us.es",
     description="flamapy-sat is a plugin to flamapy module",

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/models/__init__.py

@@ -9,8 +9,8 @@ from .txtcnf_model import (
 
 
 __all__ = [
+    'CNFLogicConnective',
     'PySATModel',
     'TextCNFModel',
-    'CNFLogicConnective',
     'TextCNFNotation'
 ]

{flamapy-sat-2.0.0.dev8 → flamapy-sat-2.1.0.dev0}/flamapy/metamodels/pysat_metamodel/operations/__init__.py

@@ -11,14 +11,14 @@ from .pysat_metrics import PySATMetrics
 
 
 __all__ = [
-    'PySATSatisfiable',
-    'PySATSatisfiableConfiguration',
+    'PySATCommonality',
     'PySATConfigurations',
     'PySATConfigurationsNumber',
-    'PySATCommonality',
-    'PySATFilter',
     'PySATCoreFeatures',
     'PySATDeadFeatures',
     'PySATFalseOptionalFeatures',
+    'PySATFilter',
     'PySATMetrics',
+    'PySATSatisfiable',
+    'PySATSatisfiableConfiguration',
 ]