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

更新日時:

2014/02/18 17:20:23 (11 年 前)

更新者:

atsuko

ログメッセージ:

convergence & divergence 判定改良

ファイル:

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

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

@@ -155 +155 @@
                       boolean con = false;
                       boolean div = false;
-                      double conv = getValueForConvergence(classLinks[j].getNumOfOriginInstances(), 
-                                                           classLinks[j].getNumOfLinkedInstances(),
-                                                           classLinks[j].getNumOfLinks());
-                      //double divv = getValueForDivergence(classLinks[j].getNumOfOriginInstances(), 
-                      //                                     classLinks[j].getNumOfLinkedInstances(),
-                      //                                     classLinks[j].getNumOfLinks());
-                      if ( conv > concut ){ // convergence
+                      if ( decideConvergence(classLinks[j]) ){ // convergence
                           con = true;
                       }
-                      if ( conv < divcut ){ // divergence
+                      if ( decideDivergence(classLinks[j]) ){ // divergence
                           div = true;
                       }
@@ -181 +175 @@
     }
     
+    private boolean decideConvergence(ClassLink classLink){
+        double con = getValueForConvergence(classLink.getNumOfOriginInstances(), 
+                                              classLink.getNumOfLinkedInstances(),
+                                              classLink.getNumOfLinks());
+        if ( con > concut  ){
+            return true;
+        }
+        return false;
+    }
+    
+    private boolean decideDivergence(ClassLink classLink){
+        double con = getValueForConvergence(classLink.getNumOfOriginInstances(), 
+                                              classLink.getNumOfLinkedInstances(),
+                                              classLink.getNumOfLinks());
+        if ( con < divcut  ){
+            return true;
+        }
+        return false;
+    }
+
     private double getValueForConvergence(int numOfOriginInstances, int numOfLinkedInstances, int numOfLinks){
         //return (double) numOfLinks / (double) numOfLinkedInstances ;
@@ -186 +200 @@
         return Math.log((double)numOfOriginInstances) - Math.log((double)numOfLinkedInstances); 
     }
-
-    /*
-    private double getValueForDivergence(int numOfOriginInstances, int numOfLinkedInstances, int numOfLinks){
-        return (double) numOfLinks / (double) numOfOriginInstances ;
-        // return ;
-    }*/
 }