flamapy-sat 2.0.0.dev0__tar.gz → 2.0.0.dev1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/PKG-INFO +1 -1
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_satisfiable_configuration.py +8 -7
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy_sat.egg-info/PKG-INFO +1 -1
- flamapy-sat-2.0.0.dev1/flamapy_sat.egg-info/dependency_links.txt +1 -0
- flamapy-sat-2.0.0.dev1/flamapy_sat.egg-info/requires.txt +10 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/setup.py +5 -5
- flamapy-sat-2.0.0.dev0/flamapy_sat.egg-info/dependency_links.txt +0 -1
- flamapy-sat-2.0.0.dev0/flamapy_sat.egg-info/requires.txt +0 -10
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/README.md +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/models/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/models/pysat_diagnosis_model.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/checker.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/fastdiag.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/hsdag/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/hsdag/hsdag.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/hsdag/labeler/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/hsdag/labeler/fastdiag_labeler.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/hsdag/labeler/labeler.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/hsdag/labeler/quickxplain_labeler.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/hsdag/node.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/quickxplain.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/diagnosis/utils.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/pysat_abstract_identifier.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/pysat_conflict.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/operations/pysat_diagnosis.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/transformations/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_diagnosis_metamodel/transformations/fm_to_diag_pysat.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/models/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/models/pysat_model.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/models/txtcnf_model.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_commonality.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_configurations.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_configurations_number.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_core_features.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_dead_features.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_false_optional_features.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_filter.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_metrics.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_sampling.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/operations/pysat_satisfiable.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/transformations/__init__.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/transformations/cnf_to_pysat.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/transformations/dimacs_reader.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/transformations/dimacs_writer.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/transformations/fm_to_pysat.py +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy_sat.egg-info/SOURCES.txt +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy_sat.egg-info/top_level.txt +0 -0
- {flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/setup.cfg +0 -0
|
@@ -36,22 +36,23 @@ class PySATSatisfiableConfiguration(SatisfiableConfiguration):
|
|
|
36
36
|
assumptions = []
|
|
37
37
|
for feature, selected in self.configuration.elements.items():
|
|
38
38
|
if selected:
|
|
39
|
-
assumptions.append(sat_model.variables[feature
|
|
39
|
+
assumptions.append(sat_model.variables[feature])
|
|
40
40
|
else:
|
|
41
|
-
assumptions.append(-sat_model.variables[feature
|
|
41
|
+
assumptions.append(-sat_model.variables[feature])
|
|
42
42
|
else:
|
|
43
|
-
missing_features = [feature for feature in self.configuration.elements.keys() if feature
|
|
43
|
+
missing_features = [feature for feature in self.configuration.elements.keys() if feature not in sat_model.variables.keys()]
|
|
44
44
|
|
|
45
45
|
if missing_features:
|
|
46
|
-
print("The features that are missing are:", [feature
|
|
46
|
+
print("The features that are missing are:", [feature for feature in missing_features])
|
|
47
47
|
print("The feature model contains the following features:", list(sat_model.variables.keys()))
|
|
48
48
|
self.result = False
|
|
49
49
|
return self
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
|
|
51
|
+
|
|
52
52
|
assumptions = []
|
|
53
53
|
for feature in sat_model.features.values():
|
|
54
|
-
|
|
54
|
+
|
|
55
|
+
if feature in self.configuration.elements.keys():
|
|
55
56
|
assumptions.append(sat_model.variables[feature])
|
|
56
57
|
else:
|
|
57
58
|
assumptions.append(-sat_model.variables[feature])
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
flamapy~=2.0.0.dev1
|
|
@@ -7,7 +7,7 @@ with open("README.md", "r") as fh:
|
|
|
7
7
|
|
|
8
8
|
setuptools.setup(
|
|
9
9
|
name="flamapy-sat",
|
|
10
|
-
version="2.0.0.
|
|
10
|
+
version="2.0.0.dev1",
|
|
11
11
|
author="Flamapy",
|
|
12
12
|
author_email="flamapy@us.es",
|
|
13
13
|
description="flamapy-sat is a plugin to flamapy module",
|
|
@@ -22,9 +22,9 @@ setuptools.setup(
|
|
|
22
22
|
],
|
|
23
23
|
python_requires='>=3.9',
|
|
24
24
|
install_requires=[
|
|
25
|
-
'flamapy-fw~=2.0.0.
|
|
26
|
-
'flamapy-fm~=2.0.0.
|
|
27
|
-
'python-sat>=0.1.7.
|
|
25
|
+
'flamapy-fw~=2.0.0.dev1',
|
|
26
|
+
'flamapy-fm~=2.0.0.dev1',
|
|
27
|
+
'python-sat>=0.1.7.dev1'
|
|
28
28
|
],
|
|
29
29
|
extras_require={
|
|
30
30
|
'dev': [
|
|
@@ -36,6 +36,6 @@ setuptools.setup(
|
|
|
36
36
|
]
|
|
37
37
|
},
|
|
38
38
|
dependency_links=[
|
|
39
|
-
'flamapy~=
|
|
39
|
+
'flamapy~=2.0.0.dev1',
|
|
40
40
|
]
|
|
41
41
|
)
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
flamapy~=1.6.0.dev0
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev1}/flamapy/metamodels/pysat_metamodel/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|