flamapy-sat 2.0.0.dev0__tar.gz → 2.0.0.dev2__tar.gz

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

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

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

@@ -36,22 +36,23 @@ class PySATSatisfiableConfiguration(SatisfiableConfiguration):
             assumptions = []
             for feature, selected in self.configuration.elements.items():
                 if selected:
-                    assumptions.append(sat_model.variables[feature.name])
+                    assumptions.append(sat_model.variables[feature])
                 else:
-                    assumptions.append(-sat_model.variables[feature.name])
+                    assumptions.append(-sat_model.variables[feature])
         else:
-            missing_features = [feature for feature in self.configuration.elements.keys() if feature.name 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.name for feature in 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()))
                 self.result = False
                 return self
-                   
-            print(self.configuration.elements.items())
+            
+
             assumptions = []
             for feature in sat_model.features.values():
-                if self.configuration.has(feature):
+                
+                if feature in self.configuration.elements.keys():
                     assumptions.append(sat_model.variables[feature])
                 else:
                     assumptions.append(-sat_model.variables[feature])

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

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

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

@@ -0,0 +1 @@
+

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

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

{flamapy-sat-2.0.0.dev0 → flamapy-sat-2.0.0.dev2}/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.dev0",
+    version="2.0.0.dev2",
     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.dev0',
-        'flamapy-fm~=2.0.0.dev0',
-        'python-sat>=0.1.7.dev6'
-    ],
+    install_requires=requirements,
     extras_require={
-        'dev': [
-            'pytest',
-            'pytest-mock',
-            'prospector',
-            'mypy',
-            'coverage',
-        ]
-    },
-    dependency_links=[
-        'flamapy~=1.6.0.dev0',
-    ]
+        'dev':dev_requirements
+    }
 )

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

@@ -1 +0,0 @@
-flamapy~=1.6.0.dev0

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

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