[cweb-CVS] bigdata-rdf/src/test/com/bigdata/rdf/metrics TestReferenceLoad.java, 1.1, 1.2 TestMetrics.java, 1.4, 1.5 TaskATest.java, 1.2, 1.3

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

Update of /cvsroot/cweb/bigdata-rdf/src/test/com/bigdata/rdf/metrics
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22601/src/test/com/bigdata/rdf/metrics

Modified Files:
	TestReferenceLoad.java TestMetrics.java TaskATest.java 
Log Message:
testing SAIL and lubm, including adding BTree#removeAll(), touching up some inferences, making it possible to load different RDF interchange formats, and adding JOIN ordering based on the sesame optimizer and the actual triple pattern selectivity in the data.

Index: TaskATest.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TaskATest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TaskATest.java	12 Apr 2007 23:59:22 -0000	1.2
--- TaskATest.java	18 Apr 2007 17:29:08 -0000	1.3
***************
*** 55,58 ****
--- 55,59 ----
  
  import org.openrdf.sesame.admin.UpdateException;
+ import org.openrdf.sesame.constants.RDFFormat;
  import org.openrdf.sesame.sail.RdfSchemaRepository;
  
***************
*** 281,285 ****
          for(int i=0; i<filename.length; i++) {
           
!             loadStats = store.loadData(new File(filename[i]), baseURI[i], true);
              
          }
--- 282,288 ----
          for(int i=0; i<filename.length; i++) {
           
!             loadStats = store
!                     .loadData(new File(filename[i]), baseURI[i],
!                             RDFFormat.RDFXML, false/* verifyData */, true/* commit */);
              
          }

Index: TestReferenceLoad.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TestReferenceLoad.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestReferenceLoad.java	6 Feb 2007 23:06:44 -0000	1.1
--- TestReferenceLoad.java	18 Apr 2007 17:29:08 -0000	1.2
***************
*** 51,54 ****
--- 51,56 ----
  import java.io.IOException;
  
+ import org.openrdf.sesame.constants.RDFFormat;
+ 
  /**
   * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
***************
*** 76,80 ****
          for(int i=0; i<files.length; i++) {
           
!             store.loadData(new File(files[i]),"");
              
          }
--- 78,83 ----
          for(int i=0; i<files.length; i++) {
           
!             store.loadData(new File(files[i]), "", RDFFormat.RDFXML,
!                     false/* verifyData */, false/*commit*/);
              
          }

Index: TestMetrics.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TestMetrics.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMetrics.java	29 Mar 2007 17:01:47 -0000	1.4
--- TestMetrics.java	18 Apr 2007 17:29:08 -0000	1.5
***************
*** 61,64 ****
--- 61,65 ----
  
  import org.CognitiveWeb.util.PropertyUtil;
+ import org.openrdf.sesame.constants.RDFFormat;
  
  import com.bigdata.rawstore.Bytes;
***************
*** 860,864 ****
              try {
                  
!                 loadStats = store.loadData(new File(file), "", true);
                  
  //                InputStream rdfStream = new BufferedInputStream(
--- 861,867 ----
              try {
                  
!                 loadStats = store
!                         .loadData(new File(file), "", RDFFormat.RDFXML,
!                                 false/* verifyData */, true/* commit */);
                  
  //                InputStream rdfStream = new BufferedInputStream(