Add ttl.Document equal.

0x51-dev · Oct 25, 2023 · 6e78aec · 6e78aec
1 parent b7218d4
commit 6e78aec
Show file tree

Hide file tree

Showing 16 changed files with 1,540 additions and 896 deletions.
diff --git a/internal/project/report.go b/internal/project/report.go
@@ -54,7 +54,7 @@ func (r *Report) AddTest(name string, outcome testsuite.OutcomeValue) {
  Result: testsuite.TestResult{
  Date: ttl.StringLiteral{
  Value: time.Now().In(time.UTC).Format("2006-01-02-0700"),
- DatatypeIRI: "xsd:date",
+ DatatypeIRI: &ttl.IRI{Prefixed: true, Value: "xsd:date"},
  },
  Outcome: outcome,
  },

diff --git a/internal/testsuite/report.go b/internal/testsuite/report.go
@@ -106,7 +106,7 @@ func (p Project) line() ttl.Statement {
  },
  {
  Verb: &ttl.IRI{Prefixed: true, Value: "doap:created"},
- ObjectList: []ttl.Object{&ttl.StringLiteral{Value: p.Created.Format("2006-01-02-0700"), DatatypeIRI: "xsd:date"}},
+ ObjectList: []ttl.Object{&ttl.StringLiteral{Value: p.Created.Format("2006-01-02-0700"), DatatypeIRI: &ttl.IRI{Prefixed: true, Value: "xsd:date"}}},
  },
  {
  Verb: &ttl.IRI{Prefixed: true, Value: "doap:programming-language"},

diff --git a/internal/testsuite/report_test.go b/internal/testsuite/report_test.go
@@ -15,7 +15,7 @@ func ExampleNewReport() {
  Result: testsuite.TestResult{
  Date: ttl.StringLiteral{
  Value: "2023-09-09+00:00",
- DatatypeIRI: "xsd:date",
+ DatatypeIRI: &ttl.IRI{Prefixed: true, Value: "xsd:date"},
  },
  Outcome: testsuite.Passed,
  },

diff --git a/nquads/doc.go b/nquads/doc.go
@@ -6,6 +6,8 @@ import (
  nt "github.com/0x51-dev/rdf/ntriples"
  "github.com/0x51-dev/upeg/parser"
  "github.com/0x51-dev/upeg/parser/op"
+ "slices"
+ "sort"
  "strings"
 )
 
@@ -47,15 +49,16 @@ func parseDocument(n *parser.Node) (Document, error) {
  if n.Name != "Document" {
  return nil, fmt.Errorf("document: unknown %s", n.Name)
  }
- var quads []Quad
+ var document Document
  for _, n := range n.Children() {
  quad, err := ParseQuad(n)
  if err != nil {
  return nil, err
  }
- quads = append(quads, *quad)
+ document = append(document, *quad)
  }
- return quads, nil
+ sort.Sort(document)
+ return document, nil
 }
 
 func (d Document) Equal(other Document) bool {
@@ -75,14 +78,57 @@ func (d Document) Equal(other Document) bool {
  return true
 }
 
-func (d Document) Graphs() map[nt.Subject]nt.Document {
- g := make(map[nt.Subject]nt.Document)
+func (d Document) Graphs() map[string]nt.Document {
+ g := make(map[string]nt.Document)
  for _, q := range d {
- g[q.GraphLabel] = append(g[q.GraphLabel], q.Triple)
+ var graphLabel string
+ if q.GraphLabel != nil {
+ graphLabel = q.GraphLabel.String()
+ }
+ g[graphLabel] = append(g[graphLabel], q.Triple)
  }
  return g
 }
 
+func (d Document) Len() int {
+ return len(d)
+}
+
+func (d Document) Less(i, j int) bool {
+ if d[i].GraphLabel == nil && d[j].GraphLabel != nil {
+ return true
+ } else if d[i].GraphLabel != nil && d[j].GraphLabel == nil {
+ return false
+ }
+ return d[i].String() < d[j].String()
+}
+
+func (d Document) NormalizeBlankNodes() Document {
+ var keys []nt.Subject
+ for _, v := range d {
+ if !slices.Contains(keys, v.GraphLabel) {
+ keys = append(keys, v.GraphLabel)
+ }
+ }
+
+ g := d.Graphs()
+ var document Document
+ for _, k := range keys {
+ var key string
+ if k != nil {
+ key = k.String()
+ }
+ v := g[key].NormalizeBlankNodes()
+ for _, t := range v {
+ document = append(document, Quad{
+ Triple: t,
+ GraphLabel: k,
+ })
+ }
+ }
+ return document
+}
+
 func (d Document) String() string {
  var s string
  for _, q := range d {
@@ -91,6 +137,10 @@ func (d Document) String() string {
  return s
 }
 
+func (d Document) Swap(i, j int) {
+ d[i], d[j] = d[j], d[i]
+}
+
 type Quad struct {
  nt.Triple
  GraphLabel nt.Subject

diff --git a/nquads/doc_test.go b/nquads/doc_test.go
@@ -47,7 +47,7 @@ func TestDocument_Equal(t *testing.T) {
  nt.Triple{
  Subject: a,
  Predicate: b,
- Object: nt.BlankNode("_:b1"),
+ Object: nt.BlankNode("b1"),
  }, nil,
  ),
  }
@@ -59,7 +59,7 @@ func TestDocument_Equal(t *testing.T) {
  nt.Triple{
  Subject: a,
  Predicate: b,
- Object: nt.BlankNode("_:b2"),
+ Object: nt.BlankNode("b2"),
  }, nil,
  ),
  }) {
@@ -70,7 +70,7 @@ func TestDocument_Equal(t *testing.T) {
  nt.Triple{
  Subject: a,
  Predicate: b,
- Object: nt.BlankNode("_:b3"),
+ Object: nt.BlankNode("b1"),
  }, nt.IRIReference("https://example.com/g"), // Different graph.
  ),
  }) {
@@ -96,12 +96,12 @@ func TestExamples(t *testing.T) {
  }
 
  { // fmt.Stringer
- doc, err := nq.ParseDocument(doc.String())
+ doc2, err := nq.ParseDocument(doc.String())
  if err != nil {
  t.Fatal(err)
  }
- if len(doc) != test.quads {
- t.Error(len(doc))
+ if !doc.Equal(doc2) {
+ t.Error(doc, doc2)
  }
  }
  }
@@ -135,7 +135,7 @@ func TestSuite(t *testing.T) {
  report.AddTest(e.Name, testsuite.Failed)
  t.Fatal(err)
  }
- if len(doc) != len(doc2) {
+ if !doc.Equal(doc2) {
  report.AddTest(e.Name, testsuite.Failed)
  t.Fatal(len(doc), len(doc2))
  }