From 94da28c5cc4a99e2badbe28f908d4efe71e3ec33 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 29 Jan 2021 22:41:58 -0500 Subject: [PATCH] Better log messages --- .../orders/algo/algo_orders/SniperAlgo.cpp | 35 +++++++++---------- .../algo/algo_orders/SniperAlgoCommon.h | 1 - .../spreader/SpreaderUtils.cpp | 4 ++- .../spreader_orders/spreader/SpreaderUtils.h | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp index 29e41b88e..55438714a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/SniperAlgo.cpp @@ -215,19 +215,19 @@ void log_polygon_eval( OrderKey ok, const SniperPolygon &p, const SniperAlgoParams &algo_params, - const trace::CorID &corid, + const trace::CorID&, SniperAlgo::FireImpetus f_imp) { double min_edge = algo_params.min_edge; auto leg_value_txt = [&](api::Side side) { std::ostringstream buff; + auto l_idx = 0; for (auto &l : p.legs) { - auto [p, q] = l.cross_value.price_qty(side); - buff << p.value() << " " << q.value() << ","; - auto &bk_side = l.sec_data.get_current_book().side( - get_leg_cross_market_side(side, l)); - for (const auto &psz : bk_side) - buff << psz.price() << " " << psz.direct_size() << " " - << psz.implied_size() << " "; + buff << "leg_" << l_idx++ << ": "; + const auto& pq = l.cross_value.get(side); + buff << pq.p.value() << "/" << pq.q.value() << " "; + // buff << + // SpreaderUtils::book_to_str(l.sec_data.get_current_book(), + // get_leg_cross_market_side(side, l),2); buff << ","; } return buff.str(); @@ -235,25 +235,24 @@ void log_polygon_eval( auto log_to_file = [&](api::Side side) { // opp/no-opp, pid, polygon, side, p,q -> p,q, for each leg (price, d_qty, // i_qty, side) - auto [curr_p, curr_q] = p.curr_cross_value.price_qty(side); - auto [prev_p, prev_q] = p.prev_cross_value.price_qty(side); - auto is_curr_opp = is_shot_opp(side, curr_p.value(), min_edge), - is_prev_opp = is_shot_opp(side, prev_p.value(), min_edge); + const auto& curr = p.curr_cross_value.get(side); + const auto& prev = p.prev_cross_value.get(side); + auto is_curr_opp = is_shot_opp(side, curr.p.value(), min_edge), + is_prev_opp = is_shot_opp(side, prev.p.value(), min_edge); auto cumm_pass = check_for_cumm_price_qty( p, side, Price(algo_params.min_cumm_edge), Quantity(algo_params.min_cumm_qty)); // logs only if the opp changes - //((f_imp == SniperAlgo::FireImpetus::Book) ? "Book" : "Lookahead")) : if (is_curr_opp != is_prev_opp) { std::string new_opp = is_curr_opp ? "Sniper Opp Created " : "Sniper Opp Vanished "; new_opp.append( - f_imp == SniperAlgo::FireImpetus::Book ? "Book" : "Lookahead"); + f_imp == SniperAlgo::FireImpetus::Book ? "(Book)" : "(Lookahead)"); std::string leg_markets = leg_value_txt(side); - LOG(OrderMan, Warn, "{},{},{},{},{},{},{},{},{} -> {},{},{},{}", ok, - new_opp, p.pid, polygon_text(p), corid.sn, - TimeUtil::TimestampToNanoseconds(p.latest_bk_ts), side_txt(side), - prev_p, prev_q, curr_p, curr_q, cumm_pass, leg_markets); + LOG(OrderMan, Info, "{},{},{},{},{},{}/{} -> {}/{},{},{}", + ok, new_opp, p.pid, polygon_text(p), + side_txt(side), + prev.p, prev.q, curr.p, curr.q, cumm_pass, leg_markets); } }; log_to_file(api::Side::SIDE_BUY); diff --git a/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h b/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h index 493411b1a..e898ad3ae 100644 --- a/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h +++ b/src/lib/orderman/orders/algo/algo_orders/SniperAlgoCommon.h @@ -201,7 +201,6 @@ struct SniperPolygon { std::vector legs; // last 2 computed values PriceQty prev_cross_value, curr_cross_value; - google::protobuf::Timestamp latest_bk_ts; // when either the price or qty of the bid/ask changes BuySell change_ts = BuySell(bts::datetime::now(), diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp index dee87880b..617deb7c0 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp @@ -192,9 +192,11 @@ void SpreaderUtils::transform_spread_price_mults(api::Security &sec) { } } std::string -SpreaderUtils::book_to_str(const bts::orderman::Book &book, api::Side side) { +SpreaderUtils::book_to_str(const bts::orderman::Book &book, api::Side side, + size_t n_levels) { std::ostringstream oss; oss << "side:" << side; + n_levels = std::min(n_levels, book.n_levels()); for (size_t level = 0; level < book.n_levels(); level++) { const md::PriceSize &level_price_qty = book.side(side)[level]; oss << " q:" << level_price_qty.size() << "," diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index a8379c647..9db9c9426 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -1041,7 +1041,7 @@ class SpreaderUtils { /**************************debugging helpers***************************/ /**********************************************************************/ static std::string - book_to_str(const bts::orderman::Book &book, api::Side side); + book_to_str(const bts::orderman::Book &book, api::Side side, size_t n_levels=10); static std::string book_ev_to_str(const bts::orderman::BookUpdateEvent &book_event); };