Update unify_predicate.py

unify_predicate.py

@@ -22,21 +22,25 @@ with open(f"data/t_rex.filter.jsonl") as f:
 data['predicate'] = [sub_same[i] if i in sub_same else i for i in data['predicate']]
 data['reverse'] = [i in sub_rev for i in data['predicate']]
 data['predicate'] = [sub_rev[i] if i in sub_rev else i for i in data['predicate']]
-data_filter = data[[i in predicate_main for i in data['predicate']]]
 
-data_filter_rev = data_filter[data_filter['reverse']].copy()
-o = data_filter_rev.pop("object")
-s = data_filter_rev.pop("subject")
-data_filter_rev["subject"] = o
-data_filter_rev["object"] = s
-data_filter[data_filter['reverse']] = data_filter_rev[data_filter.columns]
-data_filter.pop("reverse")
+data_remain = data[[i not in predicate_main for i in data['predicate']]]
+data_remain = data_remain[[i.startswith("P") for i in data_remain['predicate']]]
+data = data[[i in predicate_main for i in data['predicate']]]
+
+
+data_rev = data[data['reverse']].copy()
+o = data_rev.pop("object")
+s = data_rev.pop("subject")
+data_rev["subject"] = o
+data_rev["object"] = s
+data[data['reverse']] = data_rev[data.columns]
+data.pop("reverse")
 
 df_main = df_predicate[df_predicate['ok'] == 'x'][['unique predicates', 'pretty relation name', 'pretty relation name is reverse']]
 df_main['reverse'] = [i == 'x' for i in df_main.pop('pretty relation name is reverse')]
 df_main['predicate'] = df_main.pop('unique predicates')
 
-data_filter_join = data_filter.merge(df_main, how='inner', on='predicate')
+data_filter_join = data.merge(df_main, how='inner', on='predicate')
 data_filter_join_rev = data_filter_join[data_filter_join['reverse']].copy()
 o = data_filter_join_rev.pop("object")
 s = data_filter_join_rev.pop("subject")
@@ -46,8 +50,10 @@ data_filter_join[data_filter_join['reverse']] = data_filter_join_rev[data_filter
 data_filter_join.pop("reverse")
 data_filter_join.pop("predicate")
 data_filter_join['predicate'] = data_filter_join.pop("pretty relation name")
+new = pd.concat([data_filter_join, data_remain[data_filter_join.columns]])
+
 
-print(f"{len(data_filter_join)} triples, {len(data_filter_join['predicate'].unique())} predicates")
+print(f"{len(new)} triples, {len(new['predicate'].unique())} predicates")
 
 with open(f"data/t_rex.filter_unified.jsonl", 'w') as f:
     for _, i in data_filter_join.iterrows():