From 8fbae1d789b3c9d7e9b079284c85489d8dcd7e65 Mon Sep 17 00:00:00 2001 From: Arnur Nigmetov Date: Sat, 9 Apr 2022 17:33:15 -0700 Subject: Major cleanup --- wasserstein/include/auction_runner_fr.h | 67 +-------------------------------- 1 file changed, 1 insertion(+), 66 deletions(-) (limited to 'wasserstein/include/auction_runner_fr.h') diff --git a/wasserstein/include/auction_runner_fr.h b/wasserstein/include/auction_runner_fr.h index 0c67b65..3ee659c 100644 --- a/wasserstein/include/auction_runner_fr.h +++ b/wasserstein/include/auction_runner_fr.h @@ -64,8 +64,7 @@ public: const Real _eps_factor = 5.0, const int _max_num_phases = std::numeric_limits::max(), const Real _gamma_threshold = 0.0, - const size_t _max_bids_per_round = std::numeric_limits::max(), - const std::string& _log_filename_prefix = ""); + const size_t _max_bids_per_round = std::numeric_limits::max()); void set_epsilon(Real new_val); Real get_epsilon() const { return epsilon; } @@ -188,7 +187,6 @@ private: void print_debug(); void print_matching(); - std::string log_filename_prefix; const Real k_max_relative_error = 2.0; // if relative error cannot be estimated or is too large, use this value void reset_round_stat(); // empty, if logging is disable void reset_phase_stat(); @@ -196,69 +194,6 @@ private: std::unordered_set never_assigned_bidders; std::unordered_set never_assigned_items; -#ifdef LOG_AUCTION - std::unordered_set unassigned_normal_bidders; - std::unordered_set unassigned_diag_bidders; - - std::unordered_set unassigned_normal_items; - std::unordered_set unassigned_diag_items; - - - size_t all_assigned_round { 0 }; - size_t all_assigned_round_found { false }; - - int num_forward_rounds_non_cumulative { 0 }; - int num_forward_rounds { 0 }; - - int num_reverse_rounds_non_cumulative { 0 }; - int num_reverse_rounds { 0 }; - - // all per-round vars are non-cumulative - - // forward rounds - int num_normal_forward_bids_submitted { 0 }; - int num_diag_forward_bids_submitted { 0 }; - - int num_forward_diag_to_diag_assignments { 0 }; - int num_forward_diag_to_normal_assignments { 0 }; - int num_forward_normal_to_diag_assignments { 0 }; - int num_forward_normal_to_normal_assignments { 0 }; - - int num_forward_diag_from_diag_thefts { 0 }; - int num_forward_diag_from_normal_thefts { 0 }; - int num_forward_normal_from_diag_thefts { 0 }; - int num_forward_normal_from_normal_thefts { 0 }; - - // reverse rounds - int num_normal_reverse_bids_submitted { 0 }; - int num_diag_reverse_bids_submitted { 0 }; - - int num_reverse_diag_to_diag_assignments { 0 }; - int num_reverse_diag_to_normal_assignments { 0 }; - int num_reverse_normal_to_diag_assignments { 0 }; - int num_reverse_normal_to_normal_assignments { 0 }; - - int num_reverse_diag_from_diag_thefts { 0 }; - int num_reverse_diag_from_normal_thefts { 0 }; - int num_reverse_normal_from_diag_thefts { 0 }; - int num_reverse_normal_from_normal_thefts { 0 }; - - // price change statistics - std::vector> forward_price_change_cnt_vec; - std::vector> reverse_price_change_cnt_vec; - - size_t parallel_threshold = 5000; - int num_parallelizable_rounds { 0 }; - int num_parallelizable_forward_rounds { 0 }; - int num_parallelizable_reverse_rounds { 0 }; - - int num_parallel_bids { 0 }; - int num_total_bids { 0 }; - - int num_parallel_assignments { 0 }; - int num_total_assignments { 0 }; -#endif - }; -- cgit v1.2.3