diff --git a/CHANGELOG.md b/CHANGELOG.md index 048dfe06f..b8335e7e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -310,8 +310,8 @@ This is a minor release that fixes several bugs: This is a minor release of the Digraphs package. The main change in this release is the reintroduction of the three-argument version of `DigraphAddVertices`, which accepts a digraph, a number of vertices to add, and -a list of labels for the new vertices. The removal inadvertantly broke -backwards compatbility with some third-party pre-existing code that relied on +a list of labels for the new vertices. The removal inadvertently broke +backwards compatibility with some third-party pre-existing code that relied on this functionality in the Digraphs package (see [Issue #264](https://github.com/digraphs/Digraphs/issues/264)). diff --git a/doc/constructors.xml b/doc/constructors.xml index 3f1baa538..5b3220e37 100644 --- a/doc/constructors.xml +++ b/doc/constructors.xml @@ -41,7 +41,7 @@ gap> LineDigraph(ChainDigraph(3)); Given a symmetric digraph digraph, the operation returns the symmetric digraph obtained by associating a vertex with each edge of - digraph, ignoring directions and multiplicites, and adding an edge + digraph, ignoring directions and multiplicities, and adding an edge between two vertices if and only if the corresponding edges have a vertex in common.

@@ -67,7 +67,7 @@ gap> LineUndirectedDigraph(DigraphSymmetricClosure(ChainDigraph(3))); the double digraph is the original vertex set together with a duplicate. The edges are [u_1, v_2] and [u_2, v_1] if and only if [u, v] is an edge in digraph. The resulting graph is bipartite, - since the orignal edges are not included in the resulting digraph.

+ since the original edges are not included in the resulting digraph.

If digraph is mutable, then digraph is modified in-place. If digraph is immutable, then a new immutable digraph constructed as @@ -89,7 +89,7 @@ gap> BipartiteDoubleDigraph(gamma); Let digraph be a digraph with vertex set V. This function returns the double digraph of digraph. The vertex set of the double - digraph is the orginal vertex set together with a duplicate. The edges are + digraph is the original vertex set together with a duplicate. The edges are [u_1, v_2] and [u_2, v_1] if and only if [u, v] is an edge in digraph, together with the original edges and their duplicates.

diff --git a/doc/display.xml b/doc/display.xml index c0ea14f60..f064d9a05 100644 --- a/doc/display.xml +++ b/doc/display.xml @@ -563,7 +563,7 @@ gap> FileString("dot/preset.dot", DotProrderDigraph(gr)); A string. - DotHighlightedDigraph produces a graphical represenation of the + DotHighlightedDigraph produces a graphical representation of the digraph digraph, where the vertices in the list verts, and edges between them, are drawn with colour colour1 and all other vertices and edges in digraph are drawn with colour colour2. diff --git a/doc/isomorph.xml b/doc/isomorph.xml index d71e3d7bd..5e4d993a0 100644 --- a/doc/isomorph.xml +++ b/doc/isomorph.xml @@ -43,9 +43,9 @@ + Label="for a digraph and homogeneous list"/> + Label="for a digraph, homogeneous list, and list"/> A permutation group. If digraph is a digraph, then this attribute contains the group of @@ -210,7 +210,7 @@ true]]> and Petteri Kaski. If &NautyTracesInterface; is available, then &nauty; by Brendan Mckay and Adolfo Piperno can be used instead; see , + Label="for a digraph and homogeneous list"/>, , , and . @@ -298,7 +298,7 @@ true]]> and Petteri Kaski. If &NautyTracesInterface; is available, then &nauty; by Brendan Mckay and Adolfo Piperno can be used instead; see , + Label="for a digraph, homogeneous list, and list"/>, , , and . diff --git a/doc/oper.xml b/doc/oper.xml index f1c852436..1bd1fc966 100644 --- a/doc/oper.xml +++ b/doc/oper.xml @@ -791,7 +791,7 @@ gap> InDegreeOfVertex(D, 4); - A list of postitive vertices. + A list of positive vertices. This operation returns the list inn of vertices of the digraph @@ -991,7 +991,7 @@ false func, nopath, and edge. The arguments nopath and edge can be arbitrary ⪆ objects. The argument func must be a function which accepts 4 arguments: - the matrix mat, followed by 3 postive integers. The function + the matrix mat, followed by 3 positive integers. The function func is where the work to calculate the desired outcome must be performed.

@@ -1577,7 +1577,7 @@ gap> DigraphRandomWalk(D, 1, 4); to the vertex v.

- See for more information about the repesentation + See for more information about the representation of a directed path or directed cycle which is used, and see for more information about iterators. See Section for the definition of diff --git a/doc/prop.xml b/doc/prop.xml index e05ccec12..795acf6a1 100644 --- a/doc/prop.xml +++ b/doc/prop.xml @@ -1341,7 +1341,7 @@ false]]> true or false. - A digraph is a preorder digraph if and only if the digraph satisifies both + A digraph is a preorder digraph if and only if the digraph satisfies both and . A preorder digraph (or quasiorder digraph) digraph corresponds to the preorder relation \leq defined by x \leq y if and only @@ -1377,7 +1377,7 @@ false true or false. - A digraph is a partial order digraph if and only if the digraph satisifies + A digraph is a partial order digraph if and only if the digraph satisfies all of , and . A partial order digraph corresponds @@ -1410,7 +1410,7 @@ true true or false. - A digraph is an equivalence digraph if and only if the digraph satisifies + A digraph is an equivalence digraph if and only if the digraph satisfies all of , and . A partial order digraph corresponds to an equivalence relation. diff --git a/doc/z-chap9.xml b/doc/z-chap9.xml index 98ac244f9..47cd45573 100644 --- a/doc/z-chap9.xml +++ b/doc/z-chap9.xml @@ -17,7 +17,7 @@ Graph6 is a graph data format for storing undirected graphs with no multiple edges nor loops of size up to 2^{36} - 1 in - printable chracters. The format consists of two parts. The first part + printable characters. The format consists of two parts. The first part uses one to eight bytes to store the number of vertices. And the second part is the upper half of the adjacency matrix converted into ASCII characters. For a more detail description see @@ -52,7 +52,7 @@ designed for digraphs. In this format the list of edges is partitioned into inceasing and decreasing edges, depending whether the edge has its source bigger than the range. Then both sets of edges are - written separetly in Sparse6 format with a separation symbol + written separately in Sparse6 format with a separation symbol in between. diff --git a/gap/attr.gi b/gap/attr.gi index 15b97cd0c..fcecfc7ed 100644 --- a/gap/attr.gi +++ b/gap/attr.gi @@ -302,7 +302,7 @@ function(D) od; return index; end; - # Iterate over vetex subsets + # Iterate over vertex subsets subset_iter := IteratorOfCombinations(vertices); # Skip the first one, which should be the empty set S := NextIterator(subset_iter); @@ -345,7 +345,7 @@ function(D) # Undo the changes made. UniteBlist(vertex_blist, I); od; - # Iterate over vetex subset blists. + # Iterate over vertex subset blists. subset_iter := ListWithIdenticalEntries(n, [true, false]); subset_iter := IteratorOfCartesianProduct2(subset_iter); # Skip the first one, which should be the empty set diff --git a/gap/digraph.gi b/gap/digraph.gi index 87f6328a4..c26b72226 100644 --- a/gap/digraph.gi +++ b/gap/digraph.gi @@ -1166,7 +1166,7 @@ function(filt, D) red := DigraphReflexiveTransitiveReduction(D); top := DigraphTopologicalSort(D); # im[i] will store the image of the idempotent partial perm corresponding to - # vertex i of the arugment + # vertex i of the argument im := []; im[top[1]] := []; max := 1; diff --git a/gap/grahom.gi b/gap/grahom.gi index 48d061d20..806c802d4 100644 --- a/gap/grahom.gi +++ b/gap/grahom.gi @@ -31,7 +31,7 @@ function(arg) colours := fail; G := AutomorphismGroup(DigraphRemoveAllMultipleEdges(D)); else - ErrorNoReturn("the 2nd argument must be a homogenous list,"); + ErrorNoReturn("the 2nd argument must be a homogeneous list,"); fi; else if HasGeneratorsOfEndomorphismMonoidAttr(D) then diff --git a/gap/io.gi b/gap/io.gi index a16efa30b..59df19285 100644 --- a/gap/io.gi +++ b/gap/io.gi @@ -398,7 +398,7 @@ function(arg) fi; if not (IsString(name) or IsFile(name)) then - ErrorNoReturn("the 1st argument must be a string or IO ", + ErrorNoReturn("the 1st argument must be a string or IO ", "file object,"); elif not (IsFunction(decoder) or decoder = fail) then ErrorNoReturn("the argument must be a function or fail,"); diff --git a/gap/prop.gi b/gap/prop.gi index bde488dea..5e74895e2 100644 --- a/gap/prop.gi +++ b/gap/prop.gi @@ -502,12 +502,12 @@ end); # A vertex z dominates a pair of vertices {x, y} if z->x and z->y # A pair of vertices {x, y} dominates a vertex z if x->z and y->z # Theorem 4.1: a strongly connected digraph with n vertices in which every pair -# of non-adjacent dominated vertices {x,y} satifies either of: +# of non-adjacent dominated vertices {x,y} satisfies either of: # 1.(full degree of x) ≥ n and (full degree of y) ≥ n - 1 # 2.(full degree of y) ≥ n and (full degree of x) ≥ n - 1 # Is Hamiltonian. # Theorem 4.2: a strongly connected digraph with n vertices in which every pair -# of non-adjacent vertices {x,y} which is dominated or dominating satifies: +# of non-adjacent vertices {x,y} which is dominated or dominating satisfies: # 1. (out degree of x) + (in degree of y) ≥ n # 2. (out degree of y) + (in degree of x) ≥ n # Is Hamiltonian. diff --git a/src/cliques.c b/src/cliques.c index f7f347284..abb86907c 100644 --- a/src/cliques.c +++ b/src/cliques.c @@ -111,7 +111,7 @@ static UInt clique_hook_gap_list(void* user_param, Obj clique_list, Obj gap_func) { Obj n = CALL_2ARGS(gap_func, user_param, clique_list); if (!IS_INTOBJ(n)) { - ErrorQuit("the 2rd argument must be a function which returns " + ErrorQuit("the 2nd argument must be a function which returns " "an integer,", 0L, 0L); @@ -427,7 +427,7 @@ static int BronKerbosch(uint16_t depth, // The arguments are as follows: // // 1. digraphs_obj the digraph to search for cliques in -// 2. hook_obj a funtion to apply to every clique found, or Fail if no +// 2. hook_obj a function to apply to every clique found, or Fail if no // such function is needed // 3. user_param_obj GAP variable that can be used in the hook_obj, must be a // plist if hook_obj is Fail @@ -444,7 +444,7 @@ static int BronKerbosch(uint16_t depth, // 7. max_obj True if only maximal cliques need to be found and False // otherwise // 8. size_obj an integer specifying the size of cliques to be found -// 9. aut_grp_obj an optional argument that can specifiy the automorphisms +// 9. aut_grp_obj an optional argument that can specify the automorphisms // of the graph that will be used in the recursive search. // If not given, the full automorphism group will be used. // @@ -485,14 +485,14 @@ Obj FuncDigraphsCliquesFinder(Obj self, Obj args) { } if (hook_obj == Fail) { if (!IS_LIST(user_param_obj) || !IS_MUTABLE_OBJ(user_param_obj)) { - ErrorQuit("the 2rd argument is fail and so the 3th argument must " + ErrorQuit("the 2nd argument is fail and so the 3th argument must " "be a mutable list, not %s,", (Int) TNAM_OBJ(user_param_obj), 0L); } } else if (!IS_FUNC(hook_obj) || NARG_FUNC(hook_obj) != 2) { ErrorQuit( - "the 2rd argument must be a function with 2 arguments,", 0L, 0L); + "the 2nd argument must be a function with 2 arguments,", 0L, 0L); } if (!IS_INTOBJ(limit_obj) && limit_obj != Infinity) { ErrorQuit("the 4th argument must be an integer " diff --git a/src/digraphs.c b/src/digraphs.c index 681fcf34b..b7a51801f 100644 --- a/src/digraphs.c +++ b/src/digraphs.c @@ -502,7 +502,7 @@ static Obj FuncDIGRAPH_TRANS_REDUCTION(Obj self, Obj D) { return D; } - // Create the GAP out-neighbours strcture of the result + // Create the GAP out-neighbours structure of the result Obj ot_list = NEW_PLIST(T_PLIST_TAB, n); SET_LEN_PLIST(ot_list, n); for (UInt i = 1; i <= n; i++) { diff --git a/src/homos.c b/src/homos.c index 80df1089f..b85af5e6d 100644 --- a/src/homos.c +++ b/src/homos.c @@ -1851,7 +1851,7 @@ static bool init_data_from_args(Obj digraph1_obj, // of the function. It seems in many cases to be a good // idea for this to be the DigraphWelshPowellOrder, i.e. // vertices ordered from highest to lowest degree. -// 13. aut_grp_obj an optional argument that can specifiy the +// 13. aut_grp_obj an optional argument that can specify the // automorphisms of the graph that will be used in the // recursive search. If not given, the full automorphism // group will be used. diff --git a/tst/standard/cliques.tst b/tst/standard/cliques.tst index e20ea518d..82d0b8f89 100644 --- a/tst/standard/cliques.tst +++ b/tst/standard/cliques.tst @@ -548,11 +548,11 @@ Error, the 1st argument must be a digraph, not integer, gap> DigraphsCliquesFinder(NullDigraph(513), 2, 3, 4, 5, 6, 7, 8); Error, the 1st argument must have at most 512 vertices, found 513, gap> DigraphsCliquesFinder(NullDigraph(1), fail, 3, 4, 5, 6, 7, 8); -Error, the 2rd argument is fail and so the 3th argument must be a mutab\ +Error, the 2nd argument is fail and so the 3th argument must be a mutab\ le list, not integer, gap> f := function(n) end;; gap> DigraphsCliquesFinder(NullDigraph(1), f, [], 4, 5, 6, 7, 8); -Error, the 2rd argument must be a function with 2 arguments, +Error, the 2nd argument must be a function with 2 arguments, gap> DigraphsCliquesFinder(NullDigraph(1), fail, [], fail, 5, 6, 7, 8); Error, the 4th argument must be an integer or infinity, not boolean or\ fail, diff --git a/tst/standard/grahom.tst b/tst/standard/grahom.tst index f257c5c19..db7f52d20 100644 --- a/tst/standard/grahom.tst +++ b/tst/standard/grahom.tst @@ -168,10 +168,10 @@ gap> GeneratorsOfEndomorphismMonoid(gr); gap> gr := EmptyDigraph(2); gap> GeneratorsOfEndomorphismMonoid(gr, Group(()), Group((1, 2))); -Error, the 2nd argument must be a homogenous list, +Error, the 2nd argument must be a homogeneous list, gap> gr := EmptyDigraph(2);; gap> GeneratorsOfEndomorphismMonoid(gr, Group(())); -Error, the 2nd argument must be a homogenous list, +Error, the 2nd argument must be a homogeneous list, gap> gr := EmptyDigraph(2);; gap> GeneratorsOfEndomorphismMonoid(gr, 1); [ Transformation( [ 2, 1 ] ) ] diff --git a/tst/standard/io.tst b/tst/standard/io.tst index c76ea65eb..84598dd8d 100644 --- a/tst/standard/io.tst +++ b/tst/standard/io.tst @@ -62,7 +62,7 @@ false gap> list[10] = gr; true gap> ReadDigraphs(34, DigraphFromGraph6String, 5); -Error, the 1st argument must be a string or IO file object, +Error, the 1st argument must be a string or IO file object, gap> ReadDigraphs(str, (1, 6, 5), 5); Error, the argument must be a function or fail, gap> ReadDigraphs(str, DigraphFromGraph6String, 0); diff --git a/tst/standard/isomorph.tst b/tst/standard/isomorph.tst index 1b6e04ed3..4226c2835 100644 --- a/tst/standard/isomorph.tst +++ b/tst/standard/isomorph.tst @@ -63,7 +63,7 @@ gap> not DIGRAPHS_NautyAvailable or true # Complete bipartitite graph with parts of size m and n -# shoud have automorphism group S_m x S_n +# should have automorphism group S_m x S_n gap> m := 5;; n := 4;; gap> gr := CompleteBipartiteDigraph(m, n);