Modify plot graph method

.gitignore

@@ -5,4 +5,5 @@ __pycache__
 **/PyCTBN.egg-info
 **/results_data
 **/.scannerwork
+.idea
 

PyCTBN/PyCTBN/estimators/structure_estimator.py

@@ -142,40 +142,34 @@ class StructureEstimator(object):
         return nx.difference(real_graph, self._complete_graph).edges
 
     def save_plot_estimated_structure_graph(self, file_path: str) -> None:  
-            """Plot the estimated structure in a graphical model style, use .png extension.
+        """Plot the estimated structure in a graphical model style, use .png extension.
-            Spurious edges are colored in red if a prior structure is present.
+
-
+        :param file_path: path to save the file to
-            :param file_path: path to save the file to
+        :type: string
-            :type: string
+        """
-            """
+        pos = nx.spring_layout(self._complete_graph, k=0.5*1/np.sqrt(len(self._complete_graph.nodes)),
-            graph_to_draw = nx.DiGraph()
+                               iterations=50,scale=10)
-            spurious_edges = self.spurious_edges()
+        options = {
-            non_spurious_edges = list(set(self._complete_graph.edges) - set(spurious_edges))
+            "node_size": 2000,
-            edges_colors = ['red' if edge in spurious_edges else 'black' for edge in self._complete_graph.edges]
+            "node_color": "white",
-            graph_to_draw.add_edges_from(spurious_edges)
+            "edgecolors": "black",
-            graph_to_draw.add_edges_from(non_spurious_edges)
+            'linewidths':2,
-            pos = nx.spring_layout(graph_to_draw, k=0.5*1/np.sqrt(len(graph_to_draw.nodes())), iterations=50,scale=10)
+            "with_labels":True,
-            options = {
+            "font_size":13,
-                "node_size": 2000,
+            'connectionstyle': 'arc3, rad = 0.1',
-                "node_color": "white",
+            "arrowsize": 15,
-                "edgecolors": "black",
+            #"arrowstyle": '<|-',
-                'linewidths':2,
+            "width": 1,
-                "with_labels":True,
+            #"edge_color":edges_colors,
-                "font_size":13,
+        }
-                'connectionstyle': 'arc3, rad = 0.1',
+
-                "arrowsize": 15,
+        nx.draw(self._complete_graph, pos, **options)
-                "arrowstyle": '<|-',
+        ax = plt.gca()
-                "width": 1,
+        ax.margins(0.20)
-                "edge_color":edges_colors,
+        plt.axis("off")
-            }
+        plt.savefig(file_path)
-
+        plt.clf()
-            nx.draw(graph_to_draw, pos, **options)
+        print("Estimated Structure Plot Saved At: ", os.path.abspath(file_path))
-            ax = plt.gca()
-            ax.margins(0.20)
-            plt.axis("off")
-            plt.savefig(file_path)
-            plt.clf()
-            print("Estimated Structure Plot Saved At: ", os.path.abspath(file_path))
 
 
 

PyCTBN/setup.py

@@ -1,20 +0,0 @@
-from setuptools import setup, find_packages
-
-
-setup(name='PyCTBN',
-      version='1.0',
-      url='https://github.com/philipMartini/PyCTBN',
-      license='MIT',
-      author=['Alessandro Bregoli', 'Filippo Martini','Luca Moretti'],
-      author_email=['a.bregoli1@campus.unimib.it', 'f.martini@campus.unimib.it','lucamoretti96@gmail.com'],
-      description='A Continuous Time Bayesian Networks Library',
-      packages=find_packages('.', exclude=['tests']),
-      #packages=['PyCTBN.PyCTBN'],
-      install_requires=[
-          'numpy', 'pandas', 'networkx', 'scipy', 'matplotlib', 'tqdm'],
-      dependency_links=['https://github.com/numpy/numpy', 'https://github.com/pandas-dev/pandas',
-                        'https://github.com/networkx/networkx', 'https://github.com/scipy/scipy',
-                        'https://github.com/tqdm/tqdm'],
-      #long_description=open('../README.md').read(),
-      zip_safe=False,
-      python_requires='>=3.6')

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 
 setup(name='PyCTBN',
-      version='1.0',
+      version='2.1',
       url='https://github.com/philipMartini/PyCTBN',
       license='MIT',
       author=['Alessandro Bregoli', 'Filippo Martini','Luca Moretti'],