From 8fbae1d789b3c9d7e9b079284c85489d8dcd7e65 Mon Sep 17 00:00:00 2001
From: Arnur Nigmetov <anigmetov@lbl.gov>
Date: Sat, 9 Apr 2022 17:33:15 -0700
Subject: Major cleanup

---
 wasserstein/include/auction_runner_jac.h | 53 ++------------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

(limited to 'wasserstein/include/auction_runner_jac.h')

diff --git a/wasserstein/include/auction_runner_jac.h b/wasserstein/include/auction_runner_jac.h
index 252ca32..11b8f8e 100644
--- a/wasserstein/include/auction_runner_jac.h
+++ b/wasserstein/include/auction_runner_jac.h
@@ -30,7 +30,6 @@ derivative works thereof, in binary and source code form.
 #define HERA_AUCTION_RUNNER_JAC_H
 
 #ifdef WASSERSTEIN_PURE_GEOM
-#undef LOG_AUCTION
 #undef ORDERED_BY_PERSISTENCE
 #endif
 
@@ -62,8 +61,7 @@ public:
 
     AuctionRunnerJac(const PointContainer& A,
                      const PointContainer& B,
-                     const AuctionParams<Real>& params,
-                     const std::string& _log_filename_prefix = "");
+                     const AuctionParams<Real>& params);
 
     void set_epsilon(Real new_val);
     Real get_epsilon() const { return epsilon; }
@@ -74,7 +72,7 @@ public:
     void decrease_epsilon();
     Real get_wasserstein_distance();
     Real get_wasserstein_cost();
-    Real get_relative_error(const bool debug_output = false) const;
+    Real get_relative_error() const;
 //private:
     // private data
     PointContainer bidders;
@@ -169,54 +167,7 @@ public:
     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
-
-#ifdef LOG_AUCTION
-
-    size_t parallel_threshold { 5000 };
-    bool is_step_parallel {false};
-    std::unordered_set<size_t> unassigned_items;
-    std::unordered_set<size_t> unassigned_normal_items;
-    std::unordered_set<size_t> unassigned_diag_items;
-    std::unordered_set<size_t> never_assigned_bidders;
-    size_t all_assigned_round { 0 };
-    size_t all_assigned_round_found { false };
-
-    int num_rounds_non_cumulative { 0 }; // set to 0 in the beginning of each phase
-    int num_diag_assignments { 0 };
-    int num_diag_assignments_non_cumulative { 0 };
-    int num_diag_bids_submitted { 0 };
-    int num_diag_stole_from_diag { 0 };
-    int num_normal_assignments { 0 };
-    int num_normal_assignments_non_cumulative { 0 };
-    int num_normal_bids_submitted { 0 };
-
-    std::vector<std::vector<size_t>> price_change_cnt_vec;
-
-
-    const char* plot_logger_name = "plot_logger";
-    const char* price_state_logger_name = "price_stat_logger";
-    std::string plot_logger_file_name;
-    std::string price_stat_logger_file_name;
-    std::shared_ptr<spdlog::logger> plot_logger;
-    std::shared_ptr<spdlog::logger> price_stat_logger;
-    std::shared_ptr<spdlog::logger> console_logger;
-
-
-    int num_parallel_bids { 0 };
-    int num_total_bids { 0 };
-
-    int num_parallel_diag_bids { 0 };
-    int num_total_diag_bids { 0 };
-
-    int num_parallel_normal_bids { 0 };
-    int num_total_normal_bids { 0 };
-
-    int num_parallel_assignments { 0 };
-    int num_total_assignments { 0 };
-#endif
-
 }; // AuctionRunnerJac
 
 
-- 
cgit v1.2.3