チェンジセット 15 : BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder

更新日時:

2014/01/30 13:41:37 (11 年 前)

更新者:

atsuko

ログメッセージ:

getPaths の引数変更 第二引数が0: クラス間探索, 1: インスタンス利用探索

ファイル:

• BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java (変更) (5 diff)

BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java

@@ -37 +37 @@
     
     public void generateGraph(List<List<ClassLink>> paths){
-        
+        ListIterator<List<ClassLink>> pit = paths.listIterator();
+        while( pit.hasNext() ){
+            // KOKO
+        }
     }
     
-    public Path[] getPaths(OWLQueryBuilderImpl qb){
-        List<List<ClassLink>> paths = searchPathsFromOWL(qb);
-        //List<List<ClassLink>> paths = searchPathsFromInstances(qb);
+    public Path[] getPaths(OWLQueryBuilderImpl qb, int mode){
+        List<List<ClassLink>> paths = searchPaths(qb, mode);
         Path[] patharray = new Path[paths.size()];
         ListIterator<List<ClassLink>> pit = paths.listIterator();
@@ -65 +67 @@
     }
     
+    /*
     private List<List<ClassLink>> searchPathsFromOWL(OWLQueryBuilderImpl qb){
         return searchPathsEngine(qb, 0);
@@ -72 +75 @@
         return searchPathsEngine(qb, 1);
     }
+    */
     
-    private List<List<ClassLink>> searchPathsEngine(OWLQueryBuilderImpl qb, int mode){
-        List<List<ClassLink>> paths = new ArrayList<List<ClassLink>>();
+    private List<List<ClassLink>> searchPaths(OWLQueryBuilderImpl qb, int mode){
+        List<List<ClassLink>> paths = new ArrayList<>();
         ClassLink crrLink = new ClassLink(null,startClass,Direction.both,0);
-        List<LinkAndPath> lp = new LinkedList<LinkAndPath>();
+        List<LinkAndPath> lp = new LinkedList<>();
         lp.add(new LinkAndPath(crrLink, new LinkedList<ClassLink>()));
         try{
           for ( int i = 0; i < nsteps; i++ ){
               ListIterator<LinkAndPath> lit = lp.listIterator();
-              List<LinkAndPath> nextlp = new LinkedList<LinkAndPath>();
+              List<LinkAndPath> nextlp = new LinkedList<>();
               while ( lit.hasNext() ){
                   LinkAndPath crrlp = lit.next();
@@ -93 +97 @@
                   }else{ System.err.println("Mode is not correct."); }
                   for ( int j = 0 ; j < classLinks.length; j++ ){
-                      List<ClassLink> crrpath = new LinkedList<ClassLink>(crrlp.path);
+                      //List<ClassLink> crrpath = new LinkedList<ClassLink>(crrlp.path);
+                      List<ClassLink> crrpath = new LinkedList<>(crrlp.path);
                       crrpath.add(classLinks[j]);
                       if ( classLinks[j].getLinkedClassURI().equals(endClass) ){
-                          paths.add(new LinkedList<ClassLink>(crrpath));
+                          //paths.add(new LinkedList<ClassLink>(crrpath));
+                          paths.add(new LinkedList<>(crrpath));
                       }
                       nextlp.add(new LinkAndPath(classLinks[j],crrpath));
@@ -103 +109 @@
               lp = nextlp;
           }
-        }catch(Exception e){ System.err.println(e);}
+        }catch(Exception e){ 
+            System.err.println(e);
+        }
         return paths;        
     }