Conversation
…to vertex_descriptor_view - index_vertex_range now checks std::integral<vertex_range_t<G>::storage_type> instead of digging through vertex_desc::iterator_type — reflects the true semantic intent (vertices addressable by integral index) - Add underlying_iterator = VertexIter alias on vertex_descriptor_view for direct access to the underlying container iterator type
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
- map_container_strategy.md: design strategy with concepts, vertex_map, algorithm generalization patterns, and settled design decisions - map_container_plan.md: phased implementation plan (10 phases, 55 sub-phases) with review gates and progress tracking table
Copy all 14 algorithm .hpp files to include/graph/algorithm/index/ as byte-identical reference snapshots before map-based generalization. This directory is a temporary review aid and not part of the public API.
- Add hashable_vertex_id, mapped_vertex_range, mapped_adjacency_list, mapped_bidirectional_adjacency_list concepts to adjacency_list_concepts.hpp (mutually exclusive with index_vertex_range) - Create vertex_map.hpp: vertex_map<G,T> type alias (vector for index, unordered_map for mapped), make_vertex_map (eager+lazy), vertex_map_contains, vertex_map_get (no-insertion read with default fallback) - Add is_null_range_v<T> trait to traversal_common.hpp - Create map_graph_fixtures.hpp with sparse-ID graph factories - Add test_vertex_map.cpp (13 tests) and test_mapped_concepts.cpp (11 tests) - All 4367 tests pass (4343 existing + 24 new)
…ty_map_for concept - Rename vertex_map.hpp → vertex_property_map.hpp, test_vertex_map.cpp → test_vertex_property_map.cpp - Rename all identifiers: vertex_map → vertex_property_map, make_vertex_map → make_vertex_property_map, vertex_map_contains → vertex_property_map_contains, vertex_map_get → vertex_property_map_get, vertex_map_value_t → vertex_property_map_value_t - Add vertex_property_map_for<M, G> concept: requires m[uid] subscript access with vertex_id_t<G>, replacing forward_range on Dijkstra's Distances and Predecessors template parameters - Dijkstra requires clause now uses vertex_property_map_for<Distances, G> and (is_null_range_v<Predecessors> || vertex_property_map_for<Predecessors, G>) - Add BFS and Dijkstra sparse/string-VId tests - All 4445 tests pass
- Relax concept: index_adjacency_list → adjacency_list for all three traversal algorithms (BFS was done earlier, DFS and topo_sort in this commit) - Replace std::vector<Color/bool> with lazy vertex_property_map: index graphs get value-initialized vector, mapped graphs get empty reserved map with absent-key defaults via vertex_property_map_get - Remove vertex_id_store_t static_asserts, simplify to vertex_id_t<G> - Hoist topo_sort Color enum to detail::TopoColor (shared across functions) - Add 36 sparse DFS tests (6 cases × 6 SPARSE_VERTEX_TYPES) - Add 36 sparse topological_sort tests (6 cases × 6 SPARSE_VERTEX_TYPES) - Add cycle_graph fixture to map_graph_fixtures.hpp - All 4517 tests pass (35 original topo + 36 new sparse topo, 29 original DFS + 36 new sparse DFS)
Add graph-parameterized init_shortest_paths overloads that accept const G& as the first parameter, enabling correct initialization for both index-based (vector) and map-based (unordered_map) containers. - Index graphs: identical fill/iota behavior to legacy overloads - Mapped graphs (empty): populate all vertices from vertexlist(g) - Mapped graphs (pre-populated): fill existing entries - _null_range_type predecessors skipped via is_null_range_v Phase 3 of map_container_plan.
Generalize bellman_ford_shortest_paths, bellman_ford_shortest_distances, and find_negative_cycle to work with both index and map-based graph types. - Relax concept from index_adjacency_list to adjacency_list - Replace random_access_range with vertex_property_map_for constraints - Remove static_cast<size_t> — use direct operator[] access - Gate size checks with index_vertex_range (index graphs only) - Add overflow guard in relax_target (d_u == infinite → skip) - find_negative_cycle: const-correct map access via .at() - 42 new sparse graph tests (7 test cases × 6 map-based types) Phase 4.3-4.5 of map_container_plan.
- connected_components, kosaraju: store vertex_t<G> (8-byte descriptors) on stacks/vectors instead of vertex_id_t<G>, eliminating string copies for map-based graphs and removing find_vertex on pop via views::incidence(g, descriptor) - dijkstra_shortest_paths: priority queue stores vertex_t<G> instead of vertex_id_t<G>, eliminating string copies on push and find_vertex on pop/incidence/visitor callbacks; one find_vertex per neighbor push remains (unavoidable: target_id returns vertex_id_t<G>) - Remove store_vertex_id helper from traversal_common.hpp - Add sparse vertex tests for connected_components and afforest
…mapped graphs - jaccard_coefficient: adjacency_list concept, vertex_property_map for neighbor sets, descriptor-based incidence in Phase 2 - maximal_independent_set: adjacency_list concept, vertex_property_map for removed tracking, find_vertex for seed validation - triangle_count: adjacency_list concept, vertices(g) iteration replacing index loop - label_propagation: adjacency_list concept, vertex_property_map_for constraint on Label parameter, vertex iteration for order vector (both overloads) - Added sparse TEMPLATE_TEST_CASE tests for all four algorithms (96 new tests) - All 4709 tests pass
…ed graphs - Relax concept from index_adjacency_list to adjacency_list - Replace internal vector<T> arrays with vertex_property_map (3-5 per algo) - Replace broken static_cast<vid_t>(N) parent sentinel with std::optional<vid_t> - Store edge iterators on DFS stack for O(1) resume (was O(degree) re-scan) - Use edges(g, uid) + target_id(g, *it) CPOs instead of internal view members - Iterate via views::basic_vertexlist(g) instead of vertices(g) + vertex_id() - Add 30 sparse TEMPLATE_TEST_CASE tests per algorithm (5 topologies x 6 types) - All 4769 tests pass
- Relax prim() from index_adjacency_list to adjacency_list concept - Predecessor/Weight params: random_access_range -> vertex_property_map_for - Internal distance array uses make_vertex_property_map (vector or map) - Validation: if constexpr index_vertex_range for size checks, find_vertex for mapped - Total weight loop uses basic_vertexlist instead of index loop - Kruskal unchanged: edge-list-centric API already handles sparse integral IDs - Add 30 sparse prim tests (5 cases x 6 SPARSE_VERTEX_TYPES) - 4799 tests pass
- CHANGELOG: document mapped graph features, 456 new tests (4343 -> 4799) - algorithms.md: update overview for adjacency_list (index + mapped) - algorithms.md: add map-based graph usage example with vertex_property_map - concepts.md: update hierarchy with mapped_vertex_range, mapped_adjacency_list - concepts.md: correct adjacency_list definition (no longer requires index_vertex_range)
- Relax graph concept from index_adjacency_list to adjacency_list in all algorithm pages (bfs, dfs, topological_sort, dijkstra, bellman_ford, connected_components, mst, jaccard, mis, triangle_count, label_propagation, articulation_points, biconnected_components) - Update parameter tables: distances/predecessors/component/label/weights now document vertex_property_map_for constraint and make_vertex_property_map usage - Update preconditions: replace 'sized to num_vertices(g)' with 'must satisfy vertex_property_map_for' - Add mapped_adjacency_list to Graph concepts table in adjacency-lists.md - Add Section 5 'Vertex Property Maps' to adjacency-lists.md covering the type alias, factory functions, access helpers, concept, and type trait - Update adjacency-lists.md: all algorithms accept adjacency_list, not just index_adjacency_list fix: vertex_property_map_contains bounds-checks uid for index graphs - Change vector branch from unconditional 'return true' to 'return static_cast<size_t>(uid) < std::ranges::size(m)' - Update test: rename 'always true' case to 'bounds check', add out-of-range assertions - Update doxygen comment and docs table entry
…param
- Remove the two graph-unaware overloads of init_shortest_paths (no G param).
They only worked for index graphs (random_access_range) and broke silently
for mapped containers.
- Add requires clauses to both graph-aware overloads:
adjacency_list<G> && vertex_property_map_for<Distances, G>
and (vertex_property_map_for<Predecessors, G> || is_null_range_v<Predecessors>)
for the three-arg form.
- Update all 27 call sites in test_dijkstra_shortest_paths.cpp and
test_bellman_ford_shortest_paths.cpp to pass g as first argument.
Adds agents/uniform_prop_goal.md describing the design intent for uniform property access in graph algorithms, and agents/uniform_prop_strategy.md with the implementation strategy: new vertex_property_function / vertex_arithmetic_property_function concepts, null_vertex_property_fn sentinel, function-object overloads of init_shortest_paths, and the algorithm parameter changes for dijkstra, bellman_ford, and mst.
- Remove is_edge_descriptor_v<E> trait gate from edge<G,E> concept - Remove source(g,e)/target(g,e) from concept requirements; any type satisfying source_id(g,e) and target_id(g,e) now qualifies - Update doc comment: list adj_list descriptors, edge_list descriptors, edge_data, and tuple/pair as examples; note that algorithms needing vertex descriptors should add source(g,e)/target(g,e) explicitly - Add interop static assertion tests in test_edge_list_concepts.cpp verifying that tuple, pair, edge_data and edge_list::edge_descriptor all satisfy adj_list::edge<G,E> after the gate is removed - All 4799 tests pass
# Conflicts: # include/graph/algorithm/tc.hpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.