changed how to run enumeration

.gitignore

@@ -0,0 +1,4 @@
+*.egg-info/
+dist/
+__pycache__/
+*.pyc

README.md

@@ -5,3 +5,15 @@ Implementation for bayesian network with
   - Enumeration
   - Rejection Sampling
   - Likelihood Weighting
+
+```python
+{
+    'netid': "burglary",
+    'query': ('B', 'j,m'),
+    'result': {True: 0.28, False: 0.72},
+    'samples': 10000,
+}
+RejectionSampling().run(testcase)
+LikelihoodWeighting().run(testcase)
+Enumeration().run(testcase)
+```

bayesian-networks/enumeration.py → bayesian_networks/enumeration.py

@@ -36,9 +36,24 @@ def calc_query(self, node, query, graph):
 
 class Enumeration(BayesianClass):
 
-    def __init__(self, graph):
+    def __init__(self, graph=None):
         self.graph = graph
 
+    def run(self, testcase):
+        # Initialize graph
+        parser = ParseInputs()
+        known_data = parser.get_test_data(testcase['netid'])
+        self.graph = parser.get_graph(known_data)
+
+        node, query = parser.get_query('|'.join(testcase['query']))
+        for key, value in self.graph.items():
+            print(key, value)
+        print('---------------')
+
+        # enum = Enumeration(graph)
+        enum_results = self.enum_ask(node, query)
+        parser.print_results(node, query, enum_results)
+
     def enum_ask(self, node, query):
         sorted_nodes = self.graph.keys()
         prob_results = []
@@ -76,16 +91,9 @@ def enum_all(self, sorted_nodes, query):
 
 
 if __name__ == '__main__':
-    parser = ParseInputs()
-    known_data = parser.get_test_data('burglary')
-    graph = parser.get_graph(known_data)
-    node, query = parser.get_query('P(B|j,m)')
-    print(node, query)
-
-    for key, value in graph.items():
-        print(key, value)
-    print('---------------')
-
-    enum = Enumeration(graph)
-    enum_results = enum.enum_ask(node, query)
-    parser.print_results(node, query, enum_results)
+    testcase = {
+        'netid': "burglary",
+        'query': ('B', 'j,m'),
+        'result': {True: 0.28, False: 0.72},
+    }
+    Enumeration().run(testcase)

setup.py

@@ -4,18 +4,18 @@
     long_description = fh.read()
 
 setuptools.setup(
-    name='bayesian-networks',
+    name='bayesian_networks',
     version='0.5',
     author="bkbilly",
     author_email="[email protected]",
     description="Implementation for bayesian network with Enumeration, Rejection Sampling and Likelihood Weighting",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/bkbilly/bayesian-networks",
+    url="https://github.com/bkbilly/bayesian_networks",
     packages=setuptools.find_packages(),
     install_requires=[
         'pytz>=2019.2',
-        'matplotlib>=3.1.1',
+        'matplotlib==3.1.1',
         'networkx>=2.4',
     ],
     classifiers=[