Skip to content

Commit cd39b32

Browse files
SebVdeSebVde
committed
Updated results for small graphs with naive method
1 parent 18a48c7 commit cd39b32

6 files changed

Lines changed: 111 additions & 182 deletions

File tree

‎Benchmark graphs/small for naive/V_10.npz‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:ac3fb6618f77b4ca3af47b6654d2195f0f42d4d27205abf2b511f48e0966555b
3-
size 1604
2+
oid sha256:893301343ab1f6c1307ed32679cffbc1e377ce88269accf26cfb85c34eef1420
3+
size 1632

‎Benchmark graphs/small for naive/V_15.npz‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:dc92317e2bb179ed8b3212e994b5c46b3d38129c5a050b9375ef4b66cb0474e6
3-
size 2628
2+
oid sha256:5fee0ea0998eb22ce77ced68d7b60a53466010f62a35e125f2f386aae086742d
3+
size 2642

‎Benchmark graphs/small for naive/V_20.npz‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:2d38d0d36751214ebb2949867bd07f08169b551298f43f851301da5834480040
3-
size 3893
2+
oid sha256:fa01e39aceaad48a7c6cdc440c2f767c371261a19d6d63681e2d7aa776011068
3+
size 3983

‎Benchmark graphs/small for naive/V_5.npz‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:66d0352bfe6373b29b177ce14c97ccffb5c9f58649226209b688f1976d782e2e
3-
size 871
2+
oid sha256:b37f64e2c589bbbb6949268ffd189899802a16315e026296197014bd834e5a9f
3+
size 868

‎Benchmark results/final_ben_small_for_naive.txt‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎run_full_benchmark.py‎

Lines changed: 103 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ def benchmark_approx_comparison(
896896
TIMEOUT_MAX = 600
897897

898898
EXACT_METHODS = [
899-
# get_decycling_number_naive,
899+
get_decycling_number_naive,
900900
get_decycling_number_razgon,
901901
get_decycling_number_fomin,
902902
get_decycling_number_xiao,
@@ -908,110 +908,110 @@ def benchmark_approx_comparison(
908908
approx_decycling_number_stanojevic,
909909
]
910910

911-
# benchmark_exact_exec_time(
912-
# directory_path="Benchmark graphs/small for naive",
913-
# methods_list=EXACT_METHODS,
914-
# timeout_seconds=TIMEOUT_MAX,
915-
# output_filename="Benchmark results/final_ben_small_for_naive.txt",
916-
# times=1,
917-
# )
918-
919-
benchmark_exact_exec_time(
920-
directory_path="Benchmark graphs/random graphs density",
921-
methods_list=EXACT_METHODS,
922-
timeout_seconds=TIMEOUT_MAX,
923-
output_filename="Benchmark results/final_ben_random_density.txt",
924-
)
925-
926-
benchmark_exact_exec_time(
927-
directory_path="Benchmark graphs/density",
928-
methods_list=EXACT_METHODS,
929-
timeout_seconds=TIMEOUT_MAX,
930-
output_filename="Benchmark results/final_ben_density.txt",
931-
)
932-
933-
benchmark_exact_exec_time(
934-
directory_path="Benchmark graphs/chromatic number",
935-
methods_list=EXACT_METHODS,
936-
timeout_seconds=TIMEOUT_MAX,
937-
output_filename="Benchmark results/final_ben_chromatic_number.txt",
938-
)
939-
940-
benchmark_exact_exec_time(
941-
directory_path="Benchmark graphs/diameter",
942-
methods_list=EXACT_METHODS,
943-
timeout_seconds=TIMEOUT_MAX,
944-
output_filename="Benchmark results/final_ben_diameter.txt",
945-
)
946-
947911
benchmark_exact_exec_time(
948-
directory_path="Benchmark graphs/domination number",
912+
directory_path="Benchmark graphs/small for naive",
949913
methods_list=EXACT_METHODS,
950914
timeout_seconds=TIMEOUT_MAX,
951-
output_filename="Benchmark results/final_ben_domination_number.txt",
915+
output_filename="Benchmark results/final_ben_small_for_naive.txt",
916+
times=1,
952917
)
953918

954-
benchmark_exact_exec_time(
955-
directory_path="Benchmark graphs/girth",
956-
methods_list=EXACT_METHODS,
957-
timeout_seconds=TIMEOUT_MAX,
958-
output_filename="Benchmark results/final_ben_girth.txt",
959-
)
960-
961-
benchmark_exact_exec_time(
962-
directory_path="Benchmark graphs/longest induced cycle",
963-
methods_list=EXACT_METHODS,
964-
timeout_seconds=TIMEOUT_MAX,
965-
output_filename="Benchmark results/final_ben_long_ind_cyc.txt",
966-
)
967-
968-
benchmark_exact_exec_time(
969-
directory_path="Benchmark graphs/radius",
970-
methods_list=EXACT_METHODS,
971-
timeout_seconds=TIMEOUT_MAX,
972-
output_filename="Benchmark results/final_ben_radius.txt",
973-
)
974-
975-
benchmark_exact_exec_time(
976-
directory_path="Benchmark graphs/treewidth",
977-
methods_list=EXACT_METHODS,
978-
timeout_seconds=TIMEOUT_MAX,
979-
output_filename="Benchmark results/final_ben_treewidth.txt",
980-
)
981-
982-
benchmark_exact_exec_time(
983-
directory_path="Benchmark graphs/vertex connectivity",
984-
methods_list=EXACT_METHODS,
985-
timeout_seconds=TIMEOUT_MAX,
986-
output_filename="Benchmark results/final_ben_vert_conn.txt",
987-
)
988-
989-
benchmark_approximation_quality(
990-
directory_path="Benchmark graphs/random graphs density",
991-
approx_methods_list=APPROX_METHODS,
992-
exact_method_func=get_decycling_number_xiao,
993-
timeout_seconds=TIMEOUT_MAX,
994-
output_filename="Benchmark results/final_ben_approx_random_density.txt",
995-
)
996-
997-
benchmark_approximation_quality(
998-
directory_path="Benchmark graphs/density",
999-
approx_methods_list=APPROX_METHODS,
1000-
exact_method_func=get_decycling_number_xiao,
1001-
timeout_seconds=TIMEOUT_MAX,
1002-
output_filename="Benchmark results/final_ben_approx_density.txt",
1003-
)
1004-
1005-
benchmark_approximation_quality_with_dn(
1006-
directory_path="Benchmark graphs/more vertices with dn",
1007-
approx_methods_list=APPROX_METHODS,
1008-
timeout_seconds=TIMEOUT_MAX,
1009-
output_filename="Benchmark results/final_ben_approx_more_v_dn.txt",
1010-
)
1011-
1012-
benchmark_approx_comparison(
1013-
directory_path="Benchmark graphs/random big",
1014-
methods_list=APPROX_METHODS,
1015-
timeout_seconds=TIMEOUT_MAX,
1016-
output_filename="Benchmark results/final_ben_approx_random_big.txt",
1017-
)
919+
# benchmark_exact_exec_time(
920+
# directory_path="Benchmark graphs/random graphs density",
921+
# methods_list=EXACT_METHODS,
922+
# timeout_seconds=TIMEOUT_MAX,
923+
# output_filename="Benchmark results/final_ben_random_density.txt",
924+
# )
925+
#
926+
# benchmark_exact_exec_time(
927+
# directory_path="Benchmark graphs/density",
928+
# methods_list=EXACT_METHODS,
929+
# timeout_seconds=TIMEOUT_MAX,
930+
# output_filename="Benchmark results/final_ben_density.txt",
931+
# )
932+
#
933+
# benchmark_exact_exec_time(
934+
# directory_path="Benchmark graphs/chromatic number",
935+
# methods_list=EXACT_METHODS,
936+
# timeout_seconds=TIMEOUT_MAX,
937+
# output_filename="Benchmark results/final_ben_chromatic_number.txt",
938+
# )
939+
#
940+
# benchmark_exact_exec_time(
941+
# directory_path="Benchmark graphs/diameter",
942+
# methods_list=EXACT_METHODS,
943+
# timeout_seconds=TIMEOUT_MAX,
944+
# output_filename="Benchmark results/final_ben_diameter.txt",
945+
# )
946+
#
947+
# benchmark_exact_exec_time(
948+
# directory_path="Benchmark graphs/domination number",
949+
# methods_list=EXACT_METHODS,
950+
# timeout_seconds=TIMEOUT_MAX,
951+
# output_filename="Benchmark results/final_ben_domination_number.txt",
952+
# )
953+
#
954+
# benchmark_exact_exec_time(
955+
# directory_path="Benchmark graphs/girth",
956+
# methods_list=EXACT_METHODS,
957+
# timeout_seconds=TIMEOUT_MAX,
958+
# output_filename="Benchmark results/final_ben_girth.txt",
959+
# )
960+
#
961+
# benchmark_exact_exec_time(
962+
# directory_path="Benchmark graphs/longest induced cycle",
963+
# methods_list=EXACT_METHODS,
964+
# timeout_seconds=TIMEOUT_MAX,
965+
# output_filename="Benchmark results/final_ben_long_ind_cyc.txt",
966+
# )
967+
#
968+
# benchmark_exact_exec_time(
969+
# directory_path="Benchmark graphs/radius",
970+
# methods_list=EXACT_METHODS,
971+
# timeout_seconds=TIMEOUT_MAX,
972+
# output_filename="Benchmark results/final_ben_radius.txt",
973+
# )
974+
#
975+
# benchmark_exact_exec_time(
976+
# directory_path="Benchmark graphs/treewidth",
977+
# methods_list=EXACT_METHODS,
978+
# timeout_seconds=TIMEOUT_MAX,
979+
# output_filename="Benchmark results/final_ben_treewidth.txt",
980+
# )
981+
#
982+
# benchmark_exact_exec_time(
983+
# directory_path="Benchmark graphs/vertex connectivity",
984+
# methods_list=EXACT_METHODS,
985+
# timeout_seconds=TIMEOUT_MAX,
986+
# output_filename="Benchmark results/final_ben_vert_conn.txt",
987+
# )
988+
#
989+
# benchmark_approximation_quality(
990+
# directory_path="Benchmark graphs/random graphs density",
991+
# approx_methods_list=APPROX_METHODS,
992+
# exact_method_func=get_decycling_number_xiao,
993+
# timeout_seconds=TIMEOUT_MAX,
994+
# output_filename="Benchmark results/final_ben_approx_random_density.txt",
995+
# )
996+
#
997+
# benchmark_approximation_quality(
998+
# directory_path="Benchmark graphs/density",
999+
# approx_methods_list=APPROX_METHODS,
1000+
# exact_method_func=get_decycling_number_xiao,
1001+
# timeout_seconds=TIMEOUT_MAX,
1002+
# output_filename="Benchmark results/final_ben_approx_density.txt",
1003+
# )
1004+
#
1005+
# benchmark_approximation_quality_with_dn(
1006+
# directory_path="Benchmark graphs/more vertices with dn",
1007+
# approx_methods_list=APPROX_METHODS,
1008+
# timeout_seconds=TIMEOUT_MAX,
1009+
# output_filename="Benchmark results/final_ben_approx_more_v_dn.txt",
1010+
# )
1011+
#
1012+
# benchmark_approx_comparison(
1013+
# directory_path="Benchmark graphs/random big",
1014+
# methods_list=APPROX_METHODS,
1015+
# timeout_seconds=TIMEOUT_MAX,
1016+
# output_filename="Benchmark results/final_ben_approx_random_big.txt",
1017+
# )

0 commit comments

Comments
 (0)