diff --git a/app.py b/app.py index 2d327eb..392adac 100644 --- a/app.py +++ b/app.py @@ -10,17 +10,18 @@ def read_graph(graph_file: str = 'valos_halozat_formatted.txt') -> map: result_graph: ig.Graph = ig.Graph(vertices) for _ in range(edges): line = f.readline().split(' ') - print(line) result_graph.add_edge(int(line[0]), int(line[1])) return {"graph": result_graph, "edges:": edges, "vertices": vertices} -def calclulate_values(data: map): - print(f"Komponensek: {data['graph'].clusters()}") - print(f"Atlagos fokszam: {(data['edges']*2)/data['vertices']}") - print(f"Atmero: {data['graph'].diameter()}") - print(f"Atlagos ut hossz: {data['graph'].average_path_length()}") +def calclulate_values(graph_data: map): + print(f"Klaszterezettseg: {graph_data['graph'].clusters()}") + print(f"Atlagos fokszam: {(graph_data['edges'] * 2) / graph_data['vertices']}") + print(f"Komponensek: {graph_data['graph'].components}") + print(f"Atmero: {graph_data['graph'].diameter()}") + print(f"Atlagos ut hossz: {graph_data['graph'].average_path_length()}") if __name__ == "__main__": - read_graph() + data = read_graph() + calclulate_values(data)