taxonomy from resources

gadelrab · Jun 23, 2017 · 515b88d · 515b88d
1 parent a4e4b12
commit 515b88d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 26 deletions.
diff --git a/src/main/java/de/mpii/yagotools/YagoTaxonomy.java b/src/main/java/de/mpii/yagotools/YagoTaxonomy.java
@@ -4,6 +4,7 @@
 import de.mpii.yagotools.utils.YagoDataReader;
 import de.mpii.yagotools.utils.YagoRelations;
 
+import java.io.File;
 import java.util.*;
 
 
@@ -13,15 +14,20 @@
 public class YagoTaxonomy {
 
     //private static final String SUB_CLASS_OF = "rdfs:subClassOf";
-    String TAXONOMY_FILE_PATH="resources/bigData/yagoTaxonomy_withGeo.tsv";
+//    String TAXONOMY_FILE_PATH="resources/bigData/yagoTaxonomy_withGeo.tsv";
+    String TAXONOMY_FILE_PATH="bigData/yagoTaxonomy_withGeo.tsv";
 
     private static YagoTaxonomy instance;
 
     private Multimap<String,String> typesParents;
     private Map<String,Set<String>> transitiveParents;
 
     private YagoTaxonomy(){
-        typesParents= YagoDataReader.loadDataInMap(TAXONOMY_FILE_PATH,new String[]{YagoRelations.SUB_CLASS_OF}, YagoDataReader.MapType.SUBJ_2_OBJ);
+        ClassLoader classLoader = getClass().getClassLoader();
+        File taxonomyFile = new File(classLoader.getResource(TAXONOMY_FILE_PATH).getFile());
+
+        typesParents= YagoDataReader.loadDataInMap(taxonomyFile,new String[]{YagoRelations.SUB_CLASS_OF}, YagoDataReader.MapType.SUBJ_2_OBJ);
+//        typesParents= YagoDataReader.loadDataInMap(TAXONOMY_FILE_PATH,new String[]{YagoRelations.SUB_CLASS_OF}, YagoDataReader.MapType.SUBJ_2_OBJ);
         loadTransitiveParents();
     }
 
@@ -83,6 +89,9 @@ public Set<String> getParents(Collection<String> keys){
 
 
     public static void main (String [] args){
+
+//        args=new String[]{"<wikicat_American_film_directors>"};
+
         YagoTaxonomy yt= YagoTaxonomy.getInstance();
 
         System.out.println(yt.getParents(args[0]));

diff --git a/src/main/java/de/mpii/yagotools/utils/YagoDataReader.java b/src/main/java/de/mpii/yagotools/utils/YagoDataReader.java
@@ -7,6 +7,7 @@
 import mpi.tools.basics3.FactSource;
 import mpi.tools.javatools.filehandlers.UTF8Reader;
 
+import java.io.File;
 import java.net.MalformedURLException;
 /**
  * Created by gadelrab on 2/11/16.
@@ -17,46 +18,45 @@ public enum MapType{SUBJ_2_OBJ,PRED_OBJ_2_SUBJ}
 
 
     public static Multimap<String,String> loadDataInMap(String filePath, String [] relations, MapType type) {
+        return loadDataInMap(new File(filePath) ,relations, type);
+    }
+    public static Multimap<String,String> loadDataInMap(File file, String [] relations, MapType type) {
         // add them to set for searching
         ImmutableSet<String> relationsSet=null;
         if (relations!=null)
             relationsSet=ImmutableSet.copyOf(relations);
 
         Multimap<String,String> subjectObjectMap= HashMultimap.create();
 
-        UTF8Reader fileReader;
-        try {
 
 
 
-            //String line;
+        //String line;
+
+       for(Fact f: FactSource.from(file))
+            if(relationsSet==null||relationsSet.contains(f.getRelation())){
+                String key=null;
+                String value=null;
+                switch (type){
+                    case SUBJ_2_OBJ:
+                        key=f.getSubject();
+                        value=f.getObject();
+                        break;
+                    case PRED_OBJ_2_SUBJ:
+                        key=f.getRelation()+"\t"+f.getObject();
+                        value=f.getSubject();
+                        break;
+                }
+                subjectObjectMap.put(key,value);}
+
+        System.out.println( "Dictionary size: "+ subjectObjectMap.size());
 
-           for(Fact f: FactSource.from(filePath))
-                if(relationsSet==null||relationsSet.contains(f.getRelation())){
-                    String key=null;
-                    String value=null;
-                    switch (type){
-                        case SUBJ_2_OBJ:
-                            key=f.getSubject();
-                            value=f.getObject();
-                            break;
-                        case PRED_OBJ_2_SUBJ:
-                            key=f.getRelation()+"\t"+f.getObject();
-                            value=f.getSubject();
-                            break;
-                    }
-                    subjectObjectMap.put(key,value);}
+        return subjectObjectMap;
 
-            System.out.println( "Dictionary size: "+ subjectObjectMap.size());
 
-            return subjectObjectMap;
 
 
-        } catch (MalformedURLException e2) {
-            e2.printStackTrace();
-        }
 
-        return null;
 
     }