okstra 0.113.0 → 0.115.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.kr.md +2 -2
- package/README.md +2 -2
- package/docs/for-ai/README.md +2 -2
- package/docs/for-ai/skills/{okstra-brief.md → okstra-brief-gen.md} +3 -3
- package/docs/for-ai/skills/okstra-inspect.md +1 -1
- package/docs/kr/architecture.md +11 -11
- package/docs/kr/cli.md +1 -1
- package/docs/kr/follow-ups/2026-07-10-final-report-option-3.md +51 -0
- package/docs/project-structure-overview.md +2 -2
- package/package.json +1 -1
- package/runtime/BUILD.json +2 -2
- package/runtime/agents/workers/report-writer-worker.md +1 -0
- package/runtime/prompts/lead/context-loader.md +2 -2
- package/runtime/prompts/lead/okstra-lead-contract.md +1 -1
- package/runtime/prompts/profiles/_common-contract.md +3 -3
- package/runtime/prompts/profiles/implementation-planning.md +1 -1
- package/runtime/prompts/profiles/requirements-discovery.md +2 -2
- package/runtime/python/okstra_ctl/fix_cycles.py +1 -1
- package/runtime/python/okstra_ctl/implementation_stage.py +46 -39
- package/runtime/python/okstra_ctl/report_views.py +151 -12
- package/runtime/python/okstra_ctl/run.py +24 -24
- package/runtime/python/okstra_ctl/wizard.py +3 -3
- package/runtime/python/okstra_ctl/worktree.py +1 -1
- package/runtime/python/okstra_token_usage/claude.py +58 -19
- package/runtime/python/okstra_token_usage/collect.py +3 -1
- package/runtime/python/okstra_vendor/__init__.py +3 -0
- package/runtime/schemas/final-report-v1.0.schema.json +20 -0
- package/runtime/skills/{okstra-brief → okstra-brief-gen}/SKILL.md +6 -6
- package/runtime/skills/{okstra-brief → okstra-brief-gen}/references/reporter-confirmations.md +1 -1
- package/runtime/skills/{okstra-brief → okstra-brief-gen}/references/tracker-recursion.md +1 -1
- package/runtime/skills/okstra-inspect/SKILL.md +2 -2
- package/runtime/templates/reports/brief.template.md +2 -2
- package/runtime/templates/reports/final-report.template.md +14 -0
- package/runtime/templates/reports/i18n/en.json +23 -12
- package/runtime/templates/reports/i18n/ko.json +23 -12
- package/runtime/templates/reports/report.css +55 -0
- package/runtime/templates/reports/report.js +53 -1
- package/runtime/validators/validate-brief.py +5 -5
- package/runtime/validators/validate-brief.sh +1 -1
- package/src/commands/lifecycle/uninstall.mjs +2 -1
- package/src/lib/skill-catalog.mjs +2 -1
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_approx_clust_coeff.py +0 -41
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_clique.py +0 -112
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_connectivity.py +0 -199
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_density.py +0 -146
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_distance_measures.py +0 -59
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_dominating_set.py +0 -78
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_kcomponents.py +0 -303
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_matching.py +0 -8
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_maxcut.py +0 -94
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_ramsey.py +0 -31
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_steinertree.py +0 -306
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_traveling_salesman.py +0 -1014
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_treewidth.py +0 -274
- package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_vertex_cover.py +0 -68
- package/runtime/python/okstra_vendor/networkx/algorithms/assortativity/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/assortativity/tests/base_test.py +0 -81
- package/runtime/python/okstra_vendor/networkx/algorithms/assortativity/tests/test_connectivity.py +0 -143
- package/runtime/python/okstra_vendor/networkx/algorithms/assortativity/tests/test_correlation.py +0 -122
- package/runtime/python/okstra_vendor/networkx/algorithms/assortativity/tests/test_mixing.py +0 -174
- package/runtime/python/okstra_vendor/networkx/algorithms/assortativity/tests/test_neighbor_degree.py +0 -107
- package/runtime/python/okstra_vendor/networkx/algorithms/assortativity/tests/test_pairs.py +0 -87
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_basic.py +0 -125
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_centrality.py +0 -192
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_cluster.py +0 -84
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_covering.py +0 -33
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_edgelist.py +0 -240
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_extendability.py +0 -334
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_generators.py +0 -407
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_link_analysis.py +0 -218
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_matching.py +0 -327
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_matrix.py +0 -138
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_project.py +0 -409
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_redundancy.py +0 -35
- package/runtime/python/okstra_vendor/networkx/algorithms/bipartite/tests/test_spectral_bipartivity.py +0 -80
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_betweenness_centrality.py +0 -923
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_betweenness_centrality_subset.py +0 -354
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_closeness_centrality.py +0 -274
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_current_flow_betweenness_centrality.py +0 -259
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_current_flow_betweenness_centrality_subset.py +0 -147
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_current_flow_closeness.py +0 -43
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_degree_centrality.py +0 -144
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_dispersion.py +0 -73
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_eigenvector_centrality.py +0 -186
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_group.py +0 -277
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_harmonic_centrality.py +0 -122
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_katz_centrality.py +0 -345
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_laplacian_centrality.py +0 -220
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_load_centrality.py +0 -344
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_percolation_centrality.py +0 -87
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_reaching.py +0 -140
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_second_order_centrality.py +0 -82
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_subgraph.py +0 -110
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_trophic.py +0 -302
- package/runtime/python/okstra_vendor/networkx/algorithms/centrality/tests/test_voterank.py +0 -64
- package/runtime/python/okstra_vendor/networkx/algorithms/coloring/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/coloring/tests/test_coloring.py +0 -863
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_asyn_fluid.py +0 -147
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_bipartitions.py +0 -157
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_centrality.py +0 -85
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_divisive.py +0 -106
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_kclique.py +0 -91
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_label_propagation.py +0 -241
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_leiden.py +0 -138
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_local.py +0 -76
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_louvain.py +0 -264
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_lukes.py +0 -152
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_modularity_max.py +0 -340
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_quality.py +0 -139
- package/runtime/python/okstra_vendor/networkx/algorithms/community/tests/test_utils.py +0 -26
- package/runtime/python/okstra_vendor/networkx/algorithms/components/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/components/tests/test_attracting.py +0 -70
- package/runtime/python/okstra_vendor/networkx/algorithms/components/tests/test_biconnected.py +0 -248
- package/runtime/python/okstra_vendor/networkx/algorithms/components/tests/test_connected.py +0 -138
- package/runtime/python/okstra_vendor/networkx/algorithms/components/tests/test_semiconnected.py +0 -55
- package/runtime/python/okstra_vendor/networkx/algorithms/components/tests/test_strongly_connected.py +0 -193
- package/runtime/python/okstra_vendor/networkx/algorithms/components/tests/test_weakly_connected.py +0 -96
- package/runtime/python/okstra_vendor/networkx/algorithms/connectivity/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/connectivity/tests/test_connectivity.py +0 -421
- package/runtime/python/okstra_vendor/networkx/algorithms/connectivity/tests/test_cuts.py +0 -309
- package/runtime/python/okstra_vendor/networkx/algorithms/connectivity/tests/test_disjoint_paths.py +0 -249
- package/runtime/python/okstra_vendor/networkx/algorithms/connectivity/tests/test_edge_augmentation.py +0 -502
- package/runtime/python/okstra_vendor/networkx/algorithms/connectivity/tests/test_edge_kcomponents.py +0 -488
- package/runtime/python/okstra_vendor/networkx/algorithms/connectivity/tests/test_kcomponents.py +0 -323
- package/runtime/python/okstra_vendor/networkx/algorithms/connectivity/tests/test_kcutsets.py +0 -280
- package/runtime/python/okstra_vendor/networkx/algorithms/connectivity/tests/test_stoer_wagner.py +0 -102
- package/runtime/python/okstra_vendor/networkx/algorithms/flow/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/flow/tests/gl1.gpickle.bz2 +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/flow/tests/gw1.gpickle.bz2 +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/flow/tests/netgen-2.gpickle.bz2 +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/flow/tests/test_gomory_hu.py +0 -128
- package/runtime/python/okstra_vendor/networkx/algorithms/flow/tests/test_maxflow.py +0 -573
- package/runtime/python/okstra_vendor/networkx/algorithms/flow/tests/test_maxflow_large_graph.py +0 -155
- package/runtime/python/okstra_vendor/networkx/algorithms/flow/tests/test_mincost.py +0 -475
- package/runtime/python/okstra_vendor/networkx/algorithms/flow/tests/test_networksimplex.py +0 -481
- package/runtime/python/okstra_vendor/networkx/algorithms/flow/tests/wlm3.gpickle.bz2 +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/iso_r01_s80.A99 +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/iso_r01_s80.B99 +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/si2_b06_m200.A99 +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/si2_b06_m200.B99 +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/test_ismags.py +0 -719
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/test_isomorphism.py +0 -103
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/test_isomorphvf2.py +0 -490
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/test_match_helpers.py +0 -64
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/test_temporalisomorphvf2.py +0 -212
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/test_tree_isomorphism.py +0 -202
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/test_vf2pp.py +0 -1655
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/test_vf2pp_helpers.py +0 -3118
- package/runtime/python/okstra_vendor/networkx/algorithms/isomorphism/tests/test_vf2userfunc.py +0 -196
- package/runtime/python/okstra_vendor/networkx/algorithms/link_analysis/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/link_analysis/tests/test_hits.py +0 -77
- package/runtime/python/okstra_vendor/networkx/algorithms/link_analysis/tests/test_pagerank.py +0 -213
- package/runtime/python/okstra_vendor/networkx/algorithms/minors/tests/test_contraction.py +0 -544
- package/runtime/python/okstra_vendor/networkx/algorithms/operators/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/operators/tests/test_all.py +0 -328
- package/runtime/python/okstra_vendor/networkx/algorithms/operators/tests/test_binary.py +0 -451
- package/runtime/python/okstra_vendor/networkx/algorithms/operators/tests/test_product.py +0 -491
- package/runtime/python/okstra_vendor/networkx/algorithms/operators/tests/test_unary.py +0 -55
- package/runtime/python/okstra_vendor/networkx/algorithms/shortest_paths/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/shortest_paths/tests/test_astar.py +0 -254
- package/runtime/python/okstra_vendor/networkx/algorithms/shortest_paths/tests/test_dense.py +0 -212
- package/runtime/python/okstra_vendor/networkx/algorithms/shortest_paths/tests/test_dense_numpy.py +0 -88
- package/runtime/python/okstra_vendor/networkx/algorithms/shortest_paths/tests/test_generic.py +0 -511
- package/runtime/python/okstra_vendor/networkx/algorithms/shortest_paths/tests/test_unweighted.py +0 -149
- package/runtime/python/okstra_vendor/networkx/algorithms/shortest_paths/tests/test_weighted.py +0 -983
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_asteroidal.py +0 -23
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_boundary.py +0 -154
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_bridges.py +0 -144
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_broadcasting.py +0 -109
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_chains.py +0 -136
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_chordal.py +0 -129
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_clique.py +0 -300
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_cluster.py +0 -678
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_communicability.py +0 -80
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_core.py +0 -266
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_covering.py +0 -85
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_cuts.py +0 -171
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_cycles.py +0 -984
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_d_separation.py +0 -340
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_dag.py +0 -835
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_distance_measures.py +0 -831
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_distance_regular.py +0 -85
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_dominance.py +0 -299
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_dominating.py +0 -115
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_efficiency.py +0 -58
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_euler.py +0 -314
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_graph_hashing.py +0 -872
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_graphical.py +0 -163
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_hierarchy.py +0 -46
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_hybrid.py +0 -24
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_isolate.py +0 -26
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_link_prediction.py +0 -615
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_lowest_common_ancestors.py +0 -459
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_matching.py +0 -556
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_max_weight_clique.py +0 -179
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_mis.py +0 -62
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_moral.py +0 -15
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_node_classification.py +0 -140
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_non_randomness.py +0 -60
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_perfect_graph.py +0 -27
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_planar_drawing.py +0 -274
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_planarity.py +0 -556
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_polynomials.py +0 -57
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_reciprocity.py +0 -37
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_regular.py +0 -88
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_richclub.py +0 -149
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_similarity.py +0 -1158
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_simple_paths.py +0 -803
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_smallworld.py +0 -76
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_smetric.py +0 -8
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_sparsifiers.py +0 -138
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_structuralholes.py +0 -191
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_summarization.py +0 -642
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_swap.py +0 -179
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_threshold.py +0 -270
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_time_dependent.py +0 -431
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_tournament.py +0 -161
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_triads.py +0 -248
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_vitality.py +0 -41
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_voronoi.py +0 -103
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_walks.py +0 -54
- package/runtime/python/okstra_vendor/networkx/algorithms/tests/test_wiener.py +0 -157
- package/runtime/python/okstra_vendor/networkx/algorithms/traversal/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/traversal/tests/test_beamsearch.py +0 -25
- package/runtime/python/okstra_vendor/networkx/algorithms/traversal/tests/test_bfs.py +0 -203
- package/runtime/python/okstra_vendor/networkx/algorithms/traversal/tests/test_dfs.py +0 -307
- package/runtime/python/okstra_vendor/networkx/algorithms/traversal/tests/test_edgebfs.py +0 -147
- package/runtime/python/okstra_vendor/networkx/algorithms/traversal/tests/test_edgedfs.py +0 -131
- package/runtime/python/okstra_vendor/networkx/algorithms/tree/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/algorithms/tree/tests/test_branchings.py +0 -624
- package/runtime/python/okstra_vendor/networkx/algorithms/tree/tests/test_coding.py +0 -114
- package/runtime/python/okstra_vendor/networkx/algorithms/tree/tests/test_decomposition.py +0 -79
- package/runtime/python/okstra_vendor/networkx/algorithms/tree/tests/test_distance_measures.py +0 -99
- package/runtime/python/okstra_vendor/networkx/algorithms/tree/tests/test_mst.py +0 -934
- package/runtime/python/okstra_vendor/networkx/algorithms/tree/tests/test_operations.py +0 -53
- package/runtime/python/okstra_vendor/networkx/algorithms/tree/tests/test_recognition.py +0 -174
- package/runtime/python/okstra_vendor/networkx/classes/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/classes/tests/dispatch_interface.py +0 -192
- package/runtime/python/okstra_vendor/networkx/classes/tests/historical_tests.py +0 -476
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_coreviews.py +0 -362
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_digraph.py +0 -331
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_digraph_historical.py +0 -110
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_filters.py +0 -177
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_function.py +0 -1045
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_graph.py +0 -950
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_graph_historical.py +0 -12
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_graphviews.py +0 -349
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_multidigraph.py +0 -459
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_multigraph.py +0 -528
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_reportviews.py +0 -1421
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_special.py +0 -131
- package/runtime/python/okstra_vendor/networkx/classes/tests/test_subgraphviews.py +0 -371
- package/runtime/python/okstra_vendor/networkx/conftest.py +0 -261
- package/runtime/python/okstra_vendor/networkx/drawing/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/drawing/tests/baseline/test_display_complex.png +0 -0
- package/runtime/python/okstra_vendor/networkx/drawing/tests/baseline/test_display_empty_graph.png +0 -0
- package/runtime/python/okstra_vendor/networkx/drawing/tests/baseline/test_display_house_with_colors.png +0 -0
- package/runtime/python/okstra_vendor/networkx/drawing/tests/baseline/test_display_labels_and_colors.png +0 -0
- package/runtime/python/okstra_vendor/networkx/drawing/tests/baseline/test_display_shortest_path.png +0 -0
- package/runtime/python/okstra_vendor/networkx/drawing/tests/baseline/test_house_with_colors.png +0 -0
- package/runtime/python/okstra_vendor/networkx/drawing/tests/test_agraph.py +0 -237
- package/runtime/python/okstra_vendor/networkx/drawing/tests/test_image_comparison_pylab_mpl.py +0 -229
- package/runtime/python/okstra_vendor/networkx/drawing/tests/test_latex.py +0 -285
- package/runtime/python/okstra_vendor/networkx/drawing/tests/test_layout.py +0 -631
- package/runtime/python/okstra_vendor/networkx/drawing/tests/test_pydot.py +0 -146
- package/runtime/python/okstra_vendor/networkx/drawing/tests/test_pylab.py +0 -1582
- package/runtime/python/okstra_vendor/networkx/generators/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_atlas.py +0 -75
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_classic.py +0 -642
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_cographs.py +0 -20
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_community.py +0 -362
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_degree_seq.py +0 -224
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_directed.py +0 -189
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_duplication.py +0 -103
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_ego.py +0 -39
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_expanders.py +0 -182
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_geometric.py +0 -488
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_harary_graph.py +0 -133
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_internet_as_graphs.py +0 -221
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_intersection.py +0 -28
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_interval_graph.py +0 -144
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_joint_degree_seq.py +0 -125
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_lattice.py +0 -264
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_line.py +0 -316
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_mycielski.py +0 -30
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_nonisomorphic_trees.py +0 -82
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_random_clustered.py +0 -33
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_random_graphs.py +0 -495
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_small.py +0 -220
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_spectral_graph_forge.py +0 -49
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_stochastic.py +0 -72
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_sudoku.py +0 -92
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_time_series.py +0 -64
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_trees.py +0 -195
- package/runtime/python/okstra_vendor/networkx/generators/tests/test_triads.py +0 -15
- package/runtime/python/okstra_vendor/networkx/linalg/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/linalg/tests/test_algebraic_connectivity.py +0 -400
- package/runtime/python/okstra_vendor/networkx/linalg/tests/test_attrmatrix.py +0 -108
- package/runtime/python/okstra_vendor/networkx/linalg/tests/test_bethehessian.py +0 -40
- package/runtime/python/okstra_vendor/networkx/linalg/tests/test_graphmatrix.py +0 -275
- package/runtime/python/okstra_vendor/networkx/linalg/tests/test_laplacian.py +0 -334
- package/runtime/python/okstra_vendor/networkx/linalg/tests/test_modularity.py +0 -86
- package/runtime/python/okstra_vendor/networkx/linalg/tests/test_spectrum.py +0 -70
- package/runtime/python/okstra_vendor/networkx/readwrite/json_graph/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/readwrite/json_graph/tests/test_adjacency.py +0 -78
- package/runtime/python/okstra_vendor/networkx/readwrite/json_graph/tests/test_cytoscape.py +0 -78
- package/runtime/python/okstra_vendor/networkx/readwrite/json_graph/tests/test_node_link.py +0 -109
- package/runtime/python/okstra_vendor/networkx/readwrite/json_graph/tests/test_tree.py +0 -48
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_adjlist.py +0 -354
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_edgelist.py +0 -318
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_gexf.py +0 -612
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_gml.py +0 -744
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_graph6.py +0 -181
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_graphml.py +0 -1531
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_leda.py +0 -30
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_p2g.py +0 -63
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_pajek.py +0 -128
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_sparse6.py +0 -166
- package/runtime/python/okstra_vendor/networkx/readwrite/tests/test_text.py +0 -1742
- package/runtime/python/okstra_vendor/networkx/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/tests/test_all_random_functions.py +0 -248
- package/runtime/python/okstra_vendor/networkx/tests/test_convert.py +0 -321
- package/runtime/python/okstra_vendor/networkx/tests/test_convert_numpy.py +0 -531
- package/runtime/python/okstra_vendor/networkx/tests/test_convert_pandas.py +0 -349
- package/runtime/python/okstra_vendor/networkx/tests/test_convert_scipy.py +0 -281
- package/runtime/python/okstra_vendor/networkx/tests/test_exceptions.py +0 -40
- package/runtime/python/okstra_vendor/networkx/tests/test_import.py +0 -11
- package/runtime/python/okstra_vendor/networkx/tests/test_lazy_imports.py +0 -96
- package/runtime/python/okstra_vendor/networkx/tests/test_relabel.py +0 -349
- package/runtime/python/okstra_vendor/networkx/tests/test_removed_functions_exception_messages.py +0 -8
- package/runtime/python/okstra_vendor/networkx/utils/tests/__init__.py +0 -0
- package/runtime/python/okstra_vendor/networkx/utils/tests/test__init.py +0 -11
- package/runtime/python/okstra_vendor/networkx/utils/tests/test_backends.py +0 -225
- package/runtime/python/okstra_vendor/networkx/utils/tests/test_config.py +0 -263
- package/runtime/python/okstra_vendor/networkx/utils/tests/test_decorators.py +0 -510
- package/runtime/python/okstra_vendor/networkx/utils/tests/test_heaps.py +0 -131
- package/runtime/python/okstra_vendor/networkx/utils/tests/test_mapped_queue.py +0 -268
- package/runtime/python/okstra_vendor/networkx/utils/tests/test_misc.py +0 -393
- package/runtime/python/okstra_vendor/networkx/utils/tests/test_random_sequence.py +0 -53
- package/runtime/python/okstra_vendor/networkx/utils/tests/test_rcm.py +0 -63
- package/runtime/python/okstra_vendor/networkx/utils/tests/test_unionfind.py +0 -55
|
@@ -1,502 +0,0 @@
|
|
|
1
|
-
import itertools as it
|
|
2
|
-
import random
|
|
3
|
-
|
|
4
|
-
import pytest
|
|
5
|
-
|
|
6
|
-
import networkx as nx
|
|
7
|
-
from networkx.algorithms.connectivity import k_edge_augmentation
|
|
8
|
-
from networkx.algorithms.connectivity.edge_augmentation import (
|
|
9
|
-
_unpack_available_edges,
|
|
10
|
-
collapse,
|
|
11
|
-
complement_edges,
|
|
12
|
-
is_k_edge_connected,
|
|
13
|
-
is_locally_k_edge_connected,
|
|
14
|
-
)
|
|
15
|
-
from networkx.utils import pairwise
|
|
16
|
-
|
|
17
|
-
# This should be set to the largest k for which an efficient algorithm is
|
|
18
|
-
# explicitly defined.
|
|
19
|
-
MAX_EFFICIENT_K = 2
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
def tarjan_bridge_graph():
|
|
23
|
-
# graph from tarjan paper
|
|
24
|
-
# RE Tarjan - "A note on finding the bridges of a graph"
|
|
25
|
-
# Information Processing Letters, 1974 - Elsevier
|
|
26
|
-
# doi:10.1016/0020-0190(74)90003-9.
|
|
27
|
-
# define 2-connected components and bridges
|
|
28
|
-
ccs = [
|
|
29
|
-
(1, 2, 4, 3, 1, 4),
|
|
30
|
-
(5, 6, 7, 5),
|
|
31
|
-
(8, 9, 10, 8),
|
|
32
|
-
(17, 18, 16, 15, 17),
|
|
33
|
-
(11, 12, 14, 13, 11, 14),
|
|
34
|
-
]
|
|
35
|
-
bridges = [(4, 8), (3, 5), (3, 17)]
|
|
36
|
-
G = nx.Graph(it.chain(*(pairwise(path) for path in ccs + bridges)))
|
|
37
|
-
return G
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
def test_weight_key():
|
|
41
|
-
G = nx.Graph()
|
|
42
|
-
G.add_nodes_from([1, 2, 3, 4, 5, 6, 7, 8, 9])
|
|
43
|
-
G.add_edges_from([(3, 8), (1, 2), (2, 3)])
|
|
44
|
-
impossible = {(3, 6), (3, 9)}
|
|
45
|
-
rng = random.Random(0)
|
|
46
|
-
avail_uv = list(set(complement_edges(G)) - impossible)
|
|
47
|
-
avail = [(u, v, {"cost": rng.random()}) for u, v in avail_uv]
|
|
48
|
-
|
|
49
|
-
_augment_and_check(G, k=1)
|
|
50
|
-
_augment_and_check(G, k=1, avail=avail_uv)
|
|
51
|
-
_augment_and_check(G, k=1, avail=avail, weight="cost")
|
|
52
|
-
|
|
53
|
-
_check_augmentations(G, avail, weight="cost")
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
def test_is_locally_k_edge_connected_exceptions():
|
|
57
|
-
pytest.raises(nx.NetworkXNotImplemented, is_k_edge_connected, nx.DiGraph(), k=0)
|
|
58
|
-
pytest.raises(nx.NetworkXNotImplemented, is_k_edge_connected, nx.MultiGraph(), k=0)
|
|
59
|
-
pytest.raises(ValueError, is_k_edge_connected, nx.Graph(), k=0)
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
def test_is_k_edge_connected():
|
|
63
|
-
G = nx.barbell_graph(10, 0)
|
|
64
|
-
assert is_k_edge_connected(G, k=1)
|
|
65
|
-
assert not is_k_edge_connected(G, k=2)
|
|
66
|
-
|
|
67
|
-
G = nx.Graph()
|
|
68
|
-
G.add_nodes_from([5, 15])
|
|
69
|
-
assert not is_k_edge_connected(G, k=1)
|
|
70
|
-
assert not is_k_edge_connected(G, k=2)
|
|
71
|
-
|
|
72
|
-
G = nx.complete_graph(5)
|
|
73
|
-
assert is_k_edge_connected(G, k=1)
|
|
74
|
-
assert is_k_edge_connected(G, k=2)
|
|
75
|
-
assert is_k_edge_connected(G, k=3)
|
|
76
|
-
assert is_k_edge_connected(G, k=4)
|
|
77
|
-
|
|
78
|
-
G = nx.compose(nx.complete_graph([0, 1, 2]), nx.complete_graph([3, 4, 5]))
|
|
79
|
-
assert not is_k_edge_connected(G, k=1)
|
|
80
|
-
assert not is_k_edge_connected(G, k=2)
|
|
81
|
-
assert not is_k_edge_connected(G, k=3)
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
def test_is_k_edge_connected_exceptions():
|
|
85
|
-
pytest.raises(
|
|
86
|
-
nx.NetworkXNotImplemented, is_locally_k_edge_connected, nx.DiGraph(), 1, 2, k=0
|
|
87
|
-
)
|
|
88
|
-
pytest.raises(
|
|
89
|
-
nx.NetworkXNotImplemented,
|
|
90
|
-
is_locally_k_edge_connected,
|
|
91
|
-
nx.MultiGraph(),
|
|
92
|
-
1,
|
|
93
|
-
2,
|
|
94
|
-
k=0,
|
|
95
|
-
)
|
|
96
|
-
pytest.raises(ValueError, is_locally_k_edge_connected, nx.Graph(), 1, 2, k=0)
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
def test_is_locally_k_edge_connected():
|
|
100
|
-
G = nx.barbell_graph(10, 0)
|
|
101
|
-
assert is_locally_k_edge_connected(G, 5, 15, k=1)
|
|
102
|
-
assert not is_locally_k_edge_connected(G, 5, 15, k=2)
|
|
103
|
-
|
|
104
|
-
G = nx.Graph()
|
|
105
|
-
G.add_nodes_from([5, 15])
|
|
106
|
-
assert not is_locally_k_edge_connected(G, 5, 15, k=2)
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
def test_null_graph():
|
|
110
|
-
G = nx.Graph()
|
|
111
|
-
_check_augmentations(G, max_k=MAX_EFFICIENT_K + 2)
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
def test_cliques():
|
|
115
|
-
for n in range(1, 10):
|
|
116
|
-
G = nx.complete_graph(n)
|
|
117
|
-
_check_augmentations(G, max_k=MAX_EFFICIENT_K + 2)
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
def test_clique_and_node():
|
|
121
|
-
for n in range(1, 10):
|
|
122
|
-
G = nx.complete_graph(n)
|
|
123
|
-
G.add_node(n + 1)
|
|
124
|
-
_check_augmentations(G, max_k=MAX_EFFICIENT_K + 2)
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
def test_point_graph():
|
|
128
|
-
G = nx.Graph()
|
|
129
|
-
G.add_node(1)
|
|
130
|
-
_check_augmentations(G, max_k=MAX_EFFICIENT_K + 2)
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
def test_edgeless_graph():
|
|
134
|
-
G = nx.Graph()
|
|
135
|
-
G.add_nodes_from([1, 2, 3, 4])
|
|
136
|
-
_check_augmentations(G)
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
def test_invalid_k():
|
|
140
|
-
G = nx.Graph()
|
|
141
|
-
pytest.raises(ValueError, list, k_edge_augmentation(G, k=-1))
|
|
142
|
-
pytest.raises(ValueError, list, k_edge_augmentation(G, k=0))
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
def test_unfeasible():
|
|
146
|
-
G = tarjan_bridge_graph()
|
|
147
|
-
pytest.raises(nx.NetworkXUnfeasible, list, k_edge_augmentation(G, k=1, avail=[]))
|
|
148
|
-
|
|
149
|
-
pytest.raises(nx.NetworkXUnfeasible, list, k_edge_augmentation(G, k=2, avail=[]))
|
|
150
|
-
|
|
151
|
-
pytest.raises(
|
|
152
|
-
nx.NetworkXUnfeasible, list, k_edge_augmentation(G, k=2, avail=[(7, 9)])
|
|
153
|
-
)
|
|
154
|
-
|
|
155
|
-
# partial solutions should not error if real solutions are infeasible
|
|
156
|
-
aug_edges = list(k_edge_augmentation(G, k=2, avail=[(7, 9)], partial=True))
|
|
157
|
-
assert aug_edges == [(7, 9)]
|
|
158
|
-
|
|
159
|
-
_check_augmentations(G, avail=[], max_k=MAX_EFFICIENT_K + 2)
|
|
160
|
-
|
|
161
|
-
_check_augmentations(G, avail=[(7, 9)], max_k=MAX_EFFICIENT_K + 2)
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
def test_tarjan():
|
|
165
|
-
G = tarjan_bridge_graph()
|
|
166
|
-
|
|
167
|
-
aug_edges = set(_augment_and_check(G, k=2)[0])
|
|
168
|
-
print(f"aug_edges = {aug_edges!r}")
|
|
169
|
-
# can't assert edge exactly equality due to non-determinant edge order
|
|
170
|
-
# but we do know the size of the solution must be 3
|
|
171
|
-
assert len(aug_edges) == 3
|
|
172
|
-
|
|
173
|
-
avail = [
|
|
174
|
-
(9, 7),
|
|
175
|
-
(8, 5),
|
|
176
|
-
(2, 10),
|
|
177
|
-
(6, 13),
|
|
178
|
-
(11, 18),
|
|
179
|
-
(1, 17),
|
|
180
|
-
(2, 3),
|
|
181
|
-
(16, 17),
|
|
182
|
-
(18, 14),
|
|
183
|
-
(15, 14),
|
|
184
|
-
]
|
|
185
|
-
aug_edges = set(_augment_and_check(G, avail=avail, k=2)[0])
|
|
186
|
-
|
|
187
|
-
# Can't assert exact length since approximation depends on the order of a
|
|
188
|
-
# dict traversal.
|
|
189
|
-
assert len(aug_edges) <= 3 * 2
|
|
190
|
-
|
|
191
|
-
_check_augmentations(G, avail)
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
def test_configuration():
|
|
195
|
-
# seeds = [2718183590, 2470619828, 1694705158, 3001036531, 2401251497]
|
|
196
|
-
seeds = [1001, 1002, 1003, 1004]
|
|
197
|
-
for seed in seeds:
|
|
198
|
-
deg_seq = nx.random_powerlaw_tree_sequence(20, seed=seed, tries=5000)
|
|
199
|
-
G = nx.Graph(nx.configuration_model(deg_seq, seed=seed))
|
|
200
|
-
G.remove_edges_from(nx.selfloop_edges(G))
|
|
201
|
-
_check_augmentations(G)
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
def test_shell():
|
|
205
|
-
# seeds = [2057382236, 3331169846, 1840105863, 476020778, 2247498425]
|
|
206
|
-
seeds = [18]
|
|
207
|
-
for seed in seeds:
|
|
208
|
-
constructor = [(12, 70, 0.8), (15, 40, 0.6)]
|
|
209
|
-
G = nx.random_shell_graph(constructor, seed=seed)
|
|
210
|
-
_check_augmentations(G)
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
def test_karate():
|
|
214
|
-
G = nx.karate_club_graph()
|
|
215
|
-
_check_augmentations(G)
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
def test_star():
|
|
219
|
-
G = nx.star_graph(3)
|
|
220
|
-
_check_augmentations(G)
|
|
221
|
-
|
|
222
|
-
G = nx.star_graph(5)
|
|
223
|
-
_check_augmentations(G)
|
|
224
|
-
|
|
225
|
-
G = nx.star_graph(10)
|
|
226
|
-
_check_augmentations(G)
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
def test_barbell():
|
|
230
|
-
G = nx.barbell_graph(5, 0)
|
|
231
|
-
_check_augmentations(G)
|
|
232
|
-
|
|
233
|
-
G = nx.barbell_graph(5, 2)
|
|
234
|
-
_check_augmentations(G)
|
|
235
|
-
|
|
236
|
-
G = nx.barbell_graph(5, 3)
|
|
237
|
-
_check_augmentations(G)
|
|
238
|
-
|
|
239
|
-
G = nx.barbell_graph(5, 4)
|
|
240
|
-
_check_augmentations(G)
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
def test_bridge():
|
|
244
|
-
G = nx.Graph([(2393, 2257), (2393, 2685), (2685, 2257), (1758, 2257)])
|
|
245
|
-
_check_augmentations(G)
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
def test_gnp_augmentation():
|
|
249
|
-
rng = random.Random(0)
|
|
250
|
-
G = nx.gnp_random_graph(30, 0.005, seed=0)
|
|
251
|
-
# Randomly make edges available
|
|
252
|
-
avail = {
|
|
253
|
-
(u, v): 1 + rng.random() for u, v in complement_edges(G) if rng.random() < 0.25
|
|
254
|
-
}
|
|
255
|
-
_check_augmentations(G, avail)
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
def _assert_solution_properties(G, aug_edges, avail_dict=None):
|
|
259
|
-
"""Checks that aug_edges are consistently formatted"""
|
|
260
|
-
if avail_dict is not None:
|
|
261
|
-
assert all(e in avail_dict for e in aug_edges), (
|
|
262
|
-
"when avail is specified aug-edges should be in avail"
|
|
263
|
-
)
|
|
264
|
-
|
|
265
|
-
unique_aug = set(map(tuple, map(sorted, aug_edges)))
|
|
266
|
-
unique_aug = list(map(tuple, map(sorted, aug_edges)))
|
|
267
|
-
assert len(aug_edges) == len(unique_aug), "edges should be unique"
|
|
268
|
-
|
|
269
|
-
assert not any(u == v for u, v in unique_aug), "should be no self-edges"
|
|
270
|
-
|
|
271
|
-
assert not any(G.has_edge(u, v) for u, v in unique_aug), (
|
|
272
|
-
"aug edges and G.edges should be disjoint"
|
|
273
|
-
)
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
def _augment_and_check(
|
|
277
|
-
G, k, avail=None, weight=None, verbose=False, orig_k=None, max_aug_k=None
|
|
278
|
-
):
|
|
279
|
-
"""
|
|
280
|
-
Does one specific augmentation and checks for properties of the result
|
|
281
|
-
"""
|
|
282
|
-
if orig_k is None:
|
|
283
|
-
try:
|
|
284
|
-
orig_k = nx.edge_connectivity(G)
|
|
285
|
-
except nx.NetworkXPointlessConcept:
|
|
286
|
-
orig_k = 0
|
|
287
|
-
info = {}
|
|
288
|
-
try:
|
|
289
|
-
if avail is not None:
|
|
290
|
-
# ensure avail is in dict form
|
|
291
|
-
avail_dict = dict(zip(*_unpack_available_edges(avail, weight=weight)))
|
|
292
|
-
else:
|
|
293
|
-
avail_dict = None
|
|
294
|
-
try:
|
|
295
|
-
# Find the augmentation if possible
|
|
296
|
-
generator = nx.k_edge_augmentation(G, k=k, weight=weight, avail=avail)
|
|
297
|
-
assert not isinstance(generator, list), "should always return an iter"
|
|
298
|
-
aug_edges = []
|
|
299
|
-
for edge in generator:
|
|
300
|
-
aug_edges.append(edge)
|
|
301
|
-
except nx.NetworkXUnfeasible:
|
|
302
|
-
infeasible = True
|
|
303
|
-
info["infeasible"] = True
|
|
304
|
-
assert len(aug_edges) == 0, "should not generate anything if unfeasible"
|
|
305
|
-
|
|
306
|
-
if avail is None:
|
|
307
|
-
n_nodes = G.number_of_nodes()
|
|
308
|
-
assert n_nodes <= k, (
|
|
309
|
-
"unconstrained cases are only unfeasible if |V| <= k. "
|
|
310
|
-
f"Got |V|={n_nodes} and k={k}"
|
|
311
|
-
)
|
|
312
|
-
else:
|
|
313
|
-
if max_aug_k is None:
|
|
314
|
-
G_aug_all = G.copy()
|
|
315
|
-
G_aug_all.add_edges_from(avail_dict.keys())
|
|
316
|
-
try:
|
|
317
|
-
max_aug_k = nx.edge_connectivity(G_aug_all)
|
|
318
|
-
except nx.NetworkXPointlessConcept:
|
|
319
|
-
max_aug_k = 0
|
|
320
|
-
|
|
321
|
-
assert max_aug_k < k, (
|
|
322
|
-
"avail should only be unfeasible if using all edges "
|
|
323
|
-
"does not achieve k-edge-connectivity"
|
|
324
|
-
)
|
|
325
|
-
|
|
326
|
-
# Test for a partial solution
|
|
327
|
-
partial_edges = list(
|
|
328
|
-
nx.k_edge_augmentation(G, k=k, weight=weight, partial=True, avail=avail)
|
|
329
|
-
)
|
|
330
|
-
|
|
331
|
-
info["n_partial_edges"] = len(partial_edges)
|
|
332
|
-
|
|
333
|
-
if avail_dict is None:
|
|
334
|
-
assert set(partial_edges) == set(complement_edges(G)), (
|
|
335
|
-
"unweighted partial solutions should be the complement"
|
|
336
|
-
)
|
|
337
|
-
elif len(avail_dict) > 0:
|
|
338
|
-
H = G.copy()
|
|
339
|
-
|
|
340
|
-
# Find the partial / full augmented connectivity
|
|
341
|
-
H.add_edges_from(partial_edges)
|
|
342
|
-
partial_conn = nx.edge_connectivity(H)
|
|
343
|
-
|
|
344
|
-
H.add_edges_from(set(avail_dict.keys()))
|
|
345
|
-
full_conn = nx.edge_connectivity(H)
|
|
346
|
-
|
|
347
|
-
# Full connectivity should be no better than our partial
|
|
348
|
-
# solution.
|
|
349
|
-
assert partial_conn == full_conn, (
|
|
350
|
-
"adding more edges should not increase k-conn"
|
|
351
|
-
)
|
|
352
|
-
|
|
353
|
-
# Find the new edge-connectivity after adding the augmenting edges
|
|
354
|
-
aug_edges = partial_edges
|
|
355
|
-
else:
|
|
356
|
-
infeasible = False
|
|
357
|
-
|
|
358
|
-
# Find the weight of the augmentation
|
|
359
|
-
num_edges = len(aug_edges)
|
|
360
|
-
if avail is not None:
|
|
361
|
-
total_weight = sum(avail_dict[e] for e in aug_edges)
|
|
362
|
-
else:
|
|
363
|
-
total_weight = num_edges
|
|
364
|
-
|
|
365
|
-
info["total_weight"] = total_weight
|
|
366
|
-
info["num_edges"] = num_edges
|
|
367
|
-
|
|
368
|
-
# Find the new edge-connectivity after adding the augmenting edges
|
|
369
|
-
G_aug = G.copy()
|
|
370
|
-
G_aug.add_edges_from(aug_edges)
|
|
371
|
-
try:
|
|
372
|
-
aug_k = nx.edge_connectivity(G_aug)
|
|
373
|
-
except nx.NetworkXPointlessConcept:
|
|
374
|
-
aug_k = 0
|
|
375
|
-
info["aug_k"] = aug_k
|
|
376
|
-
|
|
377
|
-
# Do checks
|
|
378
|
-
if not infeasible and orig_k < k:
|
|
379
|
-
assert info["aug_k"] >= k, f"connectivity should increase to k={k} or more"
|
|
380
|
-
|
|
381
|
-
assert info["aug_k"] >= orig_k, "augmenting should never reduce connectivity"
|
|
382
|
-
|
|
383
|
-
_assert_solution_properties(G, aug_edges, avail_dict)
|
|
384
|
-
|
|
385
|
-
except Exception:
|
|
386
|
-
info["failed"] = True
|
|
387
|
-
print(f"edges = {list(G.edges())}")
|
|
388
|
-
print(f"nodes = {list(G.nodes())}")
|
|
389
|
-
print(f"aug_edges = {list(aug_edges)}")
|
|
390
|
-
print(f"info = {info}")
|
|
391
|
-
raise
|
|
392
|
-
else:
|
|
393
|
-
if verbose:
|
|
394
|
-
print(f"info = {info}")
|
|
395
|
-
|
|
396
|
-
if infeasible:
|
|
397
|
-
aug_edges = None
|
|
398
|
-
return aug_edges, info
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
def _check_augmentations(G, avail=None, max_k=None, weight=None, verbose=False):
|
|
402
|
-
"""Helper to check weighted/unweighted cases with multiple values of k"""
|
|
403
|
-
# Using all available edges, find the maximum edge-connectivity
|
|
404
|
-
try:
|
|
405
|
-
orig_k = nx.edge_connectivity(G)
|
|
406
|
-
except nx.NetworkXPointlessConcept:
|
|
407
|
-
orig_k = 0
|
|
408
|
-
|
|
409
|
-
if avail is not None:
|
|
410
|
-
all_aug_edges = _unpack_available_edges(avail, weight=weight)[0]
|
|
411
|
-
G_aug_all = G.copy()
|
|
412
|
-
G_aug_all.add_edges_from(all_aug_edges)
|
|
413
|
-
try:
|
|
414
|
-
max_aug_k = nx.edge_connectivity(G_aug_all)
|
|
415
|
-
except nx.NetworkXPointlessConcept:
|
|
416
|
-
max_aug_k = 0
|
|
417
|
-
else:
|
|
418
|
-
max_aug_k = G.number_of_nodes() - 1
|
|
419
|
-
|
|
420
|
-
if max_k is None:
|
|
421
|
-
max_k = min(4, max_aug_k)
|
|
422
|
-
|
|
423
|
-
avail_uniform = {e: 1 for e in complement_edges(G)}
|
|
424
|
-
|
|
425
|
-
if verbose:
|
|
426
|
-
print("\n=== CHECK_AUGMENTATION ===")
|
|
427
|
-
print(f"G.number_of_nodes = {G.number_of_nodes()!r}")
|
|
428
|
-
print(f"G.number_of_edges = {G.number_of_edges()!r}")
|
|
429
|
-
print(f"max_k = {max_k!r}")
|
|
430
|
-
print(f"max_aug_k = {max_aug_k!r}")
|
|
431
|
-
print(f"orig_k = {orig_k!r}")
|
|
432
|
-
|
|
433
|
-
# check augmentation for multiple values of k
|
|
434
|
-
for k in range(1, max_k + 1):
|
|
435
|
-
if verbose:
|
|
436
|
-
print("---------------")
|
|
437
|
-
print(f"Checking k = {k}")
|
|
438
|
-
|
|
439
|
-
# Check the unweighted version
|
|
440
|
-
if verbose:
|
|
441
|
-
print("unweighted case")
|
|
442
|
-
aug_edges1, info1 = _augment_and_check(G, k=k, verbose=verbose, orig_k=orig_k)
|
|
443
|
-
|
|
444
|
-
# Check that the weighted version with all available edges and uniform
|
|
445
|
-
# weights gives a similar solution to the unweighted case.
|
|
446
|
-
if verbose:
|
|
447
|
-
print("weighted uniform case")
|
|
448
|
-
aug_edges2, info2 = _augment_and_check(
|
|
449
|
-
G,
|
|
450
|
-
k=k,
|
|
451
|
-
avail=avail_uniform,
|
|
452
|
-
verbose=verbose,
|
|
453
|
-
orig_k=orig_k,
|
|
454
|
-
max_aug_k=G.number_of_nodes() - 1,
|
|
455
|
-
)
|
|
456
|
-
|
|
457
|
-
# Check the weighted version
|
|
458
|
-
if avail is not None:
|
|
459
|
-
if verbose:
|
|
460
|
-
print("weighted case")
|
|
461
|
-
aug_edges3, info3 = _augment_and_check(
|
|
462
|
-
G,
|
|
463
|
-
k=k,
|
|
464
|
-
avail=avail,
|
|
465
|
-
weight=weight,
|
|
466
|
-
verbose=verbose,
|
|
467
|
-
max_aug_k=max_aug_k,
|
|
468
|
-
orig_k=orig_k,
|
|
469
|
-
)
|
|
470
|
-
|
|
471
|
-
if aug_edges1 is not None:
|
|
472
|
-
# Check approximation ratios
|
|
473
|
-
if k == 1:
|
|
474
|
-
# when k=1, both solutions should be optimal
|
|
475
|
-
assert info2["total_weight"] == info1["total_weight"]
|
|
476
|
-
if k == 2:
|
|
477
|
-
# when k=2, the weighted version is an approximation
|
|
478
|
-
if orig_k == 0:
|
|
479
|
-
# the approximation ratio is 3 if G is not connected
|
|
480
|
-
assert info2["total_weight"] <= info1["total_weight"] * 3
|
|
481
|
-
else:
|
|
482
|
-
# the approximation ratio is 2 if G is was connected
|
|
483
|
-
assert info2["total_weight"] <= info1["total_weight"] * 2
|
|
484
|
-
_check_unconstrained_bridge_property(G, info1)
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
def _check_unconstrained_bridge_property(G, info1):
|
|
488
|
-
# Check Theorem 5 from Eswaran and Tarjan. (1975) Augmentation problems
|
|
489
|
-
import math
|
|
490
|
-
|
|
491
|
-
bridge_ccs = list(nx.connectivity.bridge_components(G))
|
|
492
|
-
# condense G into an forest C
|
|
493
|
-
C = collapse(G, bridge_ccs)
|
|
494
|
-
|
|
495
|
-
p = len([n for n, d in C.degree() if d == 1]) # leafs
|
|
496
|
-
q = len([n for n, d in C.degree() if d == 0]) # isolated
|
|
497
|
-
if p + q > 1:
|
|
498
|
-
size_target = math.ceil(p / 2) + q
|
|
499
|
-
size_aug = info1["num_edges"]
|
|
500
|
-
assert size_aug == size_target, (
|
|
501
|
-
"augmentation size is different from what theory predicts"
|
|
502
|
-
)
|