diff --git a/.VERSION b/.VERSION index 26ca59460..4cda8f19e 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -1.5.1 +1.5.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0721e6b27..00b563dad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ Wilf A. Wilson, Michael Young et al. Licensing information can be found in the `LICENSE` file. +## Version 1.5.2 (released 30/03/2022) + +This is a very minor release containing technical changes for maintaining compatibility with other GAP packages. + ## Version 1.5.1 (released 29/03/2022) This minor release contains several bugfixes and technical changes. This includes: diff --git a/PackageInfo.g b/PackageInfo.g index 3fe075a3c..37e49dcc5 100644 --- a/PackageInfo.g +++ b/PackageInfo.g @@ -9,14 +9,14 @@ ## ## <#GAPDoc Label="PKGVERSIONDATA"> -## +## ## ## ## ## ## ## -## +## ## ## <#/GAPDoc> @@ -28,8 +28,8 @@ _STANDREWSCS := Concatenation(["Jack Cole Building, North Haugh, ", SetPackageInfo(rec( PackageName := "Digraphs", Subtitle := "Graphs, digraphs, and multidigraphs in GAP", -Version := "1.5.1", -Date := "29/03/2022", # dd/mm/yyyy format +Version := "1.5.2", +Date := "30/03/2022", # dd/mm/yyyy format License := "GPL-3.0-or-later", ArchiveFormats := ".tar.gz", diff --git a/VERSIONS b/VERSIONS index d50da6177..d37734bc2 100644 --- a/VERSIONS +++ b/VERSIONS @@ -8,6 +8,7 @@ ############################################################################# ## +release 1.5.2 - 30/03/2022 release 1.5.1 - 29/03/2022 release 1.5.0 - 27/10/2021 release 1.4.1 - 14/05/2021 diff --git a/gap/grape.gi b/gap/grape.gi index d4ec6f22d..3bdcd4421 100644 --- a/gap/grape.gi +++ b/gap/grape.gi @@ -132,7 +132,7 @@ function(D) "the Grape graph will have fewer\n#I edges than the original,"); fi; - if not DIGRAPHS_IsGrapeLoaded then + if not DIGRAPHS_IsGrapeLoaded() then Info(InfoWarning, 1, "Grape is not loaded,"); fi; diff --git a/init.g b/init.g index da5a0a1ba..8b02db573 100644 --- a/init.g +++ b/init.g @@ -25,7 +25,7 @@ if not IsBound(DIGRAPH_OUT_NBS) and fi; BindGlobal("DIGRAPHS_IsGrapeLoaded", - IsPackageMarkedForLoading("grape", "4.8.1")); + {} -> IsPackageMarkedForLoading("grape", "4.8.1")); # To avoid warnings when GRAPE is not loaded if not IsBound(IsGraph) then diff --git a/read.g b/read.g index c9a71258f..ce3a63a6f 100644 --- a/read.g +++ b/read.g @@ -8,7 +8,7 @@ ############################################################################# ## -if not DIGRAPHS_IsGrapeLoaded then +if not DIGRAPHS_IsGrapeLoaded() then Add(DIGRAPHS_OmitFromTests, "Graph("); fi; diff --git a/tst/standard/digraph.tst b/tst/standard/digraph.tst index d8cbffcb6..7acb51af2 100644 --- a/tst/standard/digraph.tst +++ b/tst/standard/digraph.tst @@ -211,7 +211,7 @@ gap> DigraphRange(gr); [ 2, 3, 2 ] gap> gr; -gap> if DIGRAPHS_IsGrapeLoaded then +gap> if DIGRAPHS_IsGrapeLoaded() then > g := Graph(gr); > if not Digraph(g) = gr then > Print("fail"); @@ -1663,7 +1663,7 @@ gap> MakeImmutable(D); # gap> D := NullDigraph(10); -gap> if DIGRAPHS_IsGrapeLoaded then +gap> if DIGRAPHS_IsGrapeLoaded() then > D := Graph(D); > if D <> rec( > adjacencies := [[]], diff --git a/tst/standard/grape.tst b/tst/standard/grape.tst index a121d7f68..ee7fca465 100644 --- a/tst/standard/grape.tst +++ b/tst/standard/grape.tst @@ -129,7 +129,7 @@ rec( adjacencies := [ [ 2, 4 ] ], group := Group([ (1,3), (1,2)(3,4) ]), schreierVector := [ -1, 2, 1, 2 ] ) # Digraph: copying group from Grape -gap> if DIGRAPHS_IsGrapeLoaded then +gap> if DIGRAPHS_IsGrapeLoaded() then > gr := Digraph(JohnsonGraph(5, 3)); > else > gr := JohnsonDigraph(5, 3); @@ -140,7 +140,7 @@ gap> HasDigraphGroup(gr); true gap> DigraphGroup(gr); Group([ (1,7,10,6,3)(2,8,4,9,5), (4,7)(5,8)(6,9) ]) -gap> if DIGRAPHS_IsGrapeLoaded then +gap> if DIGRAPHS_IsGrapeLoaded() then > gr := Digraph(CompleteGraph(Group((1, 2, 3), (1, 2)))); > else > gr := Digraph([[2, 3], [1, 3], [1, 2]]); @@ -150,7 +150,7 @@ gap> HasDigraphGroup(gr); true gap> DigraphGroup(gr); Group([ (1,2,3), (1,2) ]) -gap> if DIGRAPHS_IsGrapeLoaded then +gap> if DIGRAPHS_IsGrapeLoaded() then > gr := Digraph(Graph(Group([()]), > [1, 2, 3], > OnPoints, @@ -252,7 +252,7 @@ true # Graph gap> gr := Digraph([[2, 2], []]); -gap> if DIGRAPHS_IsGrapeLoaded then +gap> if DIGRAPHS_IsGrapeLoaded() then > Graph(gr); > fi; diff --git a/tst/testinstall.tst b/tst/testinstall.tst index db8b3d116..abbaad0e7 100644 --- a/tst/testinstall.tst +++ b/tst/testinstall.tst @@ -23,11 +23,11 @@ gap> OutNeighbours(gr); [ [ 8 ], [ 4, 5, 6, 8, 9 ], [ 2, 4, 5, 7, 10 ], [ 9 ], [ 1, 4, 6, 7, 9 ], [ 2, 3, 6, 7, 10 ], [ 3, 4, 5, 8, 9 ], [ 3, 4, 9, 10 ], [ 1, 2, 3, 5, 6, 9, 10 ], [ 2, 4, 5, 6, 9 ] ] -gap> not DIGRAPHS_IsGrapeLoaded -> or (DIGRAPHS_IsGrapeLoaded and Digraph(Graph(gr)) = gr); +gap> not DIGRAPHS_IsGrapeLoaded() +> or (DIGRAPHS_IsGrapeLoaded() and Digraph(Graph(gr)) = gr); true -gap> not DIGRAPHS_IsGrapeLoaded -> or (DIGRAPHS_IsGrapeLoaded and Graph(Digraph(Graph(gr))).adjacencies = +gap> not DIGRAPHS_IsGrapeLoaded() +> or (DIGRAPHS_IsGrapeLoaded() and Graph(Digraph(Graph(gr))).adjacencies = > Graph(gr).adjacencies); true gap> adj := [ @@ -38,8 +38,8 @@ gap> adj := [ > [1, 6, 8, 9, 11, 12, 13, 14], [2, 4, 7, 9, 10, 11, 13, 15, 16]];; gap> func := function(x, y) return y in adj[x]; end; function( x, y ) ... end -gap> not DIGRAPHS_IsGrapeLoaded or -> (DIGRAPHS_IsGrapeLoaded and +gap> not DIGRAPHS_IsGrapeLoaded() or +> (DIGRAPHS_IsGrapeLoaded() and > Digraph(Graph(Group(()), [1 .. 20], OnPoints, func, true)) = Digraph(adj)); true