[Bigdata-commit] SF.net SVN: bigdata:[3695] branches/QUADS_QUERY_BRANCH/bigdata

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

Revision: 3695
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3695&view=rev
Author:   thompsonbry
Date:     2010-09-30 14:56:57 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
Fixed problem with SolutionFilter where it was failing to resolve the solution to the ISPO.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/eval/SolutionFilter.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleRdfs04.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/eval/SolutionFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/eval/SolutionFilter.java	2010-09-30 14:54:59 UTC (rev 3694)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/eval/SolutionFilter.java	2010-09-30 14:56:57 UTC (rev 3695)
@@ -27,17 +27,15 @@
         
     }
 
-    public boolean isValid(final Object o) {
+    @SuppressWarnings("unchecked")
+	public boolean isValid(final Object o) {
         
-        return delegate.isValid(o);
+		final E e = ((ISolution<E>) o).get();
+
+		return delegate.isValid(e);
         
     }
 
-    /*
-     * Note: The old implementation is below. Based on it, the canAccept()
-     * method was not (and still is not) being invoked for SolutionFilter.
-     */
-    
 //    public boolean accept(final ISolution<E> solution) {
 //
 //        final E e = solution.get();

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleRdfs04.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleRdfs04.java	2010-09-30 14:54:59 UTC (rev 3694)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/test/com/bigdata/rdf/rules/TestRuleRdfs04.java	2010-09-30 14:56:57 UTC (rev 3695)
@@ -230,7 +230,7 @@
                     .getAxioms(), true/* forwardChainRdfTypeRdfsResource */);
             
             applyRule(store, r, filter/*, false /*justified*/,
-                    -1/* solutionCount */, 0/* mutationCount*/);
+                    0/* solutionCount */, 0/* mutationCount*/);
 
             /*
              * validate the state of the primary store - there is no entailment


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.