チェンジセット 67

更新日時:

2014/04/21 17:43:03 (11 年 前)

更新者:

atsuko

ログメッセージ:

様々な枝刈り手法を入れたSearchPathsWithCutを実装(getPaths の mode=2 で起動)

ファイル:

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

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

@@ -9 +9 @@
  * @author atsuko
  */
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
 
 public class OWLClassGraph extends LabeledMultiDigraph{
@@ -21 +24 @@
         
     public class LinkAndPath{
+        String originalClassURI; // originalClasssURI -classLink.propertyURI-> classLink.linkedClassURL
         ClassLink classLink;
         List<ClassLink> path;
         boolean converge;
+        
         public LinkAndPath(ClassLink classLink, List<ClassLink> path){
            this.classLink = classLink;
@@ -30 +35 @@
         }
         
-        public LinkAndPath(ClassLink classLink, List<ClassLink> path, boolean converge){
+        public LinkAndPath(ClassLink classLink, List<ClassLink> path, String orinalClassURI, boolean converge){
            this.classLink = classLink;
            this.path = path;
+           this.originalClassURI = originalClassURI;
            this.converge = converge;
         }
@@ -50 +56 @@
     }
     
+    /*
     public void generateGraph(List<List<ClassLink>> paths){
         ListIterator<List<ClassLink>> pit = paths.listIterator();
@@ -61 +68 @@
         }
     }
+   */
     
     public Path[] getPaths(OWLQueryBuilderImpl qb, int mode, boolean countLink){
@@ -67 +75 @@
             paths = searchPaths(qb, mode, countLink);
         }else if ( mode == 2 ){
-            paths = searchPathsWithCut(qb);            
+            paths = searchPathsWithCut(qb);        
         }else{
             System.err.println("Mode is not correct");
@@ -154 +162 @@
                           continue;
                       }
+                      if (classLinks[j].getNumOfLinks() <= th ){
+                          continue; //cut by the number of instances
+                      }
+                      // Divergence & Convergence Decision
                       boolean con = false;
                       boolean div = false;
@@ -163 +175 @@
                       }
                       if ( crrlp.converge == true && div == true ){ // converge & 縲€diverge
-                          continue; // cut
-                      }
-                      nextlp.add(new LinkAndPath(classLinks[j], crrpath, con));
+                          continue; // cut by the differences of entropies
+                      }
+                      // crr & next are the same arcs
+                      if ( crrlp.classLink.getPropertyURI().equals(classLinks[j].getPropertyURI()) &&
+                           crrlp.classLink.getDirection() != classLinks[j].getDirection() &&
+                           crrlp.originalClassURI.equals( classLinks[j].getLinkedClassURI()) ){
+                          continue;
+                      }
+                      
+                      nextlp.add(new LinkAndPath(classLinks[j], crrpath, crrlp.classLink.getLinkedClassURI(), con));
                   }
               }