From ec0d5d22f10607dd374d9ce11b5ed5883322f409 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Oct 2019 12:37:13 -0500 Subject: [PATCH 1/4] SyntheticEditor - disable Quote Throttle/Inside Market Distance by default --- src/client/spark/Modules/Spreader/SyntheticDataHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs b/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs index 2b35df0f2..13a3321f3 100644 --- a/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs +++ b/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs @@ -81,9 +81,9 @@ namespace bts.shell { #region QuoteParams public static QuoteParams QuoteParams => new QuoteParams { LeanQuantityRatio = 1, - QuoteInsideMarketDistance = QuoteInsideMarketDistance, + //QuoteInsideMarketDistance = QuoteInsideMarketDistance, QuoteMaxOrderMove = QuoteMaxOrderMove, - QuoteMuteZone = QuoteMuteZone, + //QuoteMuteZone = QuoteMuteZone, QuoteRepriceThrottle = QuoteRepriceThrottle, QuoteInsideMarketDistanceWithTravel = QuoteInsideMarketDistanceWithTravel, }; From 5826a083c0d707c75ab0e1163273b089307c9a95 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Oct 2019 12:44:47 -0500 Subject: [PATCH 2/4] SyntheticEditor - remove Quote Inside Market Away Distance param --- .../QuoteInsideMarketDistanceEnabledModel.cs | 7 +------ src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs index aaf5a198c..a09a86e10 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs @@ -4,13 +4,10 @@ using mbts.ui.spark; namespace mbts.spark { partial class SyntheticEditorVM { class QuoteInsideMarketDistanceEnabledModel : RowModelBase { - readonly QuoteInsideMarketDistanceAwayModel _away; readonly QuoteInsideMarketDistanceTowardModel _toward; - public QuoteInsideMarketDistanceEnabledModel(QuoteInsideMarketDistanceAwayModel away, QuoteInsideMarketDistanceTowardModel toward) { - _away = away; + public QuoteInsideMarketDistanceEnabledModel(QuoteInsideMarketDistanceTowardModel toward) => _toward = toward; - } public override string display_name { get; } = string.Empty; public override string help_text { get; } = string.Empty; @@ -24,13 +21,11 @@ namespace mbts.spark { if (value) { if (leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance == null) { leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance = SyntheticDataHelper.Defaults.QuoteInsideMarketDistance; - _away.apply_value(leg_tup); _toward.apply_value(leg_tup); } } else { leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance = null; } - _away.set_enabled(leg_tup, value); _toward.set_enabled(leg_tup, value); } } diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs index 9392ef2d2..d6e81bb99 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs @@ -190,7 +190,6 @@ namespace mbts.spark { var quote_inside_market_throttle_ticks = new QuoteInsideMarketThrottleTicksModel(); var quote_inside_market_throttle_min_move = new QuoteInsideMarketThrottleMinMoveModel(); - var quote_inside_market_distance_away = new QuoteInsideMarketDistanceAwayModel(); var quote_inside_market_distance_toward = new QuoteInsideMarketDistanceTowardModel(); var pre_hedge_payless_threshold = new PreHedgePaylessThresholdModel(); @@ -230,8 +229,7 @@ namespace mbts.spark { //quote_inside_market_throttle_ticks, //quote_inside_market_throttle_min_move, //new MaxTicksInsideMarketModel(), - new QuoteInsideMarketDistanceEnabledModel(quote_inside_market_distance_away, quote_inside_market_distance_toward), - quote_inside_market_distance_away, + new QuoteInsideMarketDistanceEnabledModel(quote_inside_market_distance_toward), quote_inside_market_distance_toward, new PreHedgePaylessEnabledModel(pre_hedge_payless_threshold, pre_hedge_payless_ticks), pre_hedge_payless_threshold, From 7531cf5eb49aa0593909002b3f64a82a32ddfc1e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Oct 2019 15:38:15 -0500 Subject: [PATCH 3/4] remove unused synth param 'QuoteInsideMarketDistanceAwayModel' --- .../QuoteInsideMarketDistanceAwayModel.cs | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs deleted file mode 100644 index d0a79431c..000000000 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceAwayModel.cs +++ /dev/null @@ -1,40 +0,0 @@ -using bts.shell; -using bts.spark; -using mbts.ui.spark; -using System.Collections.Generic; - -namespace mbts.spark { - partial class SyntheticEditorVM { - class QuoteInsideMarketDistanceAwayModel : RowModelBase { - IDictionary _value_store = new Dictionary(); - - public override string display_name { get; } = "Away Distance"; - public override string help_text { get; } = string.Empty; - public override string man_page { get; } = string.Empty; - public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.InsideMarketDistance }; - - public void apply_value(LegSpreaderParamsTuple leg_tup) => - _get_inside_market_distance(leg_tup).OnAwayDistance = _value_from_store(leg_tup); - - public override uint get_value(LegSpreaderParamsTuple leg_tup) => - _get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance ? - inside_market_distance.OnAwayDistance : - _value_from_store(leg_tup); - - public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; - if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance) - inside_market_distance.OnAwayDistance = value; - } - - protected override bool _get_enabled(LegSpreaderParamsTuple leg_tup) => - _get_inside_market_distance(leg_tup) != null; - - QuoteInsideMarketDistance _get_inside_market_distance(LegSpreaderParamsTuple leg_tup) => - leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance; - - uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistance.OnAwayDistance); - } - } -} \ No newline at end of file From 7fef7d88ce80f753b0a0a0ca9fd02f9fe8d05097 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 24 Oct 2019 15:40:30 -0500 Subject: [PATCH 4/4] refactor QuoteInsideMarketDistance to new proto type (cannot recycle old type bc it must be null in existing synths) --- .../spark/Modules/Spreader/SyntheticDataHelper.cs | 1 + .../QuoteInsideMarketDistanceEnabledModel.cs | 8 ++++---- .../QuoteInsideMarketDistanceTowardModel.cs | 13 ++++++------- src/lib/sparkproto/SparkProtos.proto | 5 +++++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs b/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs index 13a3321f3..3d68bd7a8 100644 --- a/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs +++ b/src/client/spark/Modules/Spreader/SyntheticDataHelper.cs @@ -113,6 +113,7 @@ namespace bts.shell { }; public static QuoteInsideMarketDistanceWithTravel QuoteInsideMarketDistanceWithTravel => new QuoteInsideMarketDistanceWithTravel { Priority = RulePriority }; public static QuoteInsideMarketDistance QuoteInsideMarketDistance => new QuoteInsideMarketDistance { Priority = RulePriority }; + public static QuoteInsideMarketDistanceThrottle QuoteInsideMarketDistanceThrottle => new QuoteInsideMarketDistanceThrottle(); #endregion #region PreHedge diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs index a09a86e10..15ebf0481 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceEnabledModel.cs @@ -15,16 +15,16 @@ namespace mbts.spark { public override ParameterSection[] section_path { get; } = new[] { Sections.Quote, Subsections.InsideMarketDistance }; public override bool get_value(LegSpreaderParamsTuple leg_tup) => - leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance != null; + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle != null; public override void set_value(LegSpreaderParamsTuple leg_tup, bool value) { if (value) { - if (leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance == null) { - leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance = SyntheticDataHelper.Defaults.QuoteInsideMarketDistance; + if (leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle == null) { + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle = SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceThrottle; _toward.apply_value(leg_tup); } } else { - leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance = null; + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle = null; } _toward.set_enabled(leg_tup, value); } diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs index 17f967e02..f38365209 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs @@ -1,5 +1,4 @@ -using bts.shell; -using bts.spark; +using bts.spark; using mbts.ui.spark; using System.Collections.Generic; @@ -17,24 +16,24 @@ namespace mbts.spark { _get_inside_market_distance(leg_tup).OnTowardDistance = _value_from_store(leg_tup); public override uint get_value(LegSpreaderParamsTuple leg_tup) => - _get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance ? + _get_inside_market_distance(leg_tup) is QuoteInsideMarketDistanceThrottle inside_market_distance ? inside_market_distance.OnTowardDistance : _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { _value_store[leg_tup.SecurityKey] = value; - if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistance inside_market_distance) + if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistanceThrottle inside_market_distance) inside_market_distance.OnTowardDistance = value; } protected override bool _get_enabled(LegSpreaderParamsTuple leg_tup) => _get_inside_market_distance(leg_tup) != null; - QuoteInsideMarketDistance _get_inside_market_distance(LegSpreaderParamsTuple leg_tup) => - leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistance; + QuoteInsideMarketDistanceThrottle _get_inside_market_distance(LegSpreaderParamsTuple leg_tup) => + leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistance.OnTowardDistance); + _value_store.GetValueOrDefault(leg_tup.SecurityKey); } } } \ No newline at end of file diff --git a/src/lib/sparkproto/SparkProtos.proto b/src/lib/sparkproto/SparkProtos.proto index 17c5adada..5d07a3b12 100644 --- a/src/lib/sparkproto/SparkProtos.proto +++ b/src/lib/sparkproto/SparkProtos.proto @@ -65,6 +65,7 @@ message QuoteParams QuoteRepriceThrottle quote_reprice_throttle = 1010; QuoteInsideMarketDistance quote_inside_market_distance = 1020; QuoteInsideMarketDistanceWithTravel quote_inside_market_distance_with_travel = 1030; + QuoteInsideMarketDistanceThrottle quote_inside_market_distance_throttle = 1070; QuoteMaxOrderMove quote_max_order_move = 1040; QuoteHidden quote_hidden = 1050; ConditionalQuoting conditional_quoting=1060; @@ -218,6 +219,10 @@ message QuoteInsideMarketDistanceWithTravel uint32 limit = 20; } +message QuoteInsideMarketDistanceThrottle { + uint32 on_toward_distance = 10; +} + /*******************************Quote MaxOrderMove (unused)************************************** (TT) Max Order Move [Pre-Quote] This rule sets a restriction on how far a quoting order can move in one action. If triggered,