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

更新日時:

2014/02/17 18:49:52 (11 年 前)

更新者:

atsuko

ログメッセージ:

convergence & divergence 判定改良

ファイル:

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

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

@@ -47 +47 @@
         th = 0;
         concut = 2.0;
-        divcut = 2.0;
+        divcut = - 2.0;
     }
     
@@ -158 +158 @@
                                                            classLinks[j].getNumOfLinkedInstances(),
                                                            classLinks[j].getNumOfLinks());
-                      double divv = getValueForDivergence(classLinks[j].getNumOfOriginInstances(), 
-                                                           classLinks[j].getNumOfLinkedInstances(),
-                                                           classLinks[j].getNumOfLinks());
+                      //double divv = getValueForDivergence(classLinks[j].getNumOfOriginInstances(), 
+                      //                                     classLinks[j].getNumOfLinkedInstances(),
+                      //                                     classLinks[j].getNumOfLinks());
                       if ( conv > concut ){ // converge
                           con = true;
                       }
-                      if ( divv > divcut ){
+                      if ( conv < divcut ){
                           div = true;
                       }
@@ -182 +182 @@
     
     private double getValueForConvergence(int numOfOriginInstances, int numOfLinkedInstances, int numOfLinks){
-        return (double) numOfLinks / (double) numOfLinkedInstances ;
+        //return (double) numOfLinks / (double) numOfLinkedInstances ;
+        return Math.log((double)numOfOriginInstances) - Math.log((double)numOfLinkedInstances);
     }
 
+    /*
     private double getValueForDivergence(int numOfOriginInstances, int numOfLinkedInstances, int numOfLinks){
-        return (double) numOfLinks / (double) numOfOriginInstances ;        
-    }
+        return (double) numOfLinks / (double) numOfOriginInstances ;
+        // return ;
+    }*/
 }