From bb419cf048cf5cc3c865dbfc43626c133b0db51b Mon Sep 17 00:00:00 2001 From: Mohammad Arham Date: Wed, 20 Sep 2023 03:50:00 +0000 Subject: [PATCH] changes for diff md source securiity --- .../orders/algo/algo_orders/MomentumAlgo.cpp | 28 ++++++++++++++++--- .../algo/algo_orders/RegisterDorman.cpp | 3 +- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/MomentumAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/MomentumAlgo.cpp index ab9bac8ed..1cd1072f9 100644 --- a/src/lib/orderman/orders/algo/algo_orders/MomentumAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/MomentumAlgo.cpp @@ -553,6 +553,8 @@ struct GanData { struct MomentumAlgoParams { SecurityKey security_key_id; std::string security_name_str; + SecurityKey md_security_key_id; + std::string md_security_name_str; // const Modes run_mode; // const Modes exit_strategy; const size_t renko_ticks; @@ -575,8 +577,9 @@ struct MomentumAlgoParams { bool file_read, bool fixed_edge_gain, bool fixed_edge_loss, bool reverse_logic, bool timed_start, bool log_graph, bool early_brick, - double early_threshold, bool hull_avg) + double early_threshold, bool hull_avg, SecurityKey md_security_key_id, std::string md_security_name_str) : security_key_id(security_key_id), security_name_str(security_name_str), + md_security_key_id(md_security_key_id), md_security_name_str(md_security_name_str), renko_ticks(renko_ticks), edge_ticks_gain_limit(edge_ticks_gain_limit), edge_ticks_loss_limit(edge_ticks_loss_limit), upr_gan_buffer_sz(upr_gan_buffer_sz), @@ -669,7 +672,7 @@ struct MomentumAlgo::PImpl { auto &m = *(out_state.mutable_custom_state()); auto l = { "00 Last Price", "01 Position", "02 P&L", - "03 Brick count", "10 Holding Price", "20 Last Order Price", + "03 Brick count", "04 MD Security", "10 Holding Price", "20 Last Order Price", "30 Lower Brick", "31 Upper Brick", "40 Lower Average", "41 Upper Average", "50 + Signals", "51 - Signals", "60 Front Runners"}; @@ -696,6 +699,7 @@ ChildTemplate *_get_template(IBeforeLaunchAlgoServices &serv, SecurityKey key, api::orderman::MarketOrderDefinition()); return &(serv.make_child_template(rv)); } + // converts paramters recieved from the user and saves them in out_p returns // true if all parameters have values bool _convert_params(IBeforeLaunchAlgoServices &serv, @@ -713,6 +717,7 @@ bool _convert_params(IBeforeLaunchAlgoServices &serv, auto early_brick = get_if(params, "Early Brick?"); auto hull_avg = get_if(params, "Use Hull Avg?"); + auto renko_ticks = get_if(params, "Renko Ticks"); auto upr_gan_buffer_sz = get_if(params, "Upper Gan Buffer Size"); auto lwr_gan_buffer_sz = get_if(params, "Lower Gan Buffer Size"); @@ -729,6 +734,20 @@ bool _convert_params(IBeforeLaunchAlgoServices &serv, auto st_mon = get_if(params, "Date Start Month (0-12)"); auto st_yr = get_if(params, "Date Start Year (20XX)"); + auto market_data_sec = get_if(params, "Market Data Security"); + SecurityKey md_sec_key = SecurityKey(serv.security().id()); + std::string md_sec_name = serv.security().glbx().security_desc(); + auto secs = serv.known_securities(); + if(market_data_sec.has_value()){ + for(auto sec:secs){ + if(sec->glbx().security_desc() == market_data_sec.value()){ + md_sec_key = SecurityKey(sec->id()); + md_sec_name = market_data_sec.value(); + break; + } + } + } + // auto signal_to_signal = get_if(params, "Signal To Signal?"); auto check_time = [&]() { if (!st_hr.has_value() || !st_min.has_value() || !st_day.has_value() || @@ -749,7 +768,7 @@ bool _convert_params(IBeforeLaunchAlgoServices &serv, !open_position_on_close.has_value() || !edge_ticks_gain_limit.has_value() || !edge_ticks_loss_limit.has_value() || !run_duration.has_value() || - !hull_avg.has_value() || (timed_start.value() && !check_time())) { + !hull_avg.has_value() || (timed_start.value() && !check_time())) { LOG(OrderMan, Info, "MomentumAlgo::convert_params failed edge_target:{}, edge_loss:{}, " "reverse_logic:{}, timed_start:{}, file_sim:{},renko_ticks:{}, " @@ -784,7 +803,7 @@ bool _convert_params(IBeforeLaunchAlgoServices &serv, timed_start.value(), log_graph.has_value() ? log_graph.value() : true, early_brick.has_value() ? early_brick.value() : false, early_threshold.has_value() ? early_threshold.value() : 0, - hull_avg.value())); + hull_avg.value(),md_sec_key,md_sec_name)); return true; } @@ -1096,6 +1115,7 @@ void MomentumAlgo::report_state(bool to_gui = true) { update_val(m["02 P&L"], me->p_l, true); update_val(m["03 Brick count"], std::optional(me->renko->n_bricks_generated())); + update_val(m["04 MD Source Security"],me->algo_params->md_security_name_str); update_val(m["10 Holding Price"], me->current_holding); update_val(m["20 Last Order Price"], me->last_order_price); update_val(m["30 Lower Brick"], me->renko->get_low(), true); diff --git a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp index 9bc850d3e..8d7f17b71 100644 --- a/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -283,6 +283,7 @@ extern "C" void init_momentum_algo_plugin(bts::SparkServices &srv) { *momentum.add_param_desc() = param_bool("Use Hull Avg?"); // *momentum.add_param_desc() = param_string("time( 24H HHMM)"); + *momentum.add_param_desc() = param_string("Market Data Security"); *momentum.add_param_desc() = param_uint32("Renko Ticks"); *momentum.add_param_desc() = param_uint32("Upper Gan Buffer Size"); *momentum.add_param_desc() = param_uint32("Lower Gan Buffer Size"); @@ -338,7 +339,7 @@ extern "C" void init_spark_plugin(bts::SparkServices &srv) { init_on_signal_plugin(srv); init_momentum_algo_plugin(srv); init_momentum_recorder_plugin(srv); - init_position_flattener(srv); + // init_position_flattener(srv); init_file_runner_plugin(srv); }