From: <tho...@us...> - 2010-11-10 19:41:12
|
Revision: 3925 http://bigdata.svn.sourceforge.net/bigdata/?rev=3925&view=rev Author: thompsonbry Date: 2010-11-10 19:41:05 +0000 (Wed, 10 Nov 2010) Log Message: ----------- It appears that somewhere along the line we modified things such that the LUBM ontology is not being loaded during the two unit tests which are supposed to load the LUBM U1 data set. I've modified the test harness to load the ontology as well, but now an exception is getting thrown out of the logic which verifies that the inferences were computed correctly. I suspect that one of the chunk converters is not properly triming a chunk such that it has some null elements in the array. I've commented out the lines which actually cause the ontology file to be loaded for the moment. Look for "FIXME Ontology not loaded?!?" in the source file. Modified Paths: -------------- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java 2010-11-10 14:01:26 UTC (rev 3924) +++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java 2010-11-10 19:41:05 UTC (rev 3925) @@ -10,6 +10,9 @@ import java.io.FilenameFilter; import java.io.InputStream; import java.net.URLEncoder; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; import java.util.Properties; import org.openrdf.model.Statement; @@ -24,6 +27,7 @@ import com.bigdata.rdf.axioms.NoAxioms; import com.bigdata.rdf.axioms.RdfsAxioms; +import com.bigdata.rdf.inf.ClosureStats; import com.bigdata.rdf.model.BigdataURI; import com.bigdata.rdf.model.BigdataValueFactory; import com.bigdata.rdf.rio.StatementBuffer; @@ -397,14 +401,20 @@ public void test_fixedPoint_LUBM_U1_As_Full_PipelineJoins() throws Exception { - final String[] resources = readFiles(new File( - "bigdata-rdf/src/resources/data/lehigh/U1"), - new FilenameFilter() { - public boolean accept(File dir, String name) { - return name.endsWith(".owl"); - } - }); + final String[] dataFiles = readFiles(new File( + "bigdata-rdf/src/resources/data/lehigh/U1"), + new FilenameFilter() { + public boolean accept(File dir, String name) { + return name.endsWith(".owl"); + } + }); + // And add in the ontology. + final List<String> tmp = new LinkedList<String>(); +// tmp.add("bigdata-rdf/src/resources/data/lehigh/univ-bench.owl"); FIXME Ontology not loaded?!? + tmp.addAll(Arrays.asList(dataFiles)); + final String[] resources = tmp.toArray(new String[tmp.size()]); + final Properties properties = getProperties(FullClosure.class, false/* nestedSubquery */); final AbstractTripleStore store = getStore(properties); @@ -448,13 +458,19 @@ public void test_fixedPoint_LUBM_U1_As_Fast_PipelineJoins() throws Exception { - final String[] resources = readFiles(new File("bigdata-rdf/src/resources/data/lehigh/U1"), + final String[] dataFiles = readFiles(new File("bigdata-rdf/src/resources/data/lehigh/U1"), new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".owl"); } }); + // And add in the ontology. + final List<String> tmp = new LinkedList<String>(); +// tmp.add("bigdata-rdf/src/resources/data/lehigh/univ-bench.owl"); FIXME Ontology not loaded?!? + tmp.addAll(Arrays.asList(dataFiles)); + final String[] resources = tmp.toArray(new String[tmp.size()]); + final Properties properties = getProperties(FastClosure.class, false/* nestedSubquery */); final AbstractTripleStore store = getStore(properties); @@ -770,9 +786,13 @@ * by the proxy test case otherwise which does not give you much * control). */ - closureStore.getInferenceEngine() + final ClosureStats closureStats = closureStore.getInferenceEngine() .computeClosure(null/* focusStore */); + if(log.isInfoEnabled()) + log.info(closureStats.toString()); +// System.err.println("*** "+closureStats.toString()); + if (log.isDebugEnabled()) { log.debug("\nclosure:\n" + closureStore.dumpStore()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrp...@us...> - 2010-11-10 21:11:59
|
Revision: 3927 http://bigdata.svn.sourceforge.net/bigdata/?rev=3927&view=rev Author: mrpersonick Date: 2010-11-10 21:11:53 +0000 (Wed, 10 Nov 2010) Log Message: ----------- fixed the LUBM closure test to add the ontology (no bnodes version) Modified Paths: -------------- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java =================================================================== --- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java 2010-11-10 21:10:16 UTC (rev 3926) +++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestDatabaseAtOnceClosure.java 2010-11-10 21:11:53 UTC (rev 3927) @@ -411,7 +411,7 @@ // And add in the ontology. final List<String> tmp = new LinkedList<String>(); -// tmp.add("bigdata-rdf/src/resources/data/lehigh/univ-bench.owl"); FIXME Ontology not loaded?!? + tmp.add("bigdata-rdf/src/resources/data/lehigh/univ-bench-modified-no-bnodes.owl"); tmp.addAll(Arrays.asList(dataFiles)); final String[] resources = tmp.toArray(new String[tmp.size()]); @@ -467,7 +467,7 @@ // And add in the ontology. final List<String> tmp = new LinkedList<String>(); -// tmp.add("bigdata-rdf/src/resources/data/lehigh/univ-bench.owl"); FIXME Ontology not loaded?!? + tmp.add("bigdata-rdf/src/resources/data/lehigh/univ-bench-modified-no-bnodes.owl"); tmp.addAll(Arrays.asList(dataFiles)); final String[] resources = tmp.toArray(new String[tmp.size()]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |