You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/06/16 11:28:56 UTC
svn commit: r1493480 - in /jena/trunk/jena-arq/src:
main/java/org/apache/jena/riot/lang/LangTriG.java
test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
Author: andy
Date: Sun Jun 16 09:28:56 2013
New Revision: 1493480
URL: http://svn.apache.org/r1493480
Log:
Adjust to TriG chanage in draft spec (trailing DOT not needed inside {}).
Use quad isomorphism checker only.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java?rev=1493480&r1=1493479&r2=1493480&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java Sun Jun 16 09:28:56 2013
@@ -148,24 +148,22 @@ public class LangTriG extends LangTurtle
protected void expectEndOfTriples()
{
// The DOT is required by Turtle (strictly).
- // It is not in N3 and SPARQL.
+ // It is not in N3 and SPARQL or TriG
- // No trailing DOT is allowed by strict TriG.
- if ( profile.isStrictMode() )
- {
- expect("Triples not terminated by DOT", DOT) ;
- return ;
- }
+// // To make trailing DOT illegal in strict TriG.
+// if ( profile.isStrictMode() ) {
+// expect("Triples not terminated by DOT", DOT) ;
+// return ;
+// }
- if ( lookingAt(DOT) )
- {
+ if ( lookingAt(DOT) ) {
nextToken() ;
return ;
}
// Loose - DOT optional.
if ( lookingAt(RBRACE) )
- // Don't consume the RBRACE
+ // Don't consume the RBRACE - used to break the loop of triples blocks.
return ;
exception(peekToken(), "Triples not terminated properly: expected '.', '}' or EOF: got %s", peekToken()) ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java?rev=1493480&r1=1493479&r2=1493480&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java Sun Jun 16 09:28:56 2013
@@ -18,17 +18,12 @@
package org.apache.jena.riot.langsuite;
-import java.util.List ;
-
-import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.common.IsoMatcher ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.RiotException ;
-import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
@@ -110,38 +105,32 @@ public class UnitTestEval extends LangTe
throw ex ; }
}
- // Imperfect.
private boolean isomorphic(DatasetGraph dsg1, DatasetGraph dsg2) {
- boolean b1 = isomorphicX(dsg1, dsg2) ;
- boolean b2 = IsoMatcher.isomorphic(dsg1, dsg2) ;
- if ( b1 != b2 )
- System.out.println("Unequal isomorphisms") ;
- return b2 ;
+ return IsoMatcher.isomorphic(dsg1, dsg2) ;
}
-
- private boolean isomorphicX(DatasetGraph dsg1, DatasetGraph dsg2) {
- {
- Graph g1 = dsg1.getDefaultGraph() ;
- Graph g2 = dsg2.getDefaultGraph() ;
- boolean b = g1.isIsomorphicWith(g2) ;
- if ( !b ) return false ;
- }
- List<Node> names1 = Iter.toList(dsg1.listGraphNodes()) ;
- List<Node> names2 = Iter.toList(dsg2.listGraphNodes()) ;
- if ( names1.size() != names2.size() )
- return false ;
-
- for ( Node gn : names1 ) {
- Graph g1 = dsg1.getGraph(gn) ;
- Graph g2 = dsg2.getGraph(gn) ;
- if ( g1 == null || g2 == null )
- return false ;
- boolean b = g1.isIsomorphicWith(g2) ;
- if ( !b ) return false ;
- }
- return true ;
- }
-
+
+// private boolean isomorphicX(DatasetGraph dsg1, DatasetGraph dsg2) {
+// {
+// Graph g1 = dsg1.getDefaultGraph() ;
+// Graph g2 = dsg2.getDefaultGraph() ;
+// boolean b = g1.isIsomorphicWith(g2) ;
+// if ( !b ) return false ;
+// }
+// List<Node> names1 = Iter.toList(dsg1.listGraphNodes()) ;
+// List<Node> names2 = Iter.toList(dsg2.listGraphNodes()) ;
+// if ( names1.size() != names2.size() )
+// return false ;
+//
+// for ( Node gn : names1 ) {
+// Graph g1 = dsg1.getGraph(gn) ;
+// Graph g2 = dsg2.getGraph(gn) ;
+// if ( g1 == null || g2 == null )
+// return false ;
+// boolean b = g1.isIsomorphicWith(g2) ;
+// if ( !b ) return false ;
+// }
+// return true ;
+// }
// Triples test.
private void run3() {