Added graph examples

Author: NadavMozeson

Algorithms/BellmamFord.py

@@ -23,7 +23,7 @@ def Bellman_Ford(G: Graph, s: Node, w=weight_function):
  Initialize_single_source(G, s)
  for i in range(len(G.nodes) - 1):
  for u, v in G.get_all_lines():
- Relax(u, v, w(u, v))
+ Relax(u, v, w)
  for u, v in G.get_all_lines():
  if v.d > u.d + w(u, v):
  return False

Algorithms/Dijkstra.py

@@ -27,4 +27,4 @@ def Dijkstra(G: Graph, s: Node, w=weight_function):
  u = Q.extract_min()
  T.add(u)
  for v in u.adjacent_nodes.keys():
- Relax(u, v, w(u, v))
+ Relax(u, v, w)

Builder/GraphBuilder.py

@@ -63,8 +63,11 @@ def add_line(self, event):
  self.canvas.create_text(mid_x, mid_y, text=str(weight), fill="black", font=("Helvetica", 15, "bold"))
  else:
  self.graph.add_line(self.selected_node, label)
- self.canvas.create_line(start_x, start_y, end_x, end_y,
- fill="black", width=3, arrow=tk.LAST, arrowshape=(15, 20, 8))
+ if self.directed:
+ self.canvas.create_line(start_x, start_y, end_x, end_y,
+ fill="black", width=3, arrow=tk.LAST, arrowshape=(15, 20, 8))
+ else:
+ self.canvas.create_line(start_x, start_y, end_x, end_y, fill="black", width=3)
  else:
  messagebox.showwarning("Line exists", "Line already exists in the graph.")
  self.selected_node = None

Builder/GraphCreator.py

@@ -28,6 +28,9 @@ def __init__(self, label):
  def __repr__(self):
  return f"{circle_value(self.label)}"
 
+ def __str__(self):
+ return f"{self.label}"
+
  def add_adj(self, node, weight=None):
  self.adjacent_nodes[node] = weight
  self.adjacent_nodes = OrderedDict(sorted(self.adjacent_nodes.items(), key=lambda item: item[0].label))
@@ -60,7 +63,7 @@ def add_node(self, node: str):
  :param node: Node name
  """
  self.nodes.append(self.NodeClass(node))
- self.nodes.sort(key=lambda x: x.label)
+ self.nodes.sort(key=lambda x: (x.label.lower() != 's', x.label.lower()))
 
  def add_line(self, node1: str, node2: str, weight: int = None):
  """
@@ -182,7 +185,7 @@ def save(self, filename: str):
 
  :param filename: a name of the file without extension
  """
- with open(filename, 'wb') as file:
+ with open('Graphs/' + filename, 'wb') as file:
  pickle.dump(self, file)
 
  @classmethod
@@ -192,7 +195,7 @@ def load(cls, filename: str):
 
  :param filename: a name of the file without extension
  """
- with open(filename, 'rb') as file:
+ with open('Graphs/' + filename, 'rb') as file:
  return pickle.load(file)
 
  def has_cycle(self):

Builder/GraphCreatorApp.py

@@ -52,7 +52,7 @@ def create_section1(self):
  self.next_button.pack()
 
  def load_graph(self):
- self.loaded_filename = basename(filedialog.askopenfilename(title="Select Graph File", initialdir=dirname(dirname(realpath(__file__)))))
+ self.loaded_filename = basename(filedialog.askopenfilename(title="Select Graph File", initialdir=dirname(dirname(realpath(__file__))) + '/Graphs'))
  if self.loaded_filename:
  messagebox.showinfo("Info", f"Graph loaded from file: {self.loaded_filename}")
  self.submit_data()
@@ -178,6 +178,5 @@ def submit_data(self):
  self.root.quit()
  self.root.destroy()
 
-
  def return_result(self):
  return self.result