a345e45d14
2011-05-23 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/37144 PR libstdc++/28457 Interface changes for ext/pb_ds. PB_DS_BASE_C_DEC to unique PB_DS_*_BASE macros. * include/ext/pb_ds/assoc_container.hpp (container_base): Remove. (basic_hash_table, basic_branch, list_update): Derive from container_base_dispatch. * include/ext/pb_ds/list_update_policy.hpp (null_lu_metadata): Remove. (move_to_front_lu_policy): To lu_move_to_front_policy. (counter_lu_policy): To lu_counter_policy. * include/ext/pb_ds/tree_policy.hpp (null_tree_node_update): Remove. * include/ext/pb_ds/tag_and_trait.hpp (container_base_dispatch): Adjust template parameters, declare here. (null_mapped_type) Remove. (null_type): Just use this for template tricks everywhere. * include/ext/pb_ds/hash_policy.hpp (null_hash_fn, null_probe_fn): Remove. * include/ext/pb_ds/trie_policy.hpp (null_trie_node_update): Remove. (string_trie_e_access_traits): To trie_string_access_traits. * include/ext/pb_ds/priority_queue.hpp: Use container_base_dispatch. File changes. * include/Makefile.am (pb_headers): Removed and changed file names. * include/Makefile.in: Regenerated. * include/ext/pb_ds/detail/basic_types.hpp: Remove. * include/ext/pb_ds/detail/bin_search_tree_/ cond_dtor_entry_dealtor.hpp: Remove. * include/ext/pb_ds/detail/bin_search_tree_/ cond_key_dtor_entry_dealtor.hpp: Remove. * include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp: Move.. * include/ext/pb_ds/detail/binary_heap_/ point_const_iterator.hpp: ..here. * include/ext/pb_ds/detail/basic_tree_policy: Move to... * include/ext/pb_ds/detail/branch_policy: This. * include/ext/pb_ds/detail/branch_policy/ basic_tree_policy_base.hpp: Move... * include/ext/pb_ds/detail/branch_policy/branch_policy.hpp: ...here. * include/ext/pb_ds/detail/branch_policy/null_node_metadata.hpp: Add. * include/ext/pb_ds/detail/branch_policy/traits.hpp: Add. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ null_metadata.hpp: Remove. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ const_point_iterator.hpp: Move... * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ point_const_iterator.hpp: ...here. * include/ext/pb_ds/detail/list_update_policy/ counter_lu_metadata.hpp: Move.. * include/ext/pb_ds/detail/list_update_policy/ lu_counter_metadata.hpp: ...here. * include/ext/pb_ds/detail/list_update_policy/ counter_lu_policy_imp.hpp: Remove. * include/ext/pb_ds/detail/list_update_policy/ mtf_lu_policy_imp.hpp: Remove. * include/ext/pb_ds/detail/trie_policy/ string_trie_e_access_traits_imp.hpp: Move... * include/ext/pb_ds/detail/trie_policy/ sample_trie_access_traits.hpp: ...here. * include/ext/pb_ds/detail/trie_policy/ sample_trie_e_access_traits.hpp: Move... * include/ext/pb_ds/detail/trie_policy/ trie_string_access_traits_imp.hpp: ...here. * include/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp: Remove. * include/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp: Remove. * include/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp: Remove. * include/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp: New, fold all types found in the following files into pat_trie_base. * include/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/ cond_dtor_entry_dealtor.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/child_iterator.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/head.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/leaf.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/node_base.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/internal_node.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/node_iterators.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/point_iterators.hpp: Folded. * include/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp: Move... * include/ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp: ...here. * include/ext/pb_ds/detail/unordered_iterator/ const_point_iterator.hpp: Move... * include/ext/pb_ds/detail/unordered_iterator/ point_const_iterator.hpp: ...here. Adjust for above changes. * include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp: Same. * include/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp: Same. * include/ext/pb_ds/detail/resize_policy/ sample_resize_trigger.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/ binomial_heap_base_.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_base_/ split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/container_base_dispatch.hpp: Same. Adjust for template parameter ordering change. * include/ext/pb_ds/detail/cc_hash_table_map_/ erase_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ constructor_destructor_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ insert_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ resize_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ constructor_destructor_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ insert_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ entry_list_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ find_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ debug_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ constructor_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ cond_key_dtor_entry_dealtor.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ debug_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ erase_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ resize_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/cc_hash_table_map_/ standard_policies.hpp: Same. * include/ext/pb_ds/detail/tree_trace_base.hpp: Same. * include/ext/pb_ds/detail/unordered_iterator/iterator.hpp: Same. * include/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp: Same. * include/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/traits.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/ policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/traits.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/ split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_policy/ sample_update_policy.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ erase_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ constructor_destructor_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ insert_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ resize_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ constructor_destructor_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ insert_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ iterator_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ find_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ find_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ debug_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ constructor_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ debug_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ erase_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ resize_no_store_hash_fn_imps.hpp: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ standard_policies.hpp: Same. * include/ext/pb_ds/detail/standard_policies.hpp: Same. * include/ext/pb_ds/detail/types_traits.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/entry_pred.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/resize_policy.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp: Same. * include/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp: Same. * include/ext/pb_ds/detail/tree_policy/ sample_tree_node_update.hpp: Same. * include/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp: Same. * include/ext/pb_ds/detail/trie_policy/ sample_trie_node_update.hpp: Same. * include/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp: Same. * include/ext/pb_ds/detail/trie_policy/ prefix_search_node_update_imp.hpp: Same. * include/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp: Same. * include/ext/pb_ds/detail/cond_dealtor.hpp: Same. * include/ext/pb_ds/detail/priority_queue_base_dispatch.hpp: Same. Adjust for template parameter change, fold into container_base_dispatch. * include/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp: Same. * include/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp: Same. * include/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/type_utils.hpp: Same. * include/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp: Same. * include/ext/pb_ds/detail/eq_fn/eq_by_less.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ left_child_next_sibling_heap_.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ const_iterator.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ node.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/left_child_next_sibling_heap_/ iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/traits.hpp: Same. * include/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/debug_map_base.hpp: Same. * include/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp: Same. * include/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp: Same. * include/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp: Same. * include/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp: Same. * include/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp: Same. * include/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp: Same. * include/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/node.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp: Same. * include/ext/pb_ds/detail/splay_tree_/traits.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/ entry_metadata_base.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/lu_map_.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/ constructor_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/ rc_binomial_heap_.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp: Same. * include/ext/pb_ds/detail/rc_binomial_heap_/ split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/ constructors_destructor_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/node.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp: Same. * include/ext/pb_ds/detail/rb_tree_map_/traits.hpp: Same. Documentation changes. * include/ext/pb_ds/*: Add doxygen markup. * doc/doxygen/user.cfg.in: Add details for extracting comments from pb_ds. * scripts/run_doxygen: Fixup __gnu_pb_ds::detail. * scripts/make_graph.py: Move to svg output. Re-format generated tables. * doc/Makefile.am (stamp-html-copy): New rule. (stamp-html): Use it to copy non-generated files into html docs. * doc/Makefile.in: Regenerated. * doc/html/ext/pb_ds/sample_trie_e_access_traits.html: Move... * doc/html/ext/pb_ds/trie_string_access_traits.html: ...here. * doc/html/ext/pb_ds/string_trie_e_access_traits.html: Move.. * doc/html/ext/pb_ds/sample_trie_access_traits.html: ...here. * doc/html/ext/pb_ds/tree_text_lor_find_timing_test_local.png, hash_random_int_erase_mem_usage_test_local.png, multimap_text_insert_mem_usage_test_small_s2p_hash_local.png, tree_text_insert_timing_test_pat_trie_local.png , multimap_text_insert_mem_usage_test_small_s2p_tree_local.png , priority_queue_text_modify_down_timing_test_local.png, gp_hash_random_int_subscript_timing_test_find_local.png, text_find_timing_test_hash_local.png, multimap_text_insert_timing_test_small_s2p_hash_local.png, multimap_text_insert_timing_test_small_s2p_tree_local.png, multimap_text_insert_mem_usage_test_large_s2p_hash_local.png, multimap_text_insert_mem_usage_test_large_s2p_tree_local.png, multimap_text_insert_timing_test_large_s2p_hash_local.png, hash_zlob_random_int_find_timing_test_local.png, multimap_text_insert_timing_test_large_s2p_tree_local.png, binary_priority_queue_random_int_push_timing_test_local.png, priority_queue_text_pop_mem_usage_test_local.png, priority_queue_text_modify_down_timing_test_pairing_thin_local.png, tree_split_join_timing_test_local.png, multimap_text_find_timing_test_small_s2p_hash_local.png, ccgp_hash_random_int_subscript_timing_test_insert_local.png, priority_queue_random_int_push_pop_timing_test_local.png, multimap_text_find_timing_test_small_s2p_tree_local.png, gp_hash_random_int_subscript_timing_test_insert_local.png, priority_queue_text_push_timing_test_local.png, cc_hash_random_int_subscript_timing_test_find_local.png, tree_text_insert_timing_test_vector_tree_local.png, multimap_text_find_timing_test_large_s2p_hash_local.png, pairing_priority_queue_text_push_timing_test_local.png, tree_order_statistics_timing_test_local.png, priority_queue_text_push_pop_timing_test_local.png, text_find_timing_test_tree_like_local.png, multimap_text_find_timing_test_large_s2p_tree_local.png, priority_queue_text_modify_up_timing_test_pairing_thin_local.png, cc_hash_random_int_subscript_timing_test_insert_local.png, priority_queue_text_modify_up_timing_test_local.png, random_int_find_find_timing_test_tree_local.png, priority_queue_random_int_push_timing_test_local.png, tree_text_insert_timing_test_node_tree_local.png, pairing_priority_queue_text_push_pop_timing_test_local.png, gp_hash_random_int_find_timing_test_local.png, cc_hash_random_int_find_timing_test_local.png, priority_queue_text_join_timing_test_local.png: Update local pngs. Testsuite changes. * testsuite/ext/pb_ds/regression/tree_no_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/tree_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/priority_queue_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/trie_no_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/trie_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/list_update_no_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/list_update_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/hash_no_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/hash_data_map_rand_debug.cc: New. * testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc: Fix typo. * testsuite/ext/pb_ds/example/basic_set.cc: Update. * testsuite/ext/pb_ds/example/ranged_hash.cc: Same. * testsuite/ext/pb_ds/example/tree_order_statistics.cc: Same. * testsuite/ext/pb_ds/example/trie_prefix_search.cc: Same. * testsuite/ext/pb_ds/example/trie_dna.cc: Same. * testsuite/ext/pb_ds/example/tree_intervals.cc: Same. * testsuite/ext/pb_ds/example/basic_multimap.cc: Same. * testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc: Same. * testsuite/performance/ext/pb_ds/tree_split_join_timing.cc: Same. * testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc: Same. * testsuite/data/make_graph_test_infos.xml: Same. * testsuite/util/regression/common_type.hpp: Same. * testsuite/util/regression/trait/assoc/native_type_trait.hpp: Same. * testsuite/util/regression/trait/assoc/trait.hpp: Same. * testsuite/util/regression/trait/assoc/type_trait.hpp: Same. * testsuite/util/regression/rand/priority_queue/ rand_regression_test.hpp: Same. * testsuite/util/regression/rand/priority_queue/ container_rand_regression_test.tcc: Same. * testsuite/util/regression/rand/assoc/rand_regression_test.hpp: Same. * testsuite/util/regression/rand/assoc/container_rand_regression_test.h * testsuite/util/regression/rand/assoc/ container_rand_regression_test.tcc: Same. * testsuite/util/native_type/native_priority_queue.hpp: Same. * testsuite/util/native_type/native_multimap.hpp: Same. * testsuite/util/native_type/native_hash_multimap.hpp: Same. * testsuite/util/native_type/native_set.hpp: Same. * testsuite/util/native_type/native_map.hpp: Same. * testsuite/util/native_type/native_hash_set.hpp: Same. * testsuite/util/native_type/native_hash_map.hpp: Same. * testsuite/util/testsuite_containers.h * testsuite/util/common_type/priority_queue/common_type.hpp: Same. * testsuite/util/common_type/assoc/common_type.hpp: Same. * testsuite/util/common_type/assoc/string_form.hpp: Same. * testsuite/util/common_type/assoc/template_policy.hpp: Same. * testsuite/util/common_type/assoc/detail/ trigger_policy_string_form.hpp: Same. * testsuite/util/common_type/assoc/detail/ds_string_form.hpp: Same. * testsuite/util/common_type/assoc/detail/ size_policy_string_form.hpp: Same. * testsuite/util/common_type/assoc/detail/ probe_fn_string_form.hpp: Same. * testsuite/util/common_type/assoc/detail/ tree_supports_order_statistics.hpp: Same. * testsuite/util/common_type/assoc/detail/ trie_supports_prefix_search.hpp: Same. * testsuite/util/common_type/assoc/detail/ list_update_policy_string_form.hpp: Same. * testsuite/util/common_type/assoc/detail/ trie_supports_order_statistics.hpp: Same. * testsuite/util/common_type/assoc/native_set.hpp: Same. * testsuite/util/performance/assoc/timing/common_type.hpp: Same. * testsuite/util/performance/assoc/timing/multimap_find_test.hpp: Same. * testsuite/util/performance/assoc/multimap_common_type.hpp: Same. From-SVN: r174100
583 lines
19 KiB
Python
Executable File
583 lines
19 KiB
Python
Executable File
#!/usr/bin/python
|
|
|
|
import string
|
|
import sys
|
|
import re
|
|
import os
|
|
import platform
|
|
import commands
|
|
from Numeric import *
|
|
from pychart import *
|
|
from xml.dom import minidom
|
|
|
|
class exception:
|
|
pass
|
|
|
|
|
|
def comp_platform_info(compiler):
|
|
ret = '<ul>\n'
|
|
so = commands.getstatusoutput('cat /proc/cpuinfo | grep \'cpu MHz\'')
|
|
if so[0] == 0:
|
|
ret += '<li>CPU speed - %s</li>\n' % so[1]
|
|
so = commands.getstatusoutput('cat /proc/meminfo | grep \'MemTotal\'')
|
|
if so[0] == 0:
|
|
ret += '<li>Memory - %s</li>\n' % so[1]
|
|
ret += '<li>Platform - %s</li>\n' % platform.platform()
|
|
so = commands.getstatusoutput(compiler + ' --version')
|
|
if so[0] == 0:
|
|
ret += '<li>Compiler - %s</li>\n' % so[1]
|
|
ret += '</ul>\n'
|
|
return ret
|
|
|
|
|
|
class res:
|
|
"""
|
|
A 'structure' representing the results of a test.
|
|
"""
|
|
def __init__(self, x_label, y_label, cntnr_list, cntnr_descs, res_sets):
|
|
self.x_label = x_label
|
|
self.y_label = y_label
|
|
self.cntnr_list = cntnr_list
|
|
self.cntnr_descs = cntnr_descs
|
|
self.res_sets = res_sets
|
|
|
|
|
|
class res_getter:
|
|
"""
|
|
This class returns a res object for some test.
|
|
"""
|
|
class __sorter:
|
|
def __accum(self, results):
|
|
total = 0
|
|
for result in results:
|
|
total = total + result[1]
|
|
return total
|
|
|
|
def sort(self, cntnr_list, res_sets):
|
|
cntnrs_and_totals = []
|
|
for cntnr in cntnr_list:
|
|
results = res_sets[cntnr]
|
|
total = self.__accum(results)
|
|
cntnrs_and_totals.append((cntnr, total))
|
|
by_total = lambda x,y: x[1] > y[1] and -1 or 1
|
|
cntnrs_and_totals.sort(by_total)
|
|
ret = []
|
|
for cntnr_and_total in cntnrs_and_totals:
|
|
cntnr = cntnr_and_total[0]
|
|
ret.append(cntnr)
|
|
return ret
|
|
|
|
def __init__(self, test_infos_f_name):
|
|
self.__test_to_container_res_sets = {}
|
|
self.__test_to_f_names = {}
|
|
tests_dat = minidom.parse(test_infos_f_name)
|
|
for test in tests_dat.getElementsByTagName('test'):
|
|
test_name = test.attributes['name'].value
|
|
self.__test_to_f_names[test_name] = test.getElementsByTagName('file')[0].attributes['name'].value
|
|
cntnr_list = []
|
|
for cntnr in test.getElementsByTagName('cntnr'):
|
|
cntnr_list.append(cntnr.attributes['name'].value)
|
|
self.__test_to_container_res_sets[test_name] = cntnr_list
|
|
|
|
def __get_label(self, tst_dat, label_name):
|
|
label = tst_dat.getElementsByTagName(label_name)[0].firstChild.data
|
|
label = string.strip(label, '\n')
|
|
label = string.strip(label)
|
|
return label
|
|
|
|
def __parse_res_sets(self, f_name, cntnr_list):
|
|
tst_dat = minidom.parse(f_name)
|
|
x_label = self.__get_label(tst_dat, 'x_name')
|
|
y_label = self.__get_label(tst_dat, 'y_name')
|
|
parsed_container_list = tst_dat.getElementsByTagName('cntnr')
|
|
res_sets = {}
|
|
cntnr_descs = {}
|
|
for cntnr in parsed_container_list:
|
|
cntnr_name = cntnr.attributes["name"].value
|
|
res_sets[cntnr_name] = []
|
|
for cntnr in parsed_container_list:
|
|
cntnr_name = cntnr.attributes["name"].value
|
|
cntnr_desc = cntnr.getElementsByTagName('desc')
|
|
if res_sets.has_key(cntnr_name):
|
|
res_set = []
|
|
result_list = cntnr.getElementsByTagName('result')
|
|
for result in result_list:
|
|
x = string.atol(result.attributes["x"].value)
|
|
y = string.atof(result.attributes["y"].value)
|
|
res_set.append((x, y))
|
|
res_sets[cntnr_name] = res_set
|
|
cntnr_descs[cntnr_name] = cntnr_desc[0]
|
|
return (x_label, y_label, cntnr_descs, res_sets)
|
|
|
|
def get(self, res_dir, test_name):
|
|
cntnr_list = self.__test_to_container_res_sets[test_name]
|
|
f_name = res_dir + '/' + self.__test_to_f_names[test_name]
|
|
parsed = self.__parse_res_sets(f_name, cntnr_list)
|
|
x_label = parsed[0]
|
|
y_label = parsed[1]
|
|
cntnr_descs = parsed[2]
|
|
res_sets = parsed[3]
|
|
cntnr_list = self.__sorter().sort(cntnr_list, res_sets)
|
|
return res(x_label, y_label, cntnr_list, cntnr_descs, res_sets)
|
|
|
|
|
|
class png_maker:
|
|
"""
|
|
This class creates a png file from a result set.
|
|
"""
|
|
class __style_chooser:
|
|
def __init__(self):
|
|
self.native_re = re.compile(r'n_(?:.*?)')
|
|
|
|
self.native_tick_mark_0 = tick_mark.Circle(size = 4)
|
|
self.native_tick_mark_1 = tick_mark.Square(size = 4)
|
|
self.native_line_style_0 = line_style.T(color = color.black, width=2)
|
|
self.native_line_style_1 = line_style.T(color = color.black, width=2)
|
|
|
|
self.mask_re = re.compile(r'mask(?:.*?)')
|
|
self.mod_re = re.compile(r'mod(?:.*?)')
|
|
|
|
self.rb_tree_mmap_rb_tree_set_re = re.compile(r'rb_tree_mmap_rb_tree_set(?:.*?)')
|
|
self.rb_tree_mmap_lu_mtf_set_re = re.compile(r'rb_tree_mmap_lu_mtf_set(?:.*?)')
|
|
|
|
self.splay_re = re.compile(r'splay(?:.*?)')
|
|
self.rb_tree_re = re.compile(r'rb_tree(?:.*?)')
|
|
self.ov_tree_re = re.compile(r'ov_tree(?:.*?)')
|
|
self.splay_tree_re = re.compile(r'splay_tree(?:.*?)')
|
|
|
|
self.pat_trie_re = re.compile(r'pat_trie(?:.*?)')
|
|
|
|
self.lc_1div8_1div2_re = re.compile(r'lc_1div8_1div2(?:.*?)')
|
|
self.lc_1div8_1div1_re = re.compile(r'lc_1div8_1div1(?:.*?)')
|
|
self.mcolc_1div2_re = re.compile(r'mcolc_1div2(?:.*?)')
|
|
|
|
def choose(self, cntnr):
|
|
if self.native_re.search(cntnr):
|
|
if cntnr == 'n_pq_vector':
|
|
return (self.native_tick_mark_1, self.native_line_style_1)
|
|
|
|
return (self.native_tick_mark_0, self.native_line_style_0)
|
|
|
|
# tick_mark predefined
|
|
# square, circle3, dia, tri, dtri, star, plus5, x5, gray70dia, blackdtri, blackdia
|
|
if self.mask_re.search(cntnr):
|
|
clr = color.navy
|
|
elif self.mod_re.search(cntnr):
|
|
clr = color.green4
|
|
elif self.rb_tree_mmap_rb_tree_set_re.search(cntnr):
|
|
clr = color.mediumblue
|
|
tm = tick_mark.square
|
|
elif self.rb_tree_mmap_lu_mtf_set_re.search(cntnr) or cntnr == 'rc_binomial_heap':
|
|
clr = color.gray50
|
|
tm = tick_mark.dia
|
|
elif self.splay_tree_re.search(cntnr) or cntnr == 'binomial_heap':
|
|
clr = color.gray58
|
|
tm = tick_mark.tri
|
|
elif self.rb_tree_re.search(cntnr) or cntnr == 'binary_heap':
|
|
clr = color.red3
|
|
tm = tick_mark.dtri
|
|
elif self.ov_tree_re.search(cntnr) or cntnr == 'thin_heap':
|
|
clr = color.orangered1
|
|
tm = tick_mark.star
|
|
elif self.pat_trie_re.search(cntnr) or cntnr == 'pairing_heap':
|
|
clr = color.blueviolet
|
|
tm = tick_mark.plus5
|
|
else:
|
|
sys.stderr.write(cntnr + '\n')
|
|
raise exception
|
|
|
|
# mask / mod
|
|
if cntnr.find('lc_1div8_1div') <> -1:
|
|
if cntnr.find('mask') <> -1:
|
|
# mask
|
|
if self.lc_1div8_1div2_re.search(cntnr):
|
|
if cntnr.find('nsth') <> -1:
|
|
tm = tick_mark.x5
|
|
else:
|
|
tm = tick_mark.gray70dia
|
|
if self.lc_1div8_1div1_re.search(cntnr):
|
|
if cntnr.find('nsth') <> -1:
|
|
tm = tick_mark.dia
|
|
else:
|
|
tm = tick_mark.circle3
|
|
else:
|
|
# mod
|
|
if self.lc_1div8_1div2_re.search(cntnr):
|
|
if cntnr.find('nsth') <> -1:
|
|
tm = tick_mark.tri
|
|
else:
|
|
tm = tick_mark.square
|
|
if self.lc_1div8_1div1_re.search(cntnr):
|
|
if cntnr.find('nsth') <> -1:
|
|
tm = tick_mark.dtri
|
|
else:
|
|
tm = tick_mark.star
|
|
|
|
if self.mcolc_1div2_re.search(cntnr):
|
|
tm = tick_mark.circle3
|
|
|
|
return (tm, line_style.T(color = clr, width = 2))
|
|
|
|
|
|
def __init__(self):
|
|
self.__sc = self.__style_chooser()
|
|
self.__mmap_re = re.compile('mmap_')
|
|
|
|
def __container_label_name(self, cntnr):
|
|
return self.__mmap_re.sub('\nmmap_\n', cntnr)
|
|
|
|
def make(self, res, of_name):
|
|
theme.output_format = 'svg'
|
|
theme.output_file = of_name
|
|
theme.scale_factor = 2
|
|
theme.default_font_family = "Gill Sans Std"
|
|
theme.default_line_width = 0.5
|
|
theme.default_font_size = 7
|
|
theme.use_color = 1
|
|
theme.reinitialize()
|
|
y_tick_interval = self.__get_y_tics(res)
|
|
# xaxis = axis.X(format = '/a90/hL%d',
|
|
xaxis = axis.X(format = "/a-50{}%d",
|
|
tic_interval = 200,
|
|
label = res.x_label)
|
|
# yaxis = axis.Y(format = '%.2e',
|
|
yaxis = axis.Y(format = "/a-50{}%.2e",
|
|
tic_interval = y_tick_interval,
|
|
label = res.y_label)
|
|
legend_lines = len(res.cntnr_list)
|
|
legend_vloc = 50 + (legend_lines * 10)
|
|
legend_hloc = -0
|
|
ar = area.T(x_axis = xaxis, y_axis = yaxis,
|
|
legend = legend.T(loc=(legend_hloc,-legend_vloc),
|
|
frame_line_style=None,
|
|
inter_row_sep=2),
|
|
size=(240,110))
|
|
plot_list = []
|
|
for cntnr in res.cntnr_list:
|
|
style = self.__sc.choose(cntnr)
|
|
print cntnr
|
|
pl = line_plot.T(label = self.__container_label_name(cntnr),
|
|
data = res.res_sets[cntnr],
|
|
tick_mark = style[0],
|
|
line_style = style[1])
|
|
plot_list.append(pl)
|
|
for plot in plot_list:
|
|
ar.add_plot(plot)
|
|
ar.draw()
|
|
|
|
|
|
def __get_y_tics(self, res):
|
|
mx = 0
|
|
for cntnr in res.cntnr_list:
|
|
m = max(d[1] for d in res.res_sets[cntnr])
|
|
mx = max(m, mx)
|
|
return mx / 5
|
|
|
|
|
|
|
|
def make_tt(s):
|
|
return '<tt>' + s + '</tt>'
|
|
|
|
def make_b(s):
|
|
return '<b>' + s + '</b>'
|
|
|
|
def make_ttb(s):
|
|
return '<tt><b>' + s + '</b></tt>'
|
|
|
|
def make_i(s):
|
|
return '<i>' + s + '</i>'
|
|
|
|
def make_pb_ds_class_href(c_name):
|
|
return '<a href = "' + c_name + '.html">' + make_tt(c_name) + '</a>\n'
|
|
|
|
def build_value_to_pb_ds_class_href(s_desc):
|
|
value = s_desc.attributes['value'].value
|
|
ret = make_pb_ds_class_href(value)
|
|
return ret
|
|
|
|
class hash_desc_to_html_builder:
|
|
def build_specific_comb_hash_fn(self, s_desc):
|
|
comb_hash_fn_desc = s_desc.getElementsByTagName('Comb_Hash_Fn')[0]
|
|
ret = make_tt('Comb_Hash_Fn')
|
|
ret = ret + ' = '
|
|
ret = ret + build_value_to_pb_ds_class_href(comb_hash_fn_desc)
|
|
return ret
|
|
|
|
def __build_nom_denom(self, s_desc):
|
|
nom_denom = s_desc.attributes['nom'].value + '/' + s_desc.attributes['denom'].value
|
|
return make_i(nom_denom)
|
|
|
|
def __build_lc_trigger_desc(self, s_desc):
|
|
ret = build_value_to_pb_ds_class_href(s_desc)
|
|
ret = ret + ' with ' + make_i('α<sub>min</sub>')
|
|
ret = ret + ' = ' + self.__build_nom_denom(s_desc.getElementsByTagName('alpha_min')[0])
|
|
ret = ret + ' and ' + make_i('α<sub>max</sub>')
|
|
ret = ret + ' = ' + self.__build_nom_denom(s_desc.getElementsByTagName('alpha_max')[0])
|
|
return ret
|
|
|
|
def build_specific_resize_policy(self, s_desc):
|
|
ret = make_tt('Resize_Policy')
|
|
ret = ret + ' = '
|
|
resize_policy_desc = s_desc.getElementsByTagName('Resize_Policy')[0]
|
|
ret = ret + build_value_to_pb_ds_class_href(resize_policy_desc)
|
|
ret = ret + ' with ' + make_tt('Size_Policy')
|
|
ret = ret + ' = '
|
|
size_policy_desc = resize_policy_desc.getElementsByTagName('Size_Policy')[0]
|
|
ret = ret + build_value_to_pb_ds_class_href(size_policy_desc)
|
|
ret = ret + ', and ' + make_tt('Trigger_Policy')
|
|
ret = ret + ' = '
|
|
trigger_policy_desc = resize_policy_desc.getElementsByTagName('Trigger_Policy')[0]
|
|
if trigger_policy_desc.attributes['value'].value == 'hash_load_check_resize_trigger':
|
|
ret = ret + self.__build_lc_trigger_desc(trigger_policy_desc)
|
|
else:
|
|
raise exception
|
|
return ret
|
|
|
|
|
|
class cc_hash_desc_to_html_builder:
|
|
def __init__(self):
|
|
self.__hash_builder = hash_desc_to_html_builder()
|
|
|
|
def build(self, s_desc):
|
|
ret = build_value_to_pb_ds_class_href(s_desc)
|
|
ret = ret + 'with ' + self.__hash_builder.build_specific_comb_hash_fn(s_desc)
|
|
ret = ret + ', and ' + self.__hash_builder.build_specific_resize_policy(s_desc)
|
|
return ret
|
|
|
|
|
|
class gp_hash_desc_to_html_builder:
|
|
def __init__(self):
|
|
self.__hash_builder = hash_desc_to_html_builder()
|
|
|
|
def build(self, s_desc):
|
|
ret = build_value_to_pb_ds_class_href(s_desc)
|
|
ret = ret + ' with ' + self.__hash_builder.build_specific_comb_hash_fn(s_desc)
|
|
ret = ret + ', ' + self.__hash_builder.build_specific_resize_policy(s_desc)
|
|
ret = ret + ', and ' + make_tt('Probe_Fn')
|
|
ret = ret + ' = '
|
|
probe_fn = s_desc.getElementsByTagName('Probe_Fn')[0].attributes['value'].value
|
|
ret = ret + make_pb_ds_class_href(probe_fn)
|
|
return ret
|
|
|
|
|
|
class basic_tree_like_desc_to_html_builder:
|
|
def build_tag(self, s_desc):
|
|
ret = make_tt('Tag')
|
|
ret = ret + ' = '
|
|
tag_desc = s_desc.getElementsByTagName('Tag')[0]
|
|
ret = ret + build_value_to_pb_ds_class_href(tag_desc)
|
|
return ret
|
|
|
|
def build_node_update(self, s_desc):
|
|
ret = make_tt('Node_Update')
|
|
ret = ret + ' = '
|
|
node_update_desc = s_desc.getElementsByTagName('Node_Update')[0]
|
|
ret = ret + build_value_to_pb_ds_class_href(node_update_desc)
|
|
return ret
|
|
|
|
|
|
class basic_tree_desc_to_html_builder:
|
|
def __init__(self):
|
|
self.__tree_like_builder = basic_tree_like_desc_to_html_builder()
|
|
|
|
def build(self, s_desc):
|
|
ret = build_value_to_pb_ds_class_href(s_desc)
|
|
ret = ret + ' with ' + self.__tree_like_builder.build_tag(s_desc)
|
|
ret = ret + ', and ' + self.__tree_like_builder.build_node_update(s_desc)
|
|
return ret
|
|
|
|
|
|
class basic_trie_desc_to_html_builder:
|
|
def __init__(self):
|
|
self.__tree_like_builder = basic_tree_like_desc_to_html_builder()
|
|
|
|
def build(self, s_desc):
|
|
ret = build_value_to_pb_ds_class_href(s_desc)
|
|
ret = ret + ' with ' + self.__tree_like_builder.build_tag(s_desc)
|
|
ret = ret + ', and ' + self.__tree_like_builder.build_node_update(s_desc)
|
|
return ret
|
|
|
|
class lu_desc_to_html_builder:
|
|
def build(self, s_desc):
|
|
ret = build_value_to_pb_ds_class_href(s_desc)
|
|
ret = ret + ' with ' + make_tt('Update_Policy')
|
|
ret = ret + ' = '
|
|
update_policy_desc = s_desc.getElementsByTagName('Update_Policy')[0]
|
|
ret = ret + build_value_to_pb_ds_class_href(update_policy_desc)
|
|
return ret
|
|
|
|
|
|
class std_desc_to_html_builder:
|
|
def build(self, s_desc):
|
|
value = s_desc.attributes['value'].value
|
|
return make_tt(value.replace('std_', 'std::'))
|
|
|
|
|
|
class std_tr1_desc_to_html_builder:
|
|
def build(self, s_desc):
|
|
value = s_desc.attributes['value'].value
|
|
ret = make_tt(value.replace('std_tr1_', 'std::tr1::'))
|
|
ret = ret + ' with ' + make_tt('cache_hash_code')
|
|
ret = ret + ' = '
|
|
cache_hash_code = s_desc.getElementsByTagName('cache_hash_code')[0].attributes['value'].value
|
|
ret = ret + make_ttb(cache_hash_code)
|
|
return ret
|
|
|
|
class gnucxx_desc_to_html_builder:
|
|
def build(self, s_desc):
|
|
value = s_desc.attributes['value'].value
|
|
return make_tt(value.replace('__gnucxx_', '__gnucxx::'))
|
|
|
|
class stdext_desc_to_html_builder:
|
|
def build(self, s_desc):
|
|
value = s_desc.attributes['value'].value
|
|
return make_tt(value.replace('stdext_', 'stdext::'))
|
|
|
|
class npq_desc_to_html_builder:
|
|
def build(self, vector):
|
|
if vector:
|
|
under = make_tt('std::vector')
|
|
else:
|
|
under = make_tt('std::deque')
|
|
|
|
return make_tt('std::priority_queue') + ' adapting ' + under
|
|
|
|
class binary_heap_desc_to_html_builder:
|
|
def build(self, s_desc):
|
|
ret = make_pb_ds_class_href('priority_queue')
|
|
ret = ret + ' with ' + make_tt('Tag')
|
|
ret = ret + ' = ' + make_pb_ds_class_href('binary_heap_tag')
|
|
return ret
|
|
|
|
class thin_heap_desc_to_html_builder:
|
|
def build(self, s_desc):
|
|
ret = make_pb_ds_class_href('priority_queue')
|
|
ret = ret + ' with ' + make_tt('Tag')
|
|
ret = ret + ' = ' + make_pb_ds_class_href('thin_heap_tag')
|
|
return ret
|
|
|
|
class binomial_heap_desc_to_html_builder:
|
|
def build(self, s_desc):
|
|
ret = make_pb_ds_class_href('priority_queue')
|
|
ret = ret + ' with ' + make_tt('Tag')
|
|
ret = ret + ' = ' + make_pb_ds_class_href('binomial_heap_tag')
|
|
return ret
|
|
|
|
class rc_binomial_heap_desc_to_html_builder:
|
|
def build(self, s_desc):
|
|
ret = make_pb_ds_class_href('priority_queue')
|
|
ret = ret + ' with ' + make_tt('Tag')
|
|
ret = ret + ' = ' + make_pb_ds_class_href('rc_binomial_heap_tag')
|
|
return ret
|
|
|
|
class pairing_heap_desc_to_html_builder:
|
|
def build(self, s_desc):
|
|
ret = make_pb_ds_class_href('priority_queue')
|
|
ret = ret + ' with ' + make_tt('Tag')
|
|
ret = ret + ' = ' + make_pb_ds_class_href('pairing_heap_tag')
|
|
return ret
|
|
|
|
class legend_desc_builder:
|
|
"""
|
|
Returns a string corresponding to a specific container type.
|
|
"""
|
|
def __init__(self):
|
|
self.__cc_hash_builder = cc_hash_desc_to_html_builder()
|
|
self.__gp_hash_builder = gp_hash_desc_to_html_builder()
|
|
self.__basic_tree_builder = basic_tree_desc_to_html_builder()
|
|
self.__basic_trie_builder = basic_trie_desc_to_html_builder()
|
|
self.__lu_builder = lu_desc_to_html_builder()
|
|
self.__std_builder = std_desc_to_html_builder()
|
|
self.__std_tr1_builder = std_tr1_desc_to_html_builder()
|
|
self.__gnucxx_builder = gnucxx_desc_to_html_builder()
|
|
self.__stdext_builder = stdext_desc_to_html_builder()
|
|
self.__npq_builder = npq_desc_to_html_builder()
|
|
self.__thin_heap_builder = thin_heap_desc_to_html_builder()
|
|
self.__thin_heap_builder = thin_heap_desc_to_html_builder()
|
|
self.__binary_heap_builder = binary_heap_desc_to_html_builder()
|
|
self.__binomial_heap_builder = binomial_heap_desc_to_html_builder()
|
|
self.__rc_binomial_heap_builder = rc_binomial_heap_desc_to_html_builder()
|
|
self.__pairing_heap_builder = pairing_heap_desc_to_html_builder()
|
|
|
|
def __build_specific(self, s_desc):
|
|
type = s_desc.attributes['value'].value
|
|
|
|
if type == 'thin_heap':
|
|
return self.__thin_heap_builder.build(s_desc)
|
|
if type == 'binary_heap':
|
|
return self.__binary_heap_builder.build(s_desc)
|
|
if type == 'binomial_heap':
|
|
return self.__binomial_heap_builder.build(s_desc)
|
|
if type == 'rc_binomial_heap':
|
|
return self.__rc_binomial_heap_builder.build(s_desc)
|
|
if type == 'pairing_heap':
|
|
return self.__pairing_heap_builder.build(s_desc)
|
|
if type == 'cc_hash_table':
|
|
ret = self.__cc_hash_builder.build(s_desc)
|
|
elif type == 'gp_hash_table':
|
|
ret = self.__gp_hash_builder.build(s_desc)
|
|
elif type == 'tree':
|
|
ret = self.__basic_tree_builder.build(s_desc)
|
|
elif type == 'trie':
|
|
ret = self.__basic_trie_builder.build(s_desc)
|
|
elif type == 'list_update':
|
|
ret = self.__lu_builder.build(s_desc)
|
|
elif type == 'std::priority_queue_vector':
|
|
return self.__npq_builder.build(True)
|
|
elif type == 'std::priority_queue_deque':
|
|
return self.__npq_builder.build(False)
|
|
elif type == 'std_set' or type == 'std_map' or type == 'std_multimap':
|
|
return self.__std_builder.build(s_desc)
|
|
elif type == 'std_tr1_unordered_set' or type == 'std_tr1_unordered_map':
|
|
return self.__std_tr1_builder.build(s_desc)
|
|
elif type == 'stdext_hash_set' or type == 'stdext_hash_map' or type == 'stdext_hash_multimap':
|
|
return self.__stdext_builder.build(s_desc)
|
|
elif type == '__gnucxx_hash_set' or type == '__gnucxx_hash_map' or type == '__gnucxx_hash_multimap':
|
|
return self.__gnucxx_builder.build(s_desc)
|
|
else:
|
|
sys.stderr.write('cannot recognize %s\n' % type)
|
|
raise exception
|
|
return ret
|
|
|
|
|
|
def build(self, desc):
|
|
s_descs = desc.getElementsByTagName('type')
|
|
if s_descs.length == 0:
|
|
print desc.toxml()
|
|
raise exception
|
|
ret = ''
|
|
count = 0
|
|
for s_desc in s_descs:
|
|
if count > 0:
|
|
ret = ret + ', mapping each key to '
|
|
ret = ret + self.__build_specific(s_desc)
|
|
count = count + 1
|
|
return ret
|
|
|
|
|
|
def main(doc_dir, res_dir, test_infos_f_name, test_name, build_name):
|
|
res_gtr = res_getter(test_infos_f_name)
|
|
res = res_gtr.get(res_dir, test_name)
|
|
png_mkr = png_maker()
|
|
# png_of_name = doc_dir + '/' + test_name + '_' + build_name + '.png'
|
|
png_of_name = doc_dir + '/' + test_name + '_' + build_name + '.svg'
|
|
print png_of_name
|
|
png_mkr.make(res, png_of_name)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
"""
|
|
This module takes 6 parameters from the command line:
|
|
Docs directory
|
|
Results directory
|
|
Tests info XML file name
|
|
Test name
|
|
Build name
|
|
Compiler name
|
|
"""
|
|
usg = "make_graph.py <doc_dir> <res_dir> <test_info_file> <test_name> <build_name>\n"
|
|
if len(sys.argv) != 6:
|
|
sys.stderr.write(usg)
|
|
raise exception
|
|
main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5])
|