Fixed codes.

DeepGraphLearning · Jul 30, 2021 · 69aafd4 · 69aafd4
1 parent 8e749dd
commit 69aafd4
Show file tree

Hide file tree

Showing 36 changed files with 312,635 additions and 730,776 deletions.
diff --git a/codes/extra/core/__init__.py b/codes/extra/core/__init__.py
diff --git a/codes/extra/core/__pycache__/__init__.cpython-38.pyc b/codes/extra/core/__pycache__/__init__.cpython-38.pyc
diff --git a/codes/extra/core/__pycache__/base.cpython-38.pyc b/codes/extra/core/__pycache__/base.cpython-38.pyc
diff --git a/codes/extra/data/__pycache__/graph.cpython-38.pyc b/codes/extra/data/__pycache__/graph.cpython-38.pyc
diff --git a/codes/extra/utils/__init__.py b/codes/extra/utils/__init__.py
diff --git a/codes/extra/utils/__pycache__/__init__.cpython-38.pyc b/codes/extra/utils/__pycache__/__init__.cpython-38.pyc
diff --git a/codes/extra/utils/__pycache__/file.cpython-38.pyc b/codes/extra/utils/__pycache__/file.cpython-38.pyc
diff --git a/codes/extra/utils/__pycache__/io.cpython-38.pyc b/codes/extra/utils/__pycache__/io.cpython-38.pyc
diff --git a/codes/extra/utils/__pycache__/pretty.cpython-38.pyc b/codes/extra/utils/__pycache__/pretty.cpython-38.pyc
diff --git a/codes/extra/utils/__pycache__/torch.cpython-38.pyc b/codes/extra/utils/__pycache__/torch.cpython-38.pyc
diff --git a/codes_toy/model.py b/codes_toy/model.py
@@ -31,22 +31,28 @@ def __init__(self, data_path):
 			for line in fi:
 				h, r, t = line.strip().split('\t')
 				self.train_triplets.append((self.entity2id[h], self.relation2id[r], self.entity2id[t]))
+				self.train_triplets.append((self.entity2id[t], self.relation2id[r] + len(self.relation2id), self.entity2id[h]))
 
 		with open(os.path.join(data_path, 'valid.txt')) as fi:
 			for line in fi:
 				h, r, t = line.strip().split('\t')
 				self.valid_triplets.append((self.entity2id[h], self.relation2id[r], self.entity2id[t]))
+				self.valid_triplets.append((self.entity2id[t], self.relation2id[r] + len(self.relation2id), self.entity2id[h]))
 
 		with open(os.path.join(data_path, 'test.txt')) as fi:
 			for line in fi:
 				h, r, t = line.strip().split('\t')
 				self.test_triplets.append((self.entity2id[h], self.relation2id[r], self.entity2id[t]))
+				self.test_triplets.append((self.entity2id[t], self.relation2id[r] + len(self.relation2id), self.entity2id[h]))
+
+		self.entity_size = len(self.entity2id)
+		self.relation_size = len(self.relation2id) * 2
 
 	def get_entity_size(self):
-		return len(self.entity2id)
+		return self.entity_size
 
 	def get_relation_size(self):
-		return len(self.relation2id)
+		return self.relation_size
 
 class RuleMiner:
 	def __init__(self, graph):

diff --git a/codes_toy/pyrnnlogiclib/rnnlogic.cpp b/codes_toy/pyrnnlogiclib/rnnlogic.cpp
@@ -247,10 +247,16 @@ void KnowledgeGraph::read_data(char *data_path)
         if (ent2id.count(s_head) == 0 || ent2id.count(s_tail) == 0 || rel2id.count(s_rel) == 0) continue;
 
         h = ent2id[s_head]; t = ent2id[s_tail]; r = rel2id[s_rel];
+
         triplet.h = h; triplet.t = t; triplet.r = r;
         train_triplets.push_back(triplet);
         set_train_triplets.insert(triplet);
         set_all_triplets.insert(triplet);
+
+        triplet.h = t; triplet.t = h; triplet.r = r + relation_size;
+        train_triplets.push_back(triplet);
+        set_train_triplets.insert(triplet);
+        set_all_triplets.insert(triplet);
     }
     fclose(fi);
 
@@ -276,9 +282,14 @@ void KnowledgeGraph::read_data(char *data_path)
         if (ent2id.count(s_head) == 0 || ent2id.count(s_tail) == 0 || rel2id.count(s_rel) == 0) continue;
 
         h = ent2id[s_head]; t = ent2id[s_tail]; r = rel2id[s_rel];
+
         triplet.h = h; triplet.t = t; triplet.r = r;
         valid_triplets.push_back(triplet);
         set_all_triplets.insert(triplet);
+
+        triplet.h = t; triplet.t = h; triplet.r = r + relation_size;
+        valid_triplets.push_back(triplet);
+        set_all_triplets.insert(triplet);
     }
     fclose(fi);
     valid_triplet_size = int(valid_triplets.size());
@@ -297,14 +308,20 @@ void KnowledgeGraph::read_data(char *data_path)
         if (ent2id.count(s_head) == 0 || ent2id.count(s_tail) == 0 || rel2id.count(s_rel) == 0) continue;
 
         h = ent2id[s_head]; t = ent2id[s_tail]; r = rel2id[s_rel];
+
         triplet.h = h; triplet.t = t; triplet.r = r;
         test_triplets.push_back(triplet);
         set_all_triplets.insert(triplet);
+
+        triplet.h = t; triplet.t = h; triplet.r = r + relation_size;
+        test_triplets.push_back(triplet);
+        set_all_triplets.insert(triplet);
     }
     fclose(fi);
     test_triplet_size = int(test_triplets.size());
 
     all_triplet_size = int(set_all_triplets.size());
+    relation_size *= 2;
 
     printf("#Entities: %d          \n", entity_size);
     printf("#Relations: %d          \n", relation_size);

diff --git a/data/FB15k-237/entities.dict b/data/FB15k-237/entities.dict
diff --git a/data/FB15k-237/relations.dict b/data/FB15k-237/relations.dict
diff --git a/data/FB15k-237/test.txt b/data/FB15k-237/test.txt
diff --git a/data/FB15k-237/train.txt b/data/FB15k-237/train.txt