-
Notifications
You must be signed in to change notification settings - Fork 28
Formats outside @require + Package extensions #51
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c655409
Formats outside @require
filchristou c55f3ef
Use package extensions
filchristou c16e854
Merge branch 'master' into pr/filchristou/51
gdalle 2f3b247
Add Aqua and JuliaFormatter
gdalle 4937eb7
Fix Requires
gdalle aac60e6
Typos in README and Aqua test
gdalle File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,9 @@ jobs: | |
| fail-fast: false | ||
| matrix: | ||
| version: | ||
| - '1' | ||
| - '1.6' | ||
| - '1.9' | ||
| - 'nightly' | ||
| os: | ||
| - ubuntu-latest | ||
| arch: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| module GraphIODOTExt | ||
|
|
||
| using Graphs | ||
| import Graphs: loadgraph, loadgraphs, savegraph | ||
|
|
||
| @static if isdefined(Base, :get_extension) | ||
| using GraphIO | ||
| using ParserCombinator | ||
| import GraphIO.DOT.DOTFormat | ||
| else # not required for julia >= v1.9 | ||
| using ..GraphIO | ||
| using ..ParserCombinator | ||
| import ..GraphIO.DOT.DOTFormat | ||
| end | ||
|
|
||
|
|
||
| function savedot(io::IO, g::AbstractGraph, gname::String = "") | ||
| isdir = is_directed(g) | ||
| println(io,(isdir ? "digraph " : "graph ") * gname * " {") | ||
| for i in vertices(g) | ||
| println(io,"\t" * string(i)) | ||
| end | ||
| if isdir | ||
| for u in vertices(g) | ||
| out_nbrs = outneighbors(g, u) | ||
| length(out_nbrs) == 0 && continue | ||
| println(io, "\t" * string(u) * " -> {" * join(out_nbrs,',') * "}") | ||
| end | ||
| else | ||
| for e in edges(g) | ||
| source = string(src(e)) | ||
| dest = string(dst(e)) | ||
| println(io, "\t" * source * " -- " * dest) | ||
| end | ||
| end | ||
| println(io,"}") | ||
| return 1 | ||
| end | ||
|
|
||
| function savedot_mult(io::IO, graphs::Dict) | ||
| ng = 0 | ||
| for (gname, g) in graphs | ||
| ng += savedot(io, g, gname) | ||
| end | ||
| return ng | ||
| end | ||
|
|
||
| function _dot_read_one_graph(pg::Parsers.DOT.Graph) | ||
| isdir = pg.directed | ||
| nvg = length(Parsers.DOT.nodes(pg)) | ||
| nodedict = Dict(zip(collect(Parsers.DOT.nodes(pg)), 1:nvg)) | ||
| if isdir | ||
| g = DiGraph(nvg) | ||
| else | ||
| g = Graph(nvg) | ||
| end | ||
| for es in Parsers.DOT.edges(pg) | ||
| s = nodedict[es[1]] | ||
| d = nodedict[es[2]] | ||
| add_edge!(g, s, d) | ||
| end | ||
| return g | ||
| end | ||
|
|
||
| _name(pg::Parsers.DOT.Graph) = | ||
| pg.id !== nothing ? pg.id.id : | ||
| Parsers.DOT.StringID(pg.directed ? "digraph" : "graph") | ||
|
|
||
| function loaddot(io::IO, gname::String) | ||
| p = Parsers.DOT.parse_dot(read(io, String)) | ||
| for pg in p | ||
| _name(pg) == gname && return _dot_read_one_graph(pg) | ||
| end | ||
| error("Graph $gname not found") | ||
| end | ||
|
|
||
| function loaddot_mult(io::IO) | ||
| p = Parsers.DOT.parse_dot(read(io, String)) | ||
| graphs = Dict{String,AbstractGraph}() | ||
|
|
||
| for pg in p | ||
| graphs[_name(pg)] = _dot_read_one_graph(pg) | ||
| end | ||
| return graphs | ||
| end | ||
|
|
||
| loadgraph(io::IO, gname::String, ::DOTFormat) = loaddot(io, gname) | ||
| loadgraphs(io::IO, ::DOTFormat) = loaddot_mult(io) | ||
| savegraph(io::IO, g::AbstractGraph, gname::String, ::DOTFormat) = savedot(io, g, gname) | ||
| savegraph(io::IO, d::Dict, ::DOTFormat) = savedot_mult(io, d) | ||
|
|
||
| end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| module GraphIOGEXFExt | ||
|
|
||
| using Graphs | ||
| import Graphs: loadgraph, loadgraphs, savegraph, AbstractGraph | ||
|
|
||
| @static if isdefined(Base, :get_extension) | ||
| using GraphIO | ||
| using EzXML | ||
| import GraphIO.GEXF.GEXFFormat | ||
| else # not required for julia >= v1.9 | ||
| using ..GraphIO | ||
| using ..EzXML | ||
| import ..GraphIO.GEXF.GEXFFormat | ||
| end | ||
|
|
||
|
|
||
| """ | ||
| savegexf(f, g, gname) | ||
|
|
||
| Write a graph `g` with name `gname` to an IO stream `io` in the | ||
| [Gexf](http://gexf.net/format/) format. Return 1 (number of graphs written). | ||
| """ | ||
| function savegexf(io::IO, g::AbstractGraph, gname::String) | ||
| xdoc = XMLDocument() | ||
| xroot = setroot!(xdoc, ElementNode("gexf")) | ||
| xroot["xmlns"] = "http://www.gexf.net/1.2draft" | ||
| xroot["version"] = "1.2" | ||
| xroot["xmlns:xsi"] = "http://www.w3.org/2001/XMLSchema-instance" | ||
| xroot["xsi:schemaLocation"] = "http://www.gexf.net/1.2draft/gexf.xsd" | ||
|
|
||
| xmeta = addelement!(xroot, "meta") | ||
| addelement!(xmeta, "description", gname) | ||
| xg = addelement!(xroot, "graph") | ||
| strdir = is_directed(g) ? "directed" : "undirected" | ||
| xg["defaultedgetype"] = strdir | ||
|
|
||
| xnodes = addelement!(xg, "nodes") | ||
| for i in 1:nv(g) | ||
| xv = addelement!(xnodes, "node") | ||
| xv["id"] = "$(i-1)" | ||
| end | ||
|
|
||
| xedges = addelement!(xg, "edges") | ||
| m = 0 | ||
| for e in edges(g) | ||
| xe = addelement!(xedges, "edge") | ||
| xe["id"] = "$m" | ||
| xe["source"] = "$(src(e)-1)" | ||
| xe["target"] = "$(dst(e)-1)" | ||
| m += 1 | ||
| end | ||
|
|
||
| prettyprint(io, xdoc) | ||
| return 1 | ||
| end | ||
|
|
||
| savegraph(io::IO, g::AbstractGraph, gname::String, ::GEXFFormat) = savegexf(io, g, gname) | ||
|
|
||
| end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| module GraphIOGMLExt | ||
|
|
||
| using Graphs | ||
| import Graphs: loadgraph, loadgraphs, savegraph | ||
|
|
||
| @static if isdefined(Base, :get_extension) | ||
| using GraphIO | ||
| using ParserCombinator | ||
| import GraphIO.GML.GMLFormat | ||
| else # not required for julia >= v1.9 | ||
| using ..GraphIO | ||
| using ..ParserCombinator | ||
| import ..GraphIO.GML.GMLFormat | ||
| end | ||
|
|
||
|
|
||
| function _gml_read_one_graph(gs, dir) | ||
| nodes = [x[:id] for x in gs[:node]] | ||
| if dir | ||
| g = DiGraph(length(nodes)) | ||
| else | ||
| g = Graph(length(nodes)) | ||
| end | ||
| mapping = Dict{Int,Int}() | ||
| for (i, n) in enumerate(nodes) | ||
| mapping[n] = i | ||
| end | ||
| sds = [(Int(x[:source]), Int(x[:target])) for x in gs[:edge]] | ||
| for (s, d) in (sds) | ||
| add_edge!(g, mapping[s], mapping[d]) | ||
| end | ||
| return g | ||
| end | ||
|
|
||
| function loadgml(io::IO, gname::String) | ||
| p = Parsers.GML.parse_dict(read(io, String)) | ||
| for gs in p[:graph] | ||
| dir = Bool(get(gs, :directed, 0)) | ||
| graphname = get(gs, :label, dir ? "digraph" : "graph") | ||
|
|
||
| (gname == graphname) && return _gml_read_one_graph(gs, dir) | ||
| end | ||
| error("Graph $gname not found") | ||
| end | ||
|
|
||
| function loadgml_mult(io::IO) | ||
| p = Parsers.GML.parse_dict(read(io, String)) | ||
| graphs = Dict{String,AbstractGraph}() | ||
| for gs in p[:graph] | ||
| dir = Bool(get(gs, :directed, 0)) | ||
| graphname = get(gs, :label, dir ? "digraph" : "graph") | ||
| graphs[graphname] = _gml_read_one_graph(gs, dir) | ||
| end | ||
| return graphs | ||
| end | ||
|
|
||
| """ | ||
| savegml(f, g, gname="graph") | ||
|
|
||
| Write a graph `g` with name `gname` to an IO stream `io` in the | ||
| [GML](https://en.wikipedia.org/wiki/Graph_Modelling_Language) format. Return 1. | ||
| """ | ||
| function savegml(io::IO, g::AbstractGraph, gname::String = "") | ||
| println(io, "graph") | ||
| println(io, "[") | ||
| length(gname) > 0 && println(io, "label \"$gname\"") | ||
| is_directed(g) && println(io, "directed 1") | ||
| for i = 1:nv(g) | ||
| println(io, "\tnode") | ||
| println(io, "\t[") | ||
| println(io, "\t\tid $i") | ||
| println(io, "\t]") | ||
| end | ||
| for e in edges(g) | ||
| s, t = Tuple(e) | ||
| println(io, "\tedge") | ||
| println(io, "\t[") | ||
| println(io, "\t\tsource $s") | ||
| println(io, "\t\ttarget $t") | ||
| println(io, "\t]") | ||
| end | ||
| println(io, "]") | ||
| return 1 | ||
| end | ||
|
|
||
|
|
||
| """ | ||
| savegml_mult(io, graphs) | ||
| Write a dictionary of (name=>graph) to an IO stream `io` Return number of graphs written. | ||
| """ | ||
| function savegml_mult(io::IO, graphs::Dict) | ||
| ng = 0 | ||
| for (gname, g) in graphs | ||
| ng += savegml(io, g, gname) | ||
| end | ||
| return ng | ||
| end | ||
| loadgraph(io::IO, gname::String, ::GMLFormat) = loadgml(io, gname) | ||
| loadgraphs(io::IO, ::GMLFormat) = loadgml_mult(io) | ||
| savegraph(io::IO, g::AbstractGraph, gname::String, ::GMLFormat) = savegml(io, g, gname) | ||
| savegraph(io::IO, d::Dict, ::GMLFormat) = savegml_mult(io, d) | ||
|
|
||
| end |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.