Skip to content

Commit 4bd1df1

Browse files
committed
Adapt ViewString for IsDirectedForest
1 parent 4e1a529 commit 4bd1df1

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

gap/digraph.gi

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -582,22 +582,26 @@ function(D)
582582
elif HasIsMeetSemilatticeDigraph(D) and IsMeetSemilatticeDigraph(D) then
583583
Append(str, "meet semilattice ");
584584
fi;
585-
elif HasIsUndirectedTree(D) and IsUndirectedTree(D) then
586-
Append(str, "undirected tree ");
585+
elif (HasIsUndirectedTree(D) and IsUndirectedTree(D))
586+
or (HasIsDirectedTree(D) and IsDirectedTree(D)) then
587+
if HasIsUndirectedTree(D) and IsUndirectedTree(D) then
588+
Append(str, "un");
589+
fi;
590+
Append(str, "directed tree ");
587591
display_nredges := false;
588592
display_digraph := false;
589-
elif HasIsUndirectedForest(D) and IsUndirectedForest(D) then
590-
Append(str, "undirected forest ");
593+
elif (HasIsUndirectedForest(D) and IsUndirectedForest(D))
594+
or (HasIsDirectedForest(D) and IsDirectedForest(D)) then
595+
if HasIsUndirectedForest(D) and IsUndirectedForest(D) then
596+
Append(str, "un");
597+
fi;
598+
Append(str, "directed forest ");
591599
display_nredges := false;
592600
display_digraph := false;
593601
if HasDigraphNrConnectedComponents(D) then
594602
suffix := Concatenation(String(DigraphNrConnectedComponents(D)),
595603
" components");
596604
fi;
597-
elif HasIsDirectedTree(D) and IsDirectedTree(D) then
598-
Append(str, "directed tree ");
599-
display_nredges := false;
600-
display_digraph := false;
601605
elif HasIsTournament(D) and IsTournament(D) then
602606
Append(str, "tournament ");
603607
display_nredges := false;

tst/standard/prop.tst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,6 +1074,8 @@ gap> IsDirectedTree(D);
10741074
false
10751075
gap> IsDirectedForest(D);
10761076
true
1077+
gap> D;
1078+
<immutable directed forest with 17 vertices, 2 components>
10771079

10781080
# IsUndirectedTree
10791081
gap> g := Digraph([]);

0 commit comments

Comments
 (0)