number of diamonds increased

xiwang0818 · Apr 13, 2022 · 102f9eb · 102f9eb
1 parent 1900019
commit 102f9eb
Show file tree

Hide file tree

Showing 55 changed files with 10 additions and 7 deletions.
diff --git a/__pycache__/gat_net.cpython-39.pyc b/__pycache__/gat_net.cpython-39.pyc
diff --git a/create_data.py b/create_data.py
@@ -146,7 +146,7 @@ def return_labels(G):
     # reset Graph
     G = nx.MultiDiGraph
     # generate new random number for number of diamonds and nodes in total
-    num_diamonds = randint(1, 4)
+    num_diamonds = randint(5, 8)
     #num_diamonds = 5
     #num_nodes = randint(300, 500)
     num_nodes = 300

diff --git a/evaluate.py b/evaluate.py
@@ -21,18 +21,22 @@
 def evaluate(data):
     model.eval()
     out, accs = model(data.x, data.edge_index), []
-    for _, mask in data('train_mask'):
-        acc = float((out[mask].argmax(-1) == data.y[mask]).sum() / mask.sum())
-        accs.append(acc)
+    #for _, mask in data('train_mask'):
+    #print(type(out))
+    #print("\n")
+    print(out.argmax(-1))
+    print(data.y)
+    acc = float((out.argmax(-1) == data.y).sum() / data.y.sum())
+    accs.append(acc)
     return accs
     #         acc_graph[i] = acc_data
     # report_training_accuracy(acc_graph)
 
 for data, i in zip(data_list, range(len(data_list))):
     accs = evaluate(data)
     acc_graph[i] = accs
-print(acc_graph)
-print(type(acc_graph))
+#print(acc_graph)
+#print(type(acc_graph))
 #report_training_accuracy(acc_graph)
 # acc_graph = evaluate()
 # print(acc_graph)
diff --git a/models/gat_300_2 b/models/gat_300_2
diff --git a/test_data/dataset_43_D.gpickle b/test_data/dataset_43_D.gpickle
diff --git a/test_data/dataset_44_D.gpickle b/test_data/dataset_44_D.gpickle
diff --git a/test_data/dataset_45_D.gpickle b/test_data/dataset_45_D.gpickle
diff --git a/test_data/dataset_46_D.gpickle b/test_data/dataset_46_D.gpickle
diff --git a/test_data/dataset_47_D.gpickle b/test_data/dataset_47_D.gpickle
diff --git a/test_data/dataset_48_D.gpickle b/test_data/dataset_48_D.gpickle
diff --git a/test_data/dataset_49_D.gpickle b/test_data/dataset_49_D.gpickle
diff --git a/train.py b/train.py
@@ -114,7 +114,6 @@ def train(data):
         for epoch in range(1, 20):
             loss = train(data)
             train_acc = test(data)
-            #test_acc = test(data)
         print(f"loss: {loss}, train_ accuracy : {train_acc}")
             #print(f'Epoch: {epoch:03d}, Loss: {loss:.4f}, Train Acc: {train_acc:.4f} Test Acc: {test_acc:.4f}')
     torch.save(model, "models/gat_300_2")

diff --git a/train_data/dataset_0_D.gpickle b/train_data/dataset_0_D.gpickle
diff --git a/train_data/dataset_10_D.gpickle b/train_data/dataset_10_D.gpickle
diff --git a/train_data/dataset_11_D.gpickle b/train_data/dataset_11_D.gpickle
diff --git a/train_data/dataset_12_D.gpickle b/train_data/dataset_12_D.gpickle
diff --git a/train_data/dataset_13_D.gpickle b/train_data/dataset_13_D.gpickle
diff --git a/train_data/dataset_14_D.gpickle b/train_data/dataset_14_D.gpickle
diff --git a/train_data/dataset_15_D.gpickle b/train_data/dataset_15_D.gpickle
diff --git a/train_data/dataset_16_D.gpickle b/train_data/dataset_16_D.gpickle
diff --git a/train_data/dataset_17_D.gpickle b/train_data/dataset_17_D.gpickle
diff --git a/train_data/dataset_18_D.gpickle b/train_data/dataset_18_D.gpickle
diff --git a/train_data/dataset_19_D.gpickle b/train_data/dataset_19_D.gpickle
diff --git a/train_data/dataset_1_D.gpickle b/train_data/dataset_1_D.gpickle
diff --git a/train_data/dataset_20_D.gpickle b/train_data/dataset_20_D.gpickle
diff --git a/train_data/dataset_21_D.gpickle b/train_data/dataset_21_D.gpickle
diff --git a/train_data/dataset_22_D.gpickle b/train_data/dataset_22_D.gpickle
diff --git a/train_data/dataset_23_D.gpickle b/train_data/dataset_23_D.gpickle
diff --git a/train_data/dataset_24_D.gpickle b/train_data/dataset_24_D.gpickle
diff --git a/train_data/dataset_25_D.gpickle b/train_data/dataset_25_D.gpickle
diff --git a/train_data/dataset_26_D.gpickle b/train_data/dataset_26_D.gpickle
diff --git a/train_data/dataset_27_D.gpickle b/train_data/dataset_27_D.gpickle
diff --git a/train_data/dataset_28_D.gpickle b/train_data/dataset_28_D.gpickle
diff --git a/train_data/dataset_29_D.gpickle b/train_data/dataset_29_D.gpickle
diff --git a/train_data/dataset_2_D.gpickle b/train_data/dataset_2_D.gpickle
diff --git a/train_data/dataset_30_D.gpickle b/train_data/dataset_30_D.gpickle
diff --git a/train_data/dataset_31_D.gpickle b/train_data/dataset_31_D.gpickle
diff --git a/train_data/dataset_32_D.gpickle b/train_data/dataset_32_D.gpickle
diff --git a/train_data/dataset_33_D.gpickle b/train_data/dataset_33_D.gpickle
diff --git a/train_data/dataset_34_D.gpickle b/train_data/dataset_34_D.gpickle
diff --git a/train_data/dataset_35_D.gpickle b/train_data/dataset_35_D.gpickle
diff --git a/train_data/dataset_36_D.gpickle b/train_data/dataset_36_D.gpickle
diff --git a/train_data/dataset_37_D.gpickle b/train_data/dataset_37_D.gpickle
diff --git a/train_data/dataset_38_D.gpickle b/train_data/dataset_38_D.gpickle
diff --git a/train_data/dataset_39_D.gpickle b/train_data/dataset_39_D.gpickle
diff --git a/train_data/dataset_3_D.gpickle b/train_data/dataset_3_D.gpickle
diff --git a/train_data/dataset_40_D.gpickle b/train_data/dataset_40_D.gpickle
diff --git a/train_data/dataset_41_D.gpickle b/train_data/dataset_41_D.gpickle
diff --git a/train_data/dataset_42_D.gpickle b/train_data/dataset_42_D.gpickle
diff --git a/train_data/dataset_4_D.gpickle b/train_data/dataset_4_D.gpickle
diff --git a/train_data/dataset_5_D.gpickle b/train_data/dataset_5_D.gpickle
diff --git a/train_data/dataset_6_D.gpickle b/train_data/dataset_6_D.gpickle
diff --git a/train_data/dataset_7_D.gpickle b/train_data/dataset_7_D.gpickle
diff --git a/train_data/dataset_8_D.gpickle b/train_data/dataset_8_D.gpickle
diff --git a/train_data/dataset_9_D.gpickle b/train_data/dataset_9_D.gpickle