Skip to content

Commit

Permalink
Merge branch 'stable-1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
wilfwilson committed Mar 3, 2021
2 parents a4aa9e1 + a825d4e commit 0c909dd
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 13 deletions.
14 changes: 8 additions & 6 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@ coverage:
range: "90...100" # Anything below 90% is coloured red (considered bad)

status: # GitHub status checks to add to a PR
project:
project: # Check all of Digraphs
default:
informational: true
patch:
informational: true # Don't fail the check if overall coverage decreases
patch: # Check only the PR's diff
default:
informational: true
changes:
target: 100
threshold: 0
informational: false # Do fail the check if the diff is not 100% covered
changes: # Information about changes in coverage outside the diff
default:
informational: true
informational: true # Don't fail the check

# Comment to post on PRs
comment: false
Expand Down
19 changes: 17 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,27 @@ If you installed GAP on several architectures, then you must execute the
configure/make step for each of the architectures. You can either do this
immediately after configuring and compiling GAP itself on this architecture, or
alternatively set the environment variable `CONFIGNAME` to the name of the
configuration you used when compiling GAPbefore running `./configure`. Note
configuration you used when compiling GAP before running `./configure`. Note
however that your compiler choice and flags (environment variables `CC` and
`CFLAGS`) need to be chosen to match the setup of the original GAP compilation.
For example, you have to specify 32-bit or 64-bit mode correctly!

Digraphs vendors `bliss` and `planarity` libraries in the `extern` directory.
### Configuration options

In addition to the usual autoconf generated configuration flags, the following
flags are provided.

Option | Meaning
----------------------------- | ------------------------------------------------
--enable-code-coverage | enable code coverage support
--enable-compile-warnings | enable compiler warnings
--enable-debug | enable debug mode
--with-external-bliss | use external `bliss`
--with-external-planarity | use external `planarity`
--with-gaproot | specify root of GAP installation
--without-intrinsics | do not use compiler intrinsics even if available

Digraphs vendors the `bliss` and `planarity` libraries in the `extern` directory.
If you wish to use your system copy of `bliss` or `planarity`, please use the
configure options `--with-external-bliss` or `--with-external-planarity`, as
appropriate.
Expand Down
18 changes: 13 additions & 5 deletions doc/labels.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<A>i</A>. <P/>

If <A>digraph</A> is a digraph created from a record with a component
<C>vertices</C>, then the labels of the vertices are set to the value of
this component.<P/>
<C>DigraphVertices</C>, then the labels of the vertices are set to
the value of this component.<P/>

Induced subdigraphs, and some other operations which create new digraphs from
old ones, inherit their labels from their parents.
Expand Down Expand Up @@ -71,15 +71,23 @@ gap> DigraphVertexLabel(D, 1);
copy of the labels of the vertices in <A>digraph</A>.
<C>SetDigraphVertexLabels</C> can be used to set the labels of the vertices
in <A>digraph</A> to the list of
arbitrary &GAP; objects <A>list</A>. <P/>
arbitrary &GAP; objects <A>list</A>, which must be of the same length
as the number of vertices of <A>digraph</A>. <P/>

If the list <A>list</A> is immutable, then the vertex labels are set to a
mutable copy of <A>list</A>. Otherwise, the labels are set to exactly
<A>list</A>. <P/>

The label of a vertex can be changed an arbitrary number of times. If no
label has been set for the vertex <A>i</A>, then the default value is
<A>i</A>. <P/>

If <A>digraph</A> is a digraph created from a record with a component
<C>vertices</C>, then the labels of the vertices are set to the value of
this component.<P/>
<C>DigraphVertices</C>, then the labels of the vertices are set to the
value of this component. As in the above, if the component is immutable
then the digraph's vertex labels are set to a mutable copy of
<C>DigraphVertices</C>. Otherwise, they are set to exactly
<C>DigraphVertices</C>. <P/>

Induced subdigraphs, and other operations which create new digraphs from
old ones, inherit their labels from their parents.
Expand Down
38 changes: 38 additions & 0 deletions doc/z-chap1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,44 @@ make]]></Listing>
If you want to check that the package is working correctly, you
should run some of the tests described in Section
<Ref Sect="Testing your installation"/>.
<Subsection Label="Configuration options">
<Heading>Configuration options</Heading>

In addition to the usual autoconf generated configuration flags, the following
flags are provided.

<Table Align="|l|l|">
<Caption>Configuration flags</Caption>
<HorLine/>
<Row>
<Item>Option</Item><Item>Meaning</Item>
</Row>
<HorLine/>
<HorLine/>
<Row>
<Item><C>--enable-code-coverage</C></Item><Item> enable code coverage support</Item>
</Row>
<Row>
<Item><C>--enable-compile-warnings</C></Item><Item> enable compiler warnings</Item>
</Row>
<Row>
<Item><C>--enable-debug</C></Item><Item> enable debug mode</Item>
</Row>
<Row>
<Item><C>--with-external-bliss</C></Item><Item> use external &bliss;</Item>
</Row>
<Row>
<Item><C>--with-external-planarity</C></Item><Item> use external &edge-addition-planarity-suite;</Item>
</Row>
<Row>
<Item><C>--with-gaproot</C></Item><Item> specify root of GAP installation</Item>
</Row>
<Row>
<Item><C>--without-intrinsics</C></Item><Item> do not use compiler intrinsics even if available</Item>
</Row>
<HorLine/>
</Table>
</Subsection>
</Section>

<!--**********************************************************************-->
Expand Down
3 changes: 3 additions & 0 deletions gap/labels.gi
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ function(D, names)
"to the number of vertices of the digraph <D> that is the ",
"1st argument,");
fi;
if not IsMutable(names) then
names := ShallowCopy(names);
fi;
D!.vertexlabels := names;
end);

Expand Down
6 changes: 6 additions & 0 deletions tst/standard/labels.tst
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ gap> DigraphVertexLabels(gr);
[ 1, 3, 4, 5, 6, 7, 8, 9, 10 ]
gap> D := NullDigraph(5);;
gap> RemoveDigraphVertexLabel(D, 6);
gap> A := Immutable([1, 2]);
[ 1, 2 ]
gap> D := CycleDigraph(2);
<immutable cycle digraph with 2 vertices>
gap> SetDigraphVertexLabels(D, A);
gap> SetDigraphVertexLabel(D, 2, "b");

# DigraphEdgeLabels
gap> gr := Digraph([[2, 3], [3], [1, 5], [], [4]]);
Expand Down

0 comments on commit 0c909dd

Please sign in to comment.