package/gonum
1
0
Fork 0
mirror of https://github.com/gonum/gonum.git synced 2025-10-29 09:42:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gexf12: make slice fields plural and break words apart

Browse Source
This commit is contained in:
Dan Kortschak
2018-10-13 16:50:58 +10:30
committed by Dan Kortschak
parent 406984d374
commit 056846ef7e
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
graph/formats/gexf12/gexf.go
View File

@@ -67,9 +67,9 @@ type Graph struct {
// TimeFormat may be one of "integer", "double", "date" or "dateTime". // TimeFormat may be one of "integer", "double", "date" or "dateTime".
TimeFormat string `xml:"timeformat,attr,omitempty"` TimeFormat string `xml:"timeformat,attr,omitempty"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
// DefaultEdgeType may be one of "directed", "undirected" or "mutual". // DefaultEdgeType may be one of "directed", "undirected" or "mutual".
DefaultEdgeType string `xml:"defaultedgetype,attr,omitempty"` DefaultEdgeType string `xml:"defaultedgetype,attr,omitempty"`
// IDType may be one of "integer" or "string". // IDType may be one of "integer" or "string".
@@ -87,9 +87,9 @@ type Attributes struct {
// Mode may be "static" or "dynamic". // Mode may be "static" or "dynamic".
Mode string `xml:"mode,attr,omitempty"` Mode string `xml:"mode,attr,omitempty"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
} }
// Attribute holds a single graph attribute. // Attribute holds a single graph attribute.
@@ -124,9 +124,9 @@ type Node struct {
Size *Size `xml:"http://www.gexf.net/1.2draft/viz size"` Size *Size `xml:"http://www.gexf.net/1.2draft/viz size"`
Shape *NodeShape `xml:"http://www.gexf.net/1.2draft/viz shape"` Shape *NodeShape `xml:"http://www.gexf.net/1.2draft/viz shape"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
} }
// NodeShape holds the visual representation of a node with associated // NodeShape holds the visual representation of a node with associated
@@ -138,9 +138,9 @@ type NodeShape struct {
Shape string `xml:"value,attr"` Shape string `xml:"value,attr"`
URI string `xml:"uri,attr,omitempty"` URI string `xml:"uri,attr,omitempty"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
} }
// Color represents a node or edge color and its associated dynamics. // Color represents a node or edge color and its associated dynamics.
@@ -151,9 +151,9 @@ type Color struct {
B byte `xml:"b,attr"` B byte `xml:"b,attr"`
A float64 `xml:"a,attr,omitempty"` A float64 `xml:"a,attr,omitempty"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
} }
// Edges holds a collection of edges constituting a graph or subgraph. // Edges holds a collection of edges constituting a graph or subgraph.
@@ -171,9 +171,9 @@ type Edge struct {
Thickness *Thickness `xml:"http://www.gexf.net/1.2draft/viz thickness"` Thickness *Thickness `xml:"http://www.gexf.net/1.2draft/viz thickness"`
Shape *Edgeshape `xml:"http://www.gexf.net/1.2draft/viz shape"` Shape *Edgeshape `xml:"http://www.gexf.net/1.2draft/viz shape"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
// Type may be one of directed, undirected, mutual // Type may be one of directed, undirected, mutual
Type string `xml:"type,attr,omitempty"` Type string `xml:"type,attr,omitempty"`
Label string `xml:"label,attr,omitempty"` Label string `xml:"label,attr,omitempty"`
@@ -192,9 +192,9 @@ type AttValue struct {
For string `xml:"for,attr"` For string `xml:"for,attr"`
Value string `xml:"value,attr"` Value string `xml:"value,attr"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
} }
// EdgeShape holds the visual representation of an edge with associated // EdgeShape holds the visual representation of an edge with associated
@@ -204,15 +204,15 @@ type Edgeshape struct {
Shape string `xml:"value,attr"` Shape string `xml:"value,attr"`
Spells *Spells `xml:"spells,omitempty"` Spells *Spells `xml:"spells,omitempty"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
} }
// Parents holds parent relationships between nodes in a hierarchical // Parents holds parent relationships between nodes in a hierarchical
// graph. // graph.
type Parents struct { type Parents struct {
Parent []Parent `xml:"parent,omitempty"` Parents []Parent `xml:"parent,omitempty"`
} }
// Parent is a single parent relationship. // Parent is a single parent relationship.
@@ -227,9 +227,9 @@ type Position struct {
Z float64 `xml:"z,attr"` Z float64 `xml:"z,attr"`
Spells *Spells `xml:"spells,omitempty"` Spells *Spells `xml:"spells,omitempty"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
} }
// Size hold the visual size of a node and its dynamics. // Size hold the visual size of a node and its dynamics.
@@ -237,9 +237,9 @@ type Size struct {
Value float64 `xml:"value,attr"` Value float64 `xml:"value,attr"`
Spells *Spells `xml:"http://www.gexf.net/1.2draft/viz spells,omitempty"` Spells *Spells `xml:"http://www.gexf.net/1.2draft/viz spells,omitempty"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
} }
// Thickness hold the visual thickness of an edge and its dynamics. // Thickness hold the visual thickness of an edge and its dynamics.
@@ -247,22 +247,22 @@ type Thickness struct {
Value float64 `xml:"value,attr"` Value float64 `xml:"value,attr"`
Spells *Spells `xml:"http://www.gexf.net/1.2draft/viz spells,omitempty"` Spells *Spells `xml:"http://www.gexf.net/1.2draft/viz spells,omitempty"`
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
} }
// Spells holds a collection of time dynamics for a graph entity. // Spells holds a collection of time dynamics for a graph entity.
type Spells struct { type Spells struct {
Spell []Spell `xml:"spell"` Spells []Spell `xml:"spell"`
} }
// Spell is a time interval. // Spell is a time interval.
type Spell struct { type Spell struct {
Start string `xml:"start,attr,omitempty"` Start string `xml:"start,attr,omitempty"`
Startopen string `xml:"startopen,attr,omitempty"` StartOpen string `xml:"startopen,attr,omitempty"`
End string `xml:"end,attr,omitempty"` End string `xml:"end,attr,omitempty"`
Endopen string `xml:"endopen,attr,omitempty"` EndOpen string `xml:"endopen,attr,omitempty"`
} }
type xsdDate time.Time type xsdDate time.Time

2
graph/formats/gexf12/gexf_test.go
View File

@@ -351,7 +351,7 @@ var gexfExampleTests = []struct {
{ID: "a", Label: "cheese"}, {ID: "a", Label: "cheese"},
{ID: "b", Label: "cherry"}, {ID: "b", Label: "cherry"},
{ID: "c", Label: "cake", Parents: &Parents{ {ID: "c", Label: "cake", Parents: &Parents{
Parent: []Parent{ Parents: []Parent{
{For: "a"}, {For: "a"},
{For: "b"}, {For: "b"},
}, },