diff --git a/README.md b/README.md index 422a9100f9948a903afbd38f42b2dd7941e67032..aa840f68eba6620ef8c7245227b7f6aeef3fac46 100644 --- a/README.md +++ b/README.md @@ -93,15 +93,15 @@ The structure of this folder is organised as such : │  ├── dependency_graph.json │  ├── dependency_graph.mmd │  ├── dependency_graph.png -│  ├── dependency_graph_wo_lables.dot -│  ├── dependency_graph_wo_lables.mmd -│  ├── dependency_graph_wo_lables.png +│  ├── dependency_graph_wo_labels.dot +│  ├── dependency_graph_wo_labels.mmd +│  ├── dependency_graph_wo_labels.png │  ├── dependency_graph_wo_orphan_operations.dot │  ├── dependency_graph_wo_orphan_operations.mmd │  ├── dependency_graph_wo_orphan_operations.png -│  ├── dependency_graph_wo_orphan_operations_wo_lables.dot -│  ├── dependency_graph_wo_orphan_operations_wo_lables.mmd -│  ├── dependency_graph_wo_orphan_operations_wo_lables.png +│  ├── dependency_graph_wo_orphan_operations_wo_labels.dot +│  ├── dependency_graph_wo_orphan_operations_wo_labels.mmd +│  ├── dependency_graph_wo_orphan_operations_wo_labels.png │  ├── metadata_dependency_graph.json │  ├── metadata_process_dependency_graph.json │  ├── metadata_specification_graph.json diff --git a/src/graph.py b/src/graph.py index 8001086838677755325bb8437da262a3fdb129be..ebbabe68cda82852735b517e266ddaa913323971 100644 --- a/src/graph.py +++ b/src/graph.py @@ -121,13 +121,13 @@ class Graph(): def get_specification_graph(self, filename = "specification_graph", render_graphs = True): generate_graph(self.get_output_dir()/'graphs'/filename, self.full_dico, render_graphs = render_graphs) - def get_specification_graph_wo_lables(self, filename = "specification_graph_wo_labels", render_graphs = True): + def get_specification_graph_wo_labels(self, filename = "specification_graph_wo_labels", render_graphs = True): generate_graph(self.get_output_dir()/'graphs'/filename, self.full_dico, label_edge=False, label_node=False, render_graphs = render_graphs) def get_specification_graph_wo_orphan_operations(self, filename = "specification_wo_orphan_operations", render_graphs = True): generate_graph(self.get_output_dir()/'graphs'/filename, graph_dico_wo_orphan_operations(self.full_dico), render_graphs = render_graphs) - def get_specification_graph_wo_orphan_operations_wo_lables(self, filename = "specification_wo_orphan_operations_wo_labels", render_graphs = True): + def get_specification_graph_wo_orphan_operations_wo_labels(self, filename = "specification_wo_orphan_operations_wo_labels", render_graphs = True): generate_graph(self.get_output_dir()/'graphs'/filename, graph_dico_wo_orphan_operations(self.full_dico), label_edge=False, label_node=False, render_graphs = render_graphs) def get_process_dependency_graph(self): @@ -268,13 +268,13 @@ class Graph(): def render_dependency_graph(self, filename = "dependency_graph", render_graphs = True): generate_graph(self.get_output_dir()/'graphs'/filename, self.dico_wo_branch_operation, render_graphs = render_graphs) - def get_dependency_graph_wo_lables(self, filename = "dependency_graph_wo_lables", render_graphs = True): + def get_dependency_graph_wo_labels(self, filename = "dependency_graph_wo_labels", render_graphs = True): generate_graph(self.get_output_dir()/'graphs'/filename, self.dico_wo_branch_operation, label_edge=False, label_node=False, render_graphs = render_graphs) def get_dependency_graph_wo_orphan_operations(self, filename = "dependency_graph_wo_orphan_operations", render_graphs = True): generate_graph(self.get_output_dir()/'graphs'/filename, graph_dico_wo_orphan_operations(self.dico_wo_branch_operation), render_graphs = render_graphs) - def get_dependency_graph_wo_orphan_operations_wo_lables(self, filename = "dependency_graph_wo_orphan_operations_wo_lables", render_graphs = True): + def get_dependency_graph_wo_orphan_operations_wo_labels(self, filename = "dependency_graph_wo_orphan_operations_wo_labels", render_graphs = True): generate_graph(self.get_output_dir()/'graphs'/filename, graph_dico_wo_orphan_operations(self.dico_wo_branch_operation), label_edge=False, label_node=False, render_graphs = render_graphs) diff --git a/src/nextflow_file.py b/src/nextflow_file.py index 70684e4f2c4f1346bd294de102bdb17258121f0d..740bd4e2545015b627c96c23c9a52db0e3c7ddf2 100644 --- a/src/nextflow_file.py +++ b/src/nextflow_file.py @@ -649,14 +649,14 @@ class Nextflow_File(Nextflow_Building_Blocks): #Generate the different graphs self.graph.get_specification_graph(render_graphs = render_graphs) - self.graph.get_specification_graph_wo_lables(render_graphs = render_graphs) + self.graph.get_specification_graph_wo_labels(render_graphs = render_graphs) self.graph.render_graph_wo_operations(render_graphs = render_graphs) self.graph.get_specification_graph_wo_orphan_operations(render_graphs = render_graphs) - self.graph.get_specification_graph_wo_orphan_operations_wo_lables(render_graphs = render_graphs) + self.graph.get_specification_graph_wo_orphan_operations_wo_labels(render_graphs = render_graphs) self.graph.render_dependency_graph(render_graphs = render_graphs) - self.graph.get_dependency_graph_wo_lables(render_graphs = render_graphs) + self.graph.get_dependency_graph_wo_labels(render_graphs = render_graphs) self.graph.get_dependency_graph_wo_orphan_operations(render_graphs = render_graphs) - self.graph.get_dependency_graph_wo_orphan_operations_wo_lables(render_graphs = render_graphs) + self.graph.get_dependency_graph_wo_orphan_operations_wo_labels(render_graphs = render_graphs) #Generate the different metadata associated with the graphs