チェンジセット 173 : SPARQLBuilderWWW/src/java/org

更新日時:

2014/09/26 10:09:41 (10 年 前)

更新者:

atsuko

ログメッセージ:

bug fix

パス:

SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL

ファイル:

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

SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/AcquiredStructureAnalyzer.java

@@ -35 +35 @@
         
         public static void main(String[] args) throws Exception{
-                JenaModelGenerator jmGene = new JenaModelGenerator("c:\\temp\\reactomeF18s.ttl");
+
+                JenaModelGenerator jmGene = new JenaModelGenerator("c:\\temp\\biosamplesF11.ttl");
+//              JenaModelGenerator jmGene = new JenaModelGenerator("c:\\temp\\reactomeF18s.ttl");
                 AcquiredStructureAnalyzer impl 
                         = new AcquiredStructureAnalyzer(jmGene.getEndpointURI(), jmGene.getGraphURIs(), jmGene.getModel());
-//              System.out.println("--------------------------");
-//              SClass[] scs = impl.getOWLClasses(null, null, null, true);
-//              System.out.println("list classes:---------------");
-//              for(SClass sc: scs){
-//                      System.out.println(sc.toString());
+
+                System.out.println("--------------------------");
+                SClass[] scs = impl.getOWLClasses(null, null, null, true);
+                System.out.println("list classes:---------------");
+                for(SClass sc: scs){
+                        System.out.println(sc.toString());
+                }
+                System.out.println("--------------------------");
+                
+//              ClassLink[] cls = impl.getNextClass(null,"http://www.biopax.org/release/biopax-level3.owl#Protein",100,true );
+//              for(ClassLink cl: cls){
+//                      System.out.println(cl.toString());
 //              }
 //              System.out.println("--------------------------");
-                
-                ClassLink[] cls = impl.getNextClass(null,"http://www.biopax.org/release/biopax-level3.owl#Protein",100,true );
-                for(ClassLink cl: cls){
-                        System.out.println(cl.toString());
-                }
-                System.out.println("--------------------------");
                 
         }
@@ -217 +220 @@
                 queryStr.append(" {");
                 queryStr.append(" ?cr <").append(URICollection.PROPERTY_SB_OBJECT_CLASS).append("> <" + originClass + ">. \n");
-                queryStr.append(" ?cr <").append(URICollection.PROPERTY_SB_SUBJECT_CLASS).append("> ?d. \n");
+                queryStr.append(" ?cr <").append(URICollection.PROPERTY_SB_SUBJECT_CLASS).append("> ?c. \n");
                 queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_DISTINCT_SUBJECTS).append("> ?numLnkInsEnd. \n");
                 queryStr.append(" ?cr <").append(URICollection.PROPERTY_VOID_DISTINCT_OBJECTS).append("> ?numLnkInsStart. \n");
@@ -277 +280 @@
                                 if(ccls != null && dcls == null ){
                                         // direction forward
-                                        direction = Direction.forward;
+                                        direction = Direction.reverse;
                                         clsURI = ccls.getURI();
                                 }else{
                                         if( ccls == null && dcls != null ){
-                                                direction = Direction.reverse;
+                                                direction = Direction.forward;
                                                 clsURI = dcls.getURI();
                                         }else{

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

@@ -26 +26 @@
         ClassLink classLink;
         List<ClassLink> path;
-        boolean converge;
+        //boolean converge;
         
         public LinkAndPath(ClassLink classLink, List<ClassLink> path){
            this.classLink = classLink;
            this.path = path;
-           this.converge = false;
-        }
-        
-        public LinkAndPath(ClassLink classLink, List<ClassLink> path, String originalClassURI, boolean converge){
+           //this.converge = false;
+        }
+        
+        public LinkAndPath(ClassLink classLink, List<ClassLink> path, String originalClassURI){
            this.classLink = classLink;
            this.path = path;
            this.originalClassURI = originalClassURI;
-           this.converge = converge;
+           //this.converge = converge;
         }
     }
@@ -87 +87 @@
         List<List<ClassLink>> paths = new ArrayList<>();
         List<LinkAndPath> lp = new LinkedList<>();
-        lp.add(new LinkAndPath(new ClassLink("",startClass,null,Direction.both,0,0,0,0,0,false,false), new LinkedList<ClassLink>(), "", false));
+        lp.add(new LinkAndPath(new ClassLink("",startClass,null,Direction.both,0,0,0,0,0,false,false), new LinkedList<ClassLink>(), ""));
         try{
           for ( int i = 0; i < nsteps; i++ ){
@@ -94 +94 @@
               while ( lit.hasNext() ){
                   LinkAndPath crrlp = lit.next();
+                  /*if ( crrlp.classLink.getLinkedClassURI().equals("http://www.biopax.org/release/biopax-level3.owl#Pathway") ){
+                      System.out.println("here!");
+                  }*/
                   ClassLink[] classLinks = rdfsa.getNextClass(null, crrlp.classLink.getLinkedClassURI(), limit, countLinks);
                   for ( int j = 0 ; j < classLinks.length; j++ ){
+                      /*if ( classLinks[j].getLinkedClassURI().endsWith("http://www.biopax.org/release/biopax-level3.owl#BiochemicalReaction") ){
+                          ClassLink cltmp = classLinks[j];
+                      }*/
                       List<ClassLink> crrpath = new LinkedList<>(crrlp.path);
                       crrpath.add(classLinks[j]);
@@ -118 +124 @@
                           }
                       }
-                      
-                      nextlp.add(new LinkAndPath(classLinks[j], crrpath, crrlp.classLink.getLinkedClassURI(), false));
+                      /*
+                      if ( classLinks[j].getDirection() != Direction.reverse ){
+                         System.out.println("here b"); 
+                      }*/
+
+                      nextlp.add(new LinkAndPath(classLinks[j], crrpath, crrlp.classLink.getLinkedClassURI()));
                   }
               }