[cweb-CVS] bigdata-rdf/src/java/com/bigdata/rdf/inf InferenceEngine.java, 1.15, 1.16 RuleRdfs09.java, 1.6, 1.7 AbstractRuleRdfs_2_3_7_9.java, 1.1, 1.2

[Bryan T. <tho...@us...>]

Update of /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16041/src/java/com/bigdata/rdf/inf

Modified Files:
	InferenceEngine.java RuleRdfs09.java 
	AbstractRuleRdfs_2_3_7_9.java 
Log Message:
Updated the IDataService interface and now have client talking over JERI to a data service instance for various btree operations, range count, and range query.

Index: RuleRdfs09.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf/RuleRdfs09.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RuleRdfs09.java	19 Apr 2007 19:13:45 -0000	1.6
--- RuleRdfs09.java	20 Apr 2007 16:36:36 -0000	1.7
***************
*** 67,73 ****
      
      /**
!      * Overriden to be two bound (more selective), but otherwise also returning
!      * data in POS order. The query is formed from triple(?v,rdf:type,stmt1.s)
!      * and expressed in POS order as { rdf:type, stmt1.s, ?v }.
       */
      protected SPO[] getStmts2( SPO stmt1 ) {
--- 67,74 ----
      
      /**
!      * Overriden to be two bound (more selective, but also joining stmt1.s to
!      * stmt2.o rather than to stmt2.p) and also returning data in POS order. The
!      * query is formed from triple(?v,rdf:type,stmt1.s) and expressed in POS
!      * order as { rdf:type, stmt1.s, ?v }.
       */
      protected SPO[] getStmts2( SPO stmt1 ) {

Index: InferenceEngine.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf/InferenceEngine.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** InferenceEngine.java	18 Apr 2007 17:29:07 -0000	1.15
--- InferenceEngine.java	20 Apr 2007 16:36:36 -0000	1.16
***************
*** 551,555 ****
       * @param itr
       *            The key scan iterator.
!      *            
       * @return The objects visited by that iterator.
       */
--- 551,555 ----
       * @param itr
       *            The key scan iterator.
!      * 
       * @return The objects visited by that iterator.
       */

Index: AbstractRuleRdfs_2_3_7_9.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/inf/AbstractRuleRdfs_2_3_7_9.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractRuleRdfs_2_3_7_9.java	18 Apr 2007 17:29:07 -0000	1.1
--- AbstractRuleRdfs_2_3_7_9.java	20 Apr 2007 16:36:36 -0000	1.2
***************
*** 184,187 ****
--- 184,197 ----
      }
      
+     /**
+      * Builds the entailed triple from the matched triples.
+      * 
+      * @param stmt1
+      *            The match on the 1st triple pattern.
+      * @param stmt2
+      *            The match on the 2nd triple pattern.
+      *            
+      * @return The entailed triple.
+      */
      protected abstract SPO buildStmt3( SPO stmt1, SPO stmt2 );