Combinatorics: make vertex labels in graph visualization start at 1 (#4459)

Co-authored-by: Benjamin Lorenz <[email protected]>

Author: YueRen

Diff for: src/Combinatorics/Graphs/functions.jl

@@ -1137,15 +1137,11 @@ end
 
 
 @doc raw"""
-    visualize(G::Graph{T}) where {T <: Union{Polymake.Directed, Polymake.Undirected}}
+    visualize(G::Graph{T}; kwargs...) where {T <: Union{Polymake.Directed, Polymake.Undirected}}
 
-Visualize a graph.
+Visualize a graph, see [`visualize`](@ref Oscar.visualize(::Union{SimplicialComplex, Cone{<:Union{Float64, FieldElem}}, Graph, PolyhedralComplex{<:Union{Float64, FieldElem}}, PolyhedralFan{<:Union{Float64, FieldElem}}, Polyhedron, SubdivisionOfPoints{<:Union{Float64, FieldElem}}})) for details on the keyword arguments.
 """
-function visualize(G::Graph{T}) where {T <: Union{Polymake.Directed, Polymake.Undirected}}
-    BigGraph = Polymake.graph.Graph(ADJACENCY=pm_object(G))
-    Polymake.visual(BigGraph)
-end
-
+visualize
 
 
 # Some standard polytopes from graphs

Diff for: src/PolyhedralGeometry/visualization.jl

@@ -65,8 +65,7 @@ function visualize(
   };
   kwargs...,
 )
-  _prepare_visualization(P)
-  pmo = pm_object(P)
+  pmo = _prepare_visualization(P)
   Polymake.visual(pmo; kwargs...)
 end
 
@@ -92,13 +91,14 @@ julia> visualize(P)
 ```
 """
 function visualize(P::Vector; kwargs::Dict=Dict{Int,Nothing}())
-  for p in P
-    @req p isa visual_supported_types "Can not visualize objects of type $(typeof(P))"
-    _prepare_visualization(p)
-  end
+  P = map(
+    p -> begin
+      @req p isa visual_supported_types "Can not visualize objects of type $(typeof(P))"
+      _prepare_visualization(p)
+    end, P)
   vis = [
     Polymake.visual(
-      Polymake.Visual, pm_object(P[i]); get(kwargs, i, Vector{Nothing}(undef, 0))...
+      Polymake.Visual, P[i]; get(kwargs, i, Vector{Nothing}(undef, 0))...
     ) for i in 1:length(P)
   ]
   if isdefined(Main, :IJulia) && Main.IJulia.inited
@@ -133,6 +133,7 @@ function _prepare_visualization(
   if !Polymake.exists(pm_object(P), "RAY_LABELS")
     pm_object(P).RAY_LABELS = string.(1:(Oscar.pm_object(P).N_RAYS))
   end
+  return pm_object(P)
 end
 
 function _prepare_visualization(P::SubdivisionOfPoints{<:Union{Float64,FieldElem}})
@@ -144,8 +145,17 @@ function _prepare_visualization(P::SubdivisionOfPoints{<:Union{Float64,FieldElem
   if !Polymake.exists(pm_object(P), "POINT_LABELS")
     pm_object(P).POINT_LABELS = string.(1:(Oscar.pm_object(P).N_POINTS))
   end
+  return pm_object(P)
+end
+
+function _prepare_visualization(sc::SimplicialComplex)
+  return pm_object(sc)
 end
 
-function _prepare_visualization(P::Union{Graph,SimplicialComplex})
-  return nothing
+function _prepare_visualization(
+  g::Graph{T}
+) where {T<:Union{Polymake.Directed,Polymake.Undirected}}
+  bg = Polymake.graph.Graph{T}(; ADJACENCY=pm_object(g))
+  bg.NODE_LABELS = string.(1:n_vertices(g))
+  return bg
 end