チェンジセット 8

更新日時:

2014/01/30 10:59:12 (11 年 前)

更新者:

atsuko

ログメッセージ:

getPaths in OWLClassGraph updated

パス:

BH13SPARQLBuilder/src/org/biohackathon/SPARQLBuilder/OWL

ファイル:

• OWLClassGraph.java (変更) (3 diff)
• Path.java (変更) (4 diff)

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

@@ -41 +41 @@
     
     public Path[] getPaths(OWLQueryBuilderImpl qb){
-        //List<List<ClassLink>> paths = searchPathsFromOWL(qb);
-        List<List<ClassLink>> paths = searchPathsFromInstances(qb);
+        List<List<ClassLink>> paths = searchPathsFromOWL(qb);
+        //List<List<ClassLink>> paths = searchPathsFromInstances(qb);
         Path[] patharray = new Path[paths.size()];
         ListIterator<List<ClassLink>> pit = paths.listIterator();
@@ -51 +51 @@
             List<ClassLink> path = pit.next();
             patharray[i].setClassLinks(path);
+            ListIterator<ClassLink> cit = path.listIterator();
+            int min = Integer.MAX_VALUE;
+            while ( cit.hasNext() ){
+                ClassLink cl = cit.next();
+                if ( cl.getNumOfLinks() < min ){
+                    min = cl.getNumOfLinks();
+                }
+            }
+            patharray[i].setWidth(min);
             i++;
         }
@@ -66 +75 @@
     private List<List<ClassLink>> searchPathsEngine(OWLQueryBuilderImpl qb, int mode){
         List<List<ClassLink>> paths = new ArrayList<List<ClassLink>>();
-        ClassLink crrLink = new ClassLink(null,startClass,Direction.both);
+        ClassLink crrLink = new ClassLink(null,startClass,Direction.both,0);
         List<LinkAndPath> lp = new LinkedList<LinkAndPath>();
         lp.add(new LinkAndPath(crrLink, new LinkedList<ClassLink>()));

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

@@ -4 +4 @@
 
 /**
- * 襍ｷ轤ｹ縺ｨ縺ｪ繧九Μ繧ｽ繝ｼ繧ｹ縺九ｉ騾先ｬ｡逧?↓隍?焚繝ｪ繝ｳ繧ｯ縺ｧ邨らせ繝ｪ繧ｽ繝ｼ繧ｹ縺ｾ縺ｧ謗･邯壹＆繧後ｋ荳?縺､縺ｮ繝代せ繧定ｨ倩ｿｰ縺吶ｋ
+ * 襍ｷ轤ｹ縺ｨ縺ｪ繧九Μ繧ｽ繝ｼ繧ｹ縺九ｉ騾先ｬ｡�ｽ?�ｽ�ｽ�ｽ?�ｽ�ｽ繝ｪ繝ｳ繧ｯ縺ｧ邨らせ繝ｪ繧ｽ繝ｼ繧ｹ縺ｾ縺ｧ謗･邯壹＆繧後ｋ�ｽ?縺､縺ｮ繝代せ繧定ｨ倩ｿｰ縺吶ｋ
  * @author Yamaguchi
  * @since 28.01.2014
@@ -15 +15 @@
          */
         private String startClass;
+        private int width;
 
         /**
-         * 繝代せ縺ｮ襍ｷ轤ｹ縺九ｉ邨らせ縺ｫ蜷代°縺｣縺ｦ騾先ｬ｡逧?↓縺､縺ｪ縺後ｋ繧ｯ繝ｩ繧ｹ髢薙Μ繝ｳ繧ｯ縺ｮ繝ｪ繧ｹ繝?
+         * 繝代せ縺ｮ襍ｷ轤ｹ縺九ｉ邨らせ縺ｫ蜷代°縺｣縺ｦ騾先ｬ｡�ｽ?�ｽ�ｽ縺､縺ｪ縺後ｋ繧ｯ繝ｩ繧ｹ髢薙Μ繝ｳ繧ｯ縺ｮ繝ｪ繧ｹ�ｽ?
          */
         private List<ClassLink> classLinks;
@@ -41 +42 @@
         }       
         
+        public int getWidth(){
+                return width;
+        }       
+        
         public Path(){}
         
-        public Path(String startClass, List<ClassLink> classLinks){
+        public Path(String startClass, List<ClassLink> classLinks, int width){
                 this.startClass = startClass;
                 this.classLinks = classLinks;
+                this.width = width;
         }
         
@@ -55 +61 @@
                 this.classLinks = classLinks;
         }
+        
+        public void setWidth(int width){
+            this.width = width;
+        }
         
 }