diff --git a/src/client/spark/mspark/Algo/ActorMapping.cs b/src/client/spark/mspark/Algo/ActorMapping.cs index 4409ea121..f6f24edea 100644 --- a/src/client/spark/mspark/Algo/ActorMapping.cs +++ b/src/client/spark/mspark/Algo/ActorMapping.cs @@ -18,7 +18,6 @@ namespace mbts.spark { Order.AlgoOrderTypeOneofCase.StopLimitOrder, typeof(orders.StopLimitOrderActor) }, { Order.AlgoOrderTypeOneofCase.StopMarketOrder, typeof(orders.StopMarketOrderActor) }, { Order.AlgoOrderTypeOneofCase.CrossingHedgeOrder, typeof(orders.CrossingHedgeOrderActor) }, - { Order.AlgoOrderTypeOneofCase.SimpleHedgeOrder, typeof(orders.SimpleHedgeOrderActor) }, }; } diff --git a/src/client/spark/mspark/Algo/Orders/ComplexSpreader/CrossingHedgeOrderActor.cs b/src/client/spark/mspark/Algo/Orders/ComplexSpreader/CrossingHedgeOrderActor.cs index 8ccae4f74..8c47ebfdf 100644 --- a/src/client/spark/mspark/Algo/Orders/ComplexSpreader/CrossingHedgeOrderActor.cs +++ b/src/client/spark/mspark/Algo/Orders/ComplexSpreader/CrossingHedgeOrderActor.cs @@ -59,15 +59,10 @@ namespace mbts.spark.orders else bid_or_ask = bbo.Item1; - if(bid_or_ask.size <= _order.CrossingHedgeOrder.CrossSizeThreshold || - bid_or_ask.size <= _order.CrossingHedgeOrder.CrossRatioThreshold * _order.Size) - { - _exchange.modify_price(_order.Id, bid_or_ask.price); - } - uint distance = Convert.ToUInt32(Math.Abs(bid_or_ask.price - _status.Order.Price) / compute_tick(_order.Security)); - if(distance > _order.CrossingHedgeOrder.TicksBetterThreshold) - _exchange.modify_price(_order.Id, bid_or_ask.price); + double tick = (_order.Side == BuySell.Buy ? 1.0 : -1.0) * compute_tick(_order.Security); + if(distance > _order.CrossingHedgeOrder.TicksThreshold) + _exchange.modify_price(_order.Id, _status.Order.Price + _order.CrossingHedgeOrder.MarketCrossTicks * tick); } } diff --git a/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticLimitOrder.cs b/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticLimitOrder.cs index 485715a0b..ecf782799 100644 --- a/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticLimitOrder.cs +++ b/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticLimitOrder.cs @@ -34,9 +34,9 @@ namespace mbts.spark.orders { foreach(Security sec in _leg_ratios.Keys) { - SyntheticLegExecutionParams param; + LegSpreaderParams param; _execution_strategy.TryGetValue(sec.Id, out param); - if(param.QuoteParams.IsWorking) + if(param.IsActiveQuoting) { IOrderHandle current_order = _children.Values .Where(x => x.security.Equals(sec) && !_hedges.Contains(x.order_id)).FirstOrDefault(); @@ -66,7 +66,7 @@ namespace mbts.spark.orders } void update_existing_order(IOrderHandle current_order, double new_price, uint new_size, BuySell side, - IReadOnlyList this_leg_book, SyntheticLegExecutionParams param, bool bypass_quote_rules) + IReadOnlyList this_leg_book, LegSpreaderParams param, bool bypass_quote_rules) { OrderStatus status; if(_child_status.TryGetValue(current_order.order_id, out status)) @@ -85,9 +85,9 @@ namespace mbts.spark.orders { int ticks_from_center = Convert.ToInt32((this_leg_book[0].price - status.Order.Price) / tick); - var qlevel = param.QuoteParams.TickRangeRequoteRules.TicksAwayToSensitivity - .LastOrDefault(x => x.Key <= ticks_from_center); - uint sensitivity = Math.Max(qlevel.Value, 1); + //var qlevel = param.QuoteParams.TickRangeRequoteRules.TicksAwayToSensitivity + // .LastOrDefault(x => x.Key <= ticks_from_center); + uint sensitivity = Math.Max(/*qlevel.Value*/1u, 1); if(Math.Abs(price_diff) >= sensitivity) current_order.modify_price(new_price); } @@ -114,7 +114,7 @@ namespace mbts.spark.orders bool hit_myself = false; foreach(Security sec in _leg_ratios.Keys) { - SyntheticLegExecutionParams param; + LegSpreaderParams param; if(!_execution_strategy.TryGetValue(sec.Id, out param)) return false; double quote_size = _leg_ratios[sec] * _order_size; @@ -152,26 +152,23 @@ namespace mbts.spark.orders uint size_counter = looking_for_size; foreach(var level in bid_or_ask_book) { - if(param.QuoteParams.PessimisticHedgePricing) + if(level.size >= looking_for_size) //pessimistic { - if(level.size >= looking_for_size) - { - leg_price = level.price; - ok = true; - break; - } - } - else - { - uint level_size = Math.Min(level.size, size_counter); - leg_price += level.price * level_size / looking_for_size; - size_counter -= level_size; - if(size_counter == 0) - { - ok = true; - break; - } + leg_price = level.price; + ok = true; + break; } + //else + //{ + // uint level_size = Math.Min(level.size, size_counter); + // leg_price += level.price * level_size / looking_for_size; + // size_counter -= level_size; + // if(size_counter == 0) + // { + // ok = true; + // break; + // } + //} } if(!ok) return false; diff --git a/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticMarketOrder.cs b/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticMarketOrder.cs index f241b885d..ee38a29dc 100644 --- a/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticMarketOrder.cs +++ b/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticMarketOrder.cs @@ -22,10 +22,10 @@ namespace mbts.spark.orders base.on_spawn(); foreach(var kv in _leg_ratios) { - SyntheticLegExecutionParams param; + LegSpreaderParams param; if(_execution_strategy.TryGetValue(kv.Key.Id, out param)) { - if(param.QuoteParams.IsWorking) + if(param.IsActiveQuoting) { BuySell side = kv.Value > 0.0 ? BuySell.Buy : BuySell.Sell; uint size = Convert.ToUInt32(Math.Abs(kv.Value * _order.Size)); diff --git a/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticOrderBase.cs b/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticOrderBase.cs index 08cb2ac97..ad589cf5d 100644 --- a/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticOrderBase.cs +++ b/src/client/spark/mspark/Algo/Orders/ComplexSpreader/SyntheticOrderBase.cs @@ -33,7 +33,7 @@ namespace mbts.spark.orders public Security leg; public double price; public double size; - public SyntheticLegExecutionParams leg_params; + public LegSpreaderParams leg_params; } override public void on_spawn() @@ -149,12 +149,13 @@ namespace mbts.spark.orders //} double tick = compute_tick(kv.Key); - var post = kv.Value.leg_params.HedgeParams.PostHedgeRules; + PostHedgePriceBasedForcedCross post = null; + if(post.Priority.IsActive) + post = kv.Value.leg_params.PostHedgeParams.PriceBasedCross; var cross = new CrossingHedgeOrder { - CrossSizeThreshold = post == null ? 0 : post.CrossSizeThreshold, - CrossRatioThreshold = post == null ? 1.0 : post.CrossRatioThreshold, - TicksBetterThreshold = Convert.ToUInt32(Math.Abs(hedge_price - kv.Value.price) / tick), + TicksThreshold = (post == null) ? 1000 : post.TicksThreshold, + MarketCrossTicks = (post == null) ? 0 : post.MarketCrossTicks, }; var hedge = create_order(kv.Value.leg, hedge_size, hedge_price, @@ -168,58 +169,65 @@ namespace mbts.spark.orders } } - double compute_hedge_price(Security security, BuySell side, uint size, SyntheticLegExecutionParams param, double base_price) + double compute_hedge_price(Security security, BuySell side, uint size, LegSpreaderParams param, double base_price) { - if(param.HedgeParams.PaylessHedgeRules.EnablePayless || param.HedgeParams.PayupHedgeRules.EnablePayup) - { - PriceSize bbo; - if(side == BuySell.Buy) - bbo = _books[security].Item2.Where(x => Math.Abs(x.price - base_price) < 1e-5).DefaultIfEmpty(PriceSize.no_market).First(); - else - bbo = _books[security].Item1.Where(x => Math.Abs(x.price - base_price) < 1e-5).DefaultIfEmpty(PriceSize.no_market).First(); + PriceSize bbo; + if(side == BuySell.Buy) + bbo = _books[security].Item2.Where(x => Math.Abs(x.price - base_price) < 1e-5).DefaultIfEmpty(PriceSize.no_market).First(); + else + bbo = _books[security].Item1.Where(x => Math.Abs(x.price - base_price) < 1e-5).DefaultIfEmpty(PriceSize.no_market).First(); - check_payup(bbo, security, side, size, param, ref base_price); - check_payless(bbo, security, side, size, param, ref base_price); - } + check_payup(bbo, security, side, size, param, ref base_price); + check_payless(bbo, security, side, size, param, ref base_price); return base_price; } - void check_payup(PriceSize bbo, Security security, BuySell side, uint size, SyntheticLegExecutionParams param, ref double price) + void check_payup(PriceSize bbo, Security security, BuySell side, uint size, LegSpreaderParams param, ref double price) { - var rules = param.HedgeParams.PayupHedgeRules; - if(rules.EnablePayup) + var rules = param?.PreHedgeParams?.QuantityBasedPayupTicks; + var active = rules?.Priority?.IsActive; + if(active.HasValue && active.Value) { double tick = compute_tick(security); - double ratio = rules.RatioThreshold <= 0.0 ? 1.0 : rules.RatioThreshold; + uint thresh = 0u; + if(rules.QuantityThreshold.QuantityCase == QuantityMeasure.QuantityOneofCase.Absolute) + thresh = rules.QuantityThreshold.Absolute; + else + thresh = Convert.ToUInt32(rules.QuantityThreshold.Ratio * size); if(side == BuySell.Buy) { - if(bbo.size <= rules.SizeThreshold || bbo.size <= ratio * size) + if(bbo.size <= thresh ) price += tick * rules.PayupTicks; } else { - if(bbo.size <= rules.SizeThreshold || bbo.size <= ratio * size) + if(bbo.size <= thresh) price -= tick * rules.PayupTicks; } } } - void check_payless(PriceSize bbo, Security security, BuySell side, uint size, SyntheticLegExecutionParams param, ref double price) + void check_payless(PriceSize bbo, Security security, BuySell side, uint size, LegSpreaderParams param, ref double price) { - var rules = param.HedgeParams.PaylessHedgeRules; - if(rules.EnablePayless) + var rules = param?.PreHedgeParams?.QuantityBasedPaylessTicks; + var active = rules?.Priority?.IsActive; + if(active.HasValue && active.Value) { double tick = compute_tick(security); - double ratio = rules.RatioThreshold <= 0.0 ? 1.0 : rules.RatioThreshold; + uint thresh = 0u; + if(rules.QuantityThreshold.QuantityCase == QuantityMeasure.QuantityOneofCase.Absolute) + thresh = rules.QuantityThreshold.Absolute; + else + thresh = Convert.ToUInt32(rules.QuantityThreshold.Ratio * size); if(side == BuySell.Buy) { - if(bbo.size >= rules.SizeThreshold || bbo.size >= ratio * size) - price -= tick * rules.PaylessTicks; + if(bbo.size <= thresh) + price += tick * rules.PaylessTicks; } else { - if(bbo.size >= rules.SizeThreshold || bbo.size >= ratio * size) - price += tick * rules.PaylessTicks; + if(bbo.size <= thresh) + price -= tick * rules.PaylessTicks; } } } diff --git a/src/client/spark/mspark/Algo/Orders/Limit/LimitOrderActor.cs b/src/client/spark/mspark/Algo/Orders/Limit/LimitOrderActor.cs index 2e64e34d9..279382154 100644 --- a/src/client/spark/mspark/Algo/Orders/Limit/LimitOrderActor.cs +++ b/src/client/spark/mspark/Algo/Orders/Limit/LimitOrderActor.cs @@ -22,8 +22,7 @@ namespace mbts.spark.orders throw new NotSupportedException("Limit order doesn't support SecurityType == None"); else if(order.Security.ContractCase == Security.ContractOneofCase.Synthetic) { - var algo = new SimpleSyntheticLimitOrder(fabric, order); - //var algo = new SyntheticLimitOrder(fabric, order); + var algo = new SyntheticLimitOrder(fabric, order); _impl = algo; _cancel = algo; _modify = algo; _pause = null; _crack = null; _poll = null; } else diff --git a/src/client/spark/mspark/Algo/Orders/OrderActorBase.cs b/src/client/spark/mspark/Algo/Orders/OrderActorBase.cs index c5da96b53..f0e290e30 100644 --- a/src/client/spark/mspark/Algo/Orders/OrderActorBase.cs +++ b/src/client/spark/mspark/Algo/Orders/OrderActorBase.cs @@ -18,12 +18,12 @@ namespace mbts.spark.orders readonly protected ConcurrentDictionary _child_status = new ConcurrentDictionary(); readonly protected ConcurrentBag _child_fills = new ConcurrentBag(); - readonly protected ConcurrentDictionary _execution_strategy = new ConcurrentDictionary(); + readonly protected ConcurrentDictionary _execution_strategy = new ConcurrentDictionary(); protected OrderActorBase(IActorFabric fabric, Order order) : base(fabric, order) { - if(order.ExecutionStrategy != null && order.ExecutionStrategy.SecurityIdToParams != null) - order.ExecutionStrategy.SecurityIdToParams.ForEach(x => _execution_strategy.TryAdd(x.Key, x.Value)); + if(order.ExecutionStrategy != null && order.ExecutionStrategy.LegParamsMap != null) + order.ExecutionStrategy.LegParamsMap.ForEach(x => _execution_strategy.TryAdd(x.Key, x.Value)); } protected IOrderHandle spawn_limit_order(Security sec, uint size, double price, BuySell side, diff --git a/src/client/spark/mspark/Algo/Orders/SimpleSpreader/SimpleHedgeOrderActor.cs b/src/client/spark/mspark/Algo/Orders/SimpleSpreader/SimpleHedgeOrderActor.cs deleted file mode 100644 index 05179f548..000000000 --- a/src/client/spark/mspark/Algo/Orders/SimpleSpreader/SimpleHedgeOrderActor.cs +++ /dev/null @@ -1,118 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Linq; - -using bts.api; -using bts.spark; -using mbts.co2; - -using BBOType = System.Tuple; - -namespace mbts.spark.orders -{ - class SimpleHedgeOrderActor : SimpleOrderBase, ICancelable, IModifiable - { - readonly IMarketDataSource _md; - readonly IExchangeGateway _exchange; - readonly IDropCopy _dc; - OrderStatus _status; - readonly double _tick; - public SimpleHedgeOrderActor(IActorFabric fabric, Order order) : base(fabric, order) - { - //TODO Multi exchange - fabric.find_wellknown_service(order.Security.Exchange, out _md); - fabric.find_wellknown_service(order.Security.Exchange, out _exchange); - fabric.find_wellknown_service(order.Security.Exchange, out _dc); - _tick = compute_tick(order.Security); - } - - override protected List child_status_list() - { - var stat = new List(); - if(_status != null) - stat.Add(_status.Status); - return stat; - } - - override protected void on_child_status(OrderStatus child_status, ref OrderStatus merged_status) - { - _status = child_status; - if(_status.Order?.Id != null) - merged_status.Children.Add(_status.Order.Id); - } - - public override void on_spawn() - { - _disposables.Add(_md.subscribe_bbo(_order.Security).Subscribe(x => - { - if(x != null) - watch_hedges(x); - })); - _disposables.Add(_dc.subscribe_fills(new Predicate(x => _order.Id.Equals(x.Order.Id))).Subscribe(x => - { - compute_fill_internal(x); - })); - _disposables.Add(_dc.subscribe_status(new Predicate(x => _order.Id.Equals(x.Order.Id))).Subscribe(x => - { - compute_status_internal(x); - })); - - var clone = _order.Clone(); - clone.LimitOrder = new LimitOrder(); - _exchange.send_order(clone); - } - - void watch_hedges(BBOType bbo) - { - if(_status != null) - { - PriceSize inside_market; - if(_status.Order.Side == BuySell.Buy) - inside_market = bbo.Item2; - else - inside_market = bbo.Item1; - - evaluate_post_hedge_rules(inside_market); - } - } - - void evaluate_post_hedge_rules(PriceSize inside_market) - { - PostHedgePriceBasedForcedCross post = _order.SimpleHedgeOrder.Post; - if(post == null || _status == null || post.TicksThreshold == 0 || post.MarketCrossTicks == 0) - return; - - if(_status.Order.Side == BuySell.Buy) - { - uint diff = Convert.ToUInt32((inside_market.price - _status.Order.Price) / _tick); - if(diff >= post.TicksThreshold) - _exchange.modify_price(_order.Id, _status.Order.Price + _tick * post.MarketCrossTicks); - } - else - { - uint diff = Convert.ToUInt32((_status.Order.Price - inside_market.price) / _tick); - if(diff >= post.TicksThreshold) - _exchange.modify_price(_order.Id, _status.Order.Price - _tick * post.MarketCrossTicks); - } - } - - bool ICancelable.on_cancel() - { - _exchange.cancel_order(_order.Id); - return true; - } - - bool IModifiable.on_modify_price(double new_price) - { - _exchange.modify_price(_order.Id, new_price); - return true; - } - - bool IModifiable.on_modify_size(uint new_size) - { - _exchange.modify_size(_order.Id, new_size); - return true; - } - } -} diff --git a/src/client/spark/mspark/Algo/Orders/SimpleSpreader/SimpleSyntheticLimitOrder.cs b/src/client/spark/mspark/Algo/Orders/SimpleSpreader/SimpleSyntheticLimitOrder.cs deleted file mode 100644 index 1f2107d14..000000000 --- a/src/client/spark/mspark/Algo/Orders/SimpleSpreader/SimpleSyntheticLimitOrder.cs +++ /dev/null @@ -1,358 +0,0 @@ -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; - -using bts.api; -using bts.spark; -using mbts.co2; - -using BookType = System.Tuple; - -namespace mbts.spark.orders -{ - - class SpreaderLegOrderInfo - { - public IOrderHandle handle; - public double last_hedge_price; - } - - struct SpreaderLeg - { - public readonly Security security; - public readonly SimpleExecutionParams param; - public readonly double ratio; - public readonly double mult; - public readonly double tick; - - public BookType book; - public OrderStatus status; - public SpreaderLegOrderInfo order_info; - public SpreaderLeg(Security sec, SimpleExecutionParams para, double ratio, double mult, double tick) - { - this.security = sec; - this.param = para; - this.ratio = ratio; - this.mult = mult; - this.tick = tick; - - this.book = null; - this.status = null; - this.order_info = new SpreaderLegOrderInfo(); - } - } - - class SimpleSyntheticLimitOrder : SimpleOrderBase, IActor, ICancelable, IModifiable - { - readonly IMarketDataSource _md; - - SpreaderLeg _leg1, _leg2; - readonly ConcurrentDictionary _hedges = new ConcurrentDictionary(); - readonly ConcurrentDictionary _status = new ConcurrentDictionary(); - public SimpleSyntheticLimitOrder(IActorFabric fabric, Order order) : base(fabric, order) - { - IDictionary leg_ratios; - IDictionary price_mults; - flatten_synthetic(order, out leg_ratios, out price_mults); - foreach(var sec in leg_ratios.Keys) - { - if(sec.ContractCase == Security.ContractOneofCase.Synthetic) - throw new NotSupportedException("Nested Synthetics not supported"); - fabric.find_wellknown_service(sec.Exchange, out _md); - } - if(leg_ratios.Keys.Count != 2) - throw new NotSupportedException("Simple Synthetic Only Supports 2 Legs"); - - SimpleExecutionStrategy simple = order.SimpleExecutionStrategy; - //map the current UI to this new simple mode - if(simple == null && order.ExecutionStrategy != null) - { - var map = order.ExecutionStrategy.SecurityIdToParams; - Security sec1 = leg_ratios.Keys.First(); - Security sec2 = leg_ratios.Keys.Last(); - - SyntheticLegExecutionParams old1 = map[sec1.Id], old2 = map[sec2.Id]; - SimpleExecutionParams s1 = convert_exec_params(sec1, old1), s2 = convert_exec_params(sec2, old2); - _leg1 = new SpreaderLeg(sec1, s1, leg_ratios[sec1], price_mults[sec1], compute_tick(sec1)); - _leg2 = new SpreaderLeg(sec2, s2, leg_ratios[sec2], price_mults[sec2], compute_tick(sec2)); - } - else - { - Security sec1 = order.SimpleExecutionStrategy.Leg1.Security; - Security sec2 = order.SimpleExecutionStrategy.Leg2.Security; - _leg1 = new SpreaderLeg(sec1, order.SimpleExecutionStrategy.Leg1, leg_ratios[sec1], price_mults[sec1], compute_tick(sec1)); - _leg2 = new SpreaderLeg(sec2, order.SimpleExecutionStrategy.Leg2, leg_ratios[sec2], price_mults[sec2], compute_tick(sec2)); - } - } - - SimpleExecutionParams convert_exec_params(Security sec, SyntheticLegExecutionParams old) - { - uint slop = 0; - var ss = old.QuoteParams?.TickRangeRequoteRules?.TicksAwayToSensitivity?.FirstOrDefault(); - if(ss.HasValue) - slop = ss.Value.Value; - int payup = 0; - var pu = old.HedgeParams?.PayupHedgeRules; - if(pu != null && pu.EnablePayup) - payup = Convert.ToInt32(pu.PayupTicks); - var pl = old.HedgeParams?.PaylessHedgeRules; - if(pl != null && pl.EnablePayless) - payup = -Convert.ToInt32(pu.PayupTicks); - var post = old.HedgeParams?.PostHedgeRules; - - var s = new SimpleExecutionParams() - { - IsHedging = true, - IsWorking = old.QuoteParams.IsWorking, - Security = sec, - Slop = new QuoteMuteZone { InsideTicks = slop, OutsideTicks = slop }, - PreHedgePayupTicks = payup, - Post = new PostHedgePriceBasedForcedCross - { - MarketCrossTicks = post == null ? 0 : post.CrossSizeThreshold, - TicksThreshold = post == null ? 0 : Convert.ToUInt32(post.CrossRatioThreshold), - }, - }; - return s; - } - - override protected List child_status_list() - { - return _status.Values.Select(x => x.Status).ToList(); - } - override protected void on_child_status(OrderStatus child_status, ref OrderStatus merged_status) - { - if(child_status.Order.Security.Equals(_leg1.security)) - _leg1.status = child_status; - if(child_status.Order.Security.Equals(_leg2.security)) - _leg2.status = child_status; - - if(_leg1.order_info.handle != null) - merged_status.Children.Add(_leg1.order_info.handle.order_id); - if(_leg2.order_info.handle != null) - merged_status.Children.Add(_leg2.order_info.handle.order_id); - _status[child_status.Order.Id] = child_status; - } - - - override public void on_spawn() - { - _disposables.Add(_md.subscribe_depth(_leg1.security).Subscribe(x => - { - BookType transformed = Tuple.Create(x.Item1.Select(xx => new PriceSize(xx.price * _leg1.mult, xx.size)).ToArray(), - x.Item2.Select(xx => new PriceSize(xx.price * _leg1.mult, xx.size)).ToArray()); - _leg1.book = transformed; - requote(_leg2, _leg1); - })); - - _disposables.Add(_md.subscribe_depth(_leg2.security).Subscribe(x => - { - BookType transformed = Tuple.Create(x.Item1.Select(xx => new PriceSize(xx.price * _leg2.mult, xx.size)).ToArray(), - x.Item2.Select(xx => new PriceSize(xx.price * _leg2.mult, xx.size)).ToArray()); - _leg2.book = transformed; - requote(_leg1, _leg2); - })); - } - - public override void on_destroy() - { - base.on_destroy(); - } - - #region Quoting - - //always pessimistic - bool walk_book(PriceSize[] book, uint size, out double leg_price) - { - bool ok = false; leg_price = double.NaN; - uint agg = 0; - foreach(var level in book) - { - agg += level.size; - if(agg >= size) - { - leg_price = level.price; - ok = true; - break; - } - } - if(leg_price == 0.0) - leg_price = double.NaN; - return ok; - } - - void new_quote_order(Security security, uint quote_size, double quote_price, BuySell quote_side, double hedge_price, - SpreaderLegOrderInfo order_info) - { - order_info.handle = create_order(security, quote_size, quote_price, quote_side, _order.TimeInForce, new LimitOrder()); - order_info.last_hedge_price = hedge_price; //cache this for later - track_child(order_info.handle); - order_info.handle.spawn(); - } - - void replace_quote_order(SpreaderLeg quote_leg, double hedge_price, ref double quote_price) - { - if(evaluate_prequote_rules(quote_leg, ref quote_price)) - { - if(double.IsNaN(quote_price)) - quote_leg.order_info.handle.cancel(); - else - { - quote_leg.order_info.handle.modify_price(quote_price); - quote_leg.order_info.last_hedge_price = hedge_price; //cache this for later - } - } - } - - void requote_all() - { - requote(_leg1, _leg2); - requote(_leg2, _leg1); - } - - //reprice the quote leg in terms of the hedge leg - void requote(SpreaderLeg quote_leg, SpreaderLeg hedge_leg) - { - if(quote_leg.status != null && is_final_state(quote_leg.status.Status)) - return; - if(!quote_leg.param.IsWorking) - return; - - double quote_price = _order.Price * -1.0; - - int hedge_size_signed = Convert.ToInt32(_order.Size * hedge_leg.ratio); - int hedge_side = (hedge_size_signed < 0 ? -1 : 1); - uint hedge_size = Convert.ToUInt32(Math.Abs(hedge_size_signed)); - - double hedge_price_at_size = double.NaN; - if(hedge_side < 0) - walk_book(hedge_leg.book.Item1, hedge_size, out hedge_price_at_size); - else - walk_book(hedge_leg.book.Item2, hedge_size, out hedge_price_at_size); - - quote_price += hedge_side * hedge_price_at_size * (_order.Side == BuySell.Sell ? -1 : 1); - quote_price = Math.Round(Math.Abs(quote_price) / quote_leg.tick, MidpointRounding.AwayFromZero) * quote_leg.tick; - - if(quote_leg.order_info.handle == null && !double.IsNaN(quote_price)) //new order - { - int quote_size_signed = Convert.ToInt32(_order.Size * quote_leg.ratio); - BuySell quote_side = (quote_size_signed < 0 ? BuySell.Sell : BuySell.Buy); - uint quote_size = Convert.ToUInt32(Math.Abs(quote_size_signed)); - new_quote_order(quote_leg.security, quote_size, quote_price, quote_side, hedge_price_at_size, quote_leg.order_info); - } - else - replace_quote_order(quote_leg, hedge_price_at_size, ref quote_price); - } - - //one day this could modify size, do a fancy rule chain, etc - bool evaluate_prequote_rules(SpreaderLeg quote_leg, ref double quote_price) - { - SimpleExecutionParams param = quote_leg.param; - if(param.Slop != null) - { - double? orig_price = quote_leg.status?.Order.Price; - if(orig_price.HasValue) - { - int diff = Convert.ToInt32((quote_price - orig_price) / quote_leg.tick); - if(diff != 0) - { - if(quote_leg.status.Order.Side == BuySell.Buy) - { - if(diff >= param.Slop.InsideTicks || diff <= -param.Slop.OutsideTicks) - return true; - } - else - { - if(diff <= -param.Slop.InsideTicks || diff >= param.Slop.OutsideTicks) - return true; - } - } - } - return false; - } - return true; - } - - #endregion - - #region Hedging - - protected override void on_child_fill(Fill child_fill, ref Fill merged_fill) - { - if(!_hedges.ContainsKey(child_fill.Order.Id)) - hedge_fill(child_fill); - } - - void reduce_working_order(OrderStatus quote_leg_status, SpreaderLegOrderInfo order_info, uint hedge_size) - { - if(order_info.handle != null && quote_leg_status != null && !is_final_state(quote_leg_status.Status)) - { - if(hedge_size < quote_leg_status.Order.Size) - order_info.handle.modify_size(quote_leg_status.Order.Size - hedge_size); - else - order_info.handle.cancel(); - } - } - - void hedge_fill(Fill fill) - { - SpreaderLeg quote_leg, hedge_leg; - if(fill.Order.Security.Equals(_leg1.security)) - { - quote_leg = _leg1; - hedge_leg = _leg2; - } - else - { - quote_leg = _leg2; - hedge_leg = _leg1; - } - if(!hedge_leg.param.IsHedging) - return; - - double hedge_size_signed = hedge_leg.ratio * fill.Size * (fill.Side == BuySell.Buy ? 1.0 : -1.0); - var hedge_side = (hedge_size_signed > 0.0) ? BuySell.Buy : BuySell.Sell; - uint hedge_size = Convert.ToUInt32(Math.Abs(hedge_size_signed)); - reduce_working_order(hedge_leg.status, hedge_leg.order_info, hedge_size); - double hedge_price = quote_leg.order_info.last_hedge_price + hedge_leg.param.PreHedgePayupTicks * hedge_leg.tick; - - var rules = new SimpleHedgeOrder { Post = hedge_leg.param.Post }; - var hedge = create_order(hedge_leg.security, hedge_size, hedge_price, - hedge_side, Order.Types.TimeInForce.Day, rules); - _hedges[hedge.order_id] = null; - track_child(hedge); - hedge.spawn(); - } - - #endregion - - - bool ICancelable.on_cancel() - { - if(_leg1.order_info.handle != null) - _leg1.order_info.handle.cancel(); - if(_leg2.order_info.handle != null) - _leg2.order_info.handle.cancel(); - return true; - } - - bool IModifiable.on_modify_price(double new_price) - { - _order.Price = new_price; - requote_all(); - return true; - } - - bool IModifiable.on_modify_size(uint new_size) - { - _order.Size = new_size; - _leg1.order_info.handle?.cancel(); - _leg1.order_info = null; - _leg2.order_info.handle?.cancel(); - _leg2.order_info = null; - requote_all(); - return true; - } - } -} diff --git a/src/client/spark/mspark/Core/OrderUtils.cs b/src/client/spark/mspark/Core/OrderUtils.cs index b9ccbb82e..a8219ade6 100644 --- a/src/client/spark/mspark/Core/OrderUtils.cs +++ b/src/client/spark/mspark/Core/OrderUtils.cs @@ -41,8 +41,6 @@ namespace mbts.spark { case Order.AlgoOrderTypeOneofCase.StopLimitOrder: return order.StopLimitOrder; case Order.AlgoOrderTypeOneofCase.IcebergOrder: return order.IcebergOrder; case Order.AlgoOrderTypeOneofCase.CrossingHedgeOrder: return order.CrossingHedgeOrder; - case Order.AlgoOrderTypeOneofCase.SimpleHedgeOrder: return order.SimpleHedgeOrder; - case Order.AlgoOrderTypeOneofCase.CustomOrder: return order.CustomOrder; default: throw new MissingFieldException($"No field for: {order.AlgoOrderTypeCase}"); } diff --git a/src/client/spark/mspark/MarketView/MarketViewVM.cs b/src/client/spark/mspark/MarketView/MarketViewVM.cs index 7931a641b..467a0bda1 100644 --- a/src/client/spark/mspark/MarketView/MarketViewVM.cs +++ b/src/client/spark/mspark/MarketView/MarketViewVM.cs @@ -82,7 +82,7 @@ namespace mbts.spark } private IObservable _get_current_security_observable() { return _current_cell.Select(_get_security).DistinctUntilChanged(); } - private static Security _get_security(DataGridCellInfo cell) { return ((Row)cell.Item).security.value; } + private static Security _get_security(DataGridCellInfo cell) { return (cell.Item as Row)?.security.value; } private static Order _create_order(DataGridCellInfo cell) { return _create_order((Row)cell.Item, (Columns)DataGridEx.GetArgument(cell.Column)); } private static Order _create_order(Row row, Columns col) { var order = new Order { Security = row.security.value, MarketOrder = new MarketOrder(), Price = 0, Size = 1 }; diff --git a/src/client/spark/mspark/Orders/OrderModificationControl.xaml b/src/client/spark/mspark/Orders/OrderModificationControl.xaml index 6cc2c01c7..55143e2da 100644 --- a/src/client/spark/mspark/Orders/OrderModificationControl.xaml +++ b/src/client/spark/mspark/Orders/OrderModificationControl.xaml @@ -18,6 +18,7 @@ + @@ -141,6 +142,47 @@ + + + + + + + + Stop Price + + + + + + + + + + + + Stop Price + + + + + + + + + + + + Show Quantity + + + + + + + + + diff --git a/src/client/spark/mspark/Orders/OrderModificationControl.xaml.cs b/src/client/spark/mspark/Orders/OrderModificationControl.xaml.cs index bfa906775..fcfbed4a8 100644 --- a/src/client/spark/mspark/Orders/OrderModificationControl.xaml.cs +++ b/src/client/spark/mspark/Orders/OrderModificationControl.xaml.cs @@ -16,10 +16,18 @@ namespace mbts.ui.spark internal class OrderModificationTemplateSelector : DataTemplateSelector { + public DataTemplate StopLimitOrderTemplate { get; set; } + public DataTemplate StopMarketOrderTemplate { get; set; } + public DataTemplate IcebergOrderTemplate { get; set; } + public DataTemplate BTSStopOrderTemplate { get; set; } public DataTemplate BTSIcebergOrderTemplate { get; set; } public DataTemplate ReflectionTemplate { get; set; } public override DataTemplate SelectTemplate(object item, DependencyObject container) { - if (item is BTSIcebergOrder) return BTSIcebergOrderTemplate; + if (item is StopLimitOrder) return StopLimitOrderTemplate; + else if (item is StopMarketOrder) return StopMarketOrderTemplate; + else if (item is IcebergOrder) return IcebergOrderTemplate; + else if (item is BTSStopOrder) return BTSStopOrderTemplate; + else if (item is BTSIcebergOrder) return BTSIcebergOrderTemplate; else return ReflectionTemplate; } } diff --git a/src/client/spark/mspark/Orders/OrdersModel.cs b/src/client/spark/mspark/Orders/OrdersModel.cs index ceec4df6c..2aa6b93f8 100644 --- a/src/client/spark/mspark/Orders/OrdersModel.cs +++ b/src/client/spark/mspark/Orders/OrdersModel.cs @@ -125,8 +125,6 @@ namespace mbts.spark case Order.AlgoOrderTypeOneofCase.IcebergOrder: return new OrderMetadata() { KeyBinding = "I", Color = BTSColors.module_colors[4].rgb_color() }; case Order.AlgoOrderTypeOneofCase.CrossingHedgeOrder: - case Order.AlgoOrderTypeOneofCase.SimpleHedgeOrder: - case Order.AlgoOrderTypeOneofCase.CustomOrder: default: case Order.AlgoOrderTypeOneofCase.None: return default_order_metadata; diff --git a/src/client/spark/mspark/Shell/MarketModule.cs b/src/client/spark/mspark/Shell/MarketModule.cs index 533512843..eadacab77 100644 --- a/src/client/spark/mspark/Shell/MarketModule.cs +++ b/src/client/spark/mspark/Shell/MarketModule.cs @@ -176,7 +176,7 @@ namespace mbts.spark BTSMessageBox.Show(warn_msg, "Synthetic Strategy", MessageBoxButton.OK, MessageBoxImage.Exclamation, true, false, true); } private void show_synthetic_editor(Security synthetic, ExecutionStrategy strategy) { - new SyntheticEditorDialog { DataContext = new SyntheticEditorVM2(_bus, synthetic, strategy) }.Show(-200, -300); + var dialog = new SyntheticEditorDialog { DataContext = new SyntheticEditorVM(_bus, synthetic, strategy) }.Show(-200, -300, true); } private string find_unique_synthetic_name() { int i = 1; diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic/ExecutionStrategyEditor.xaml b/src/client/spark/mspark/Shell/Securities/Synthetic/ExecutionStrategyEditor.xaml deleted file mode 100644 index 3f0e2b9f3..000000000 --- a/src/client/spark/mspark/Shell/Securities/Synthetic/ExecutionStrategyEditor.xaml +++ /dev/null @@ -1,156 +0,0 @@ - - - 8.0 - 4.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - Hedge Ratio - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ticks - - Size - - Ratio - - - - - - - - - - - - - - - - - - - - - Ticks - - Size - - Ratio - - - - - - - - - - - - - - - - - - - Size - - Ratio - - - - - - - \ No newline at end of file diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic/ExecutionStrategyEditor.xaml.cs b/src/client/spark/mspark/Shell/Securities/Synthetic/ExecutionStrategyEditor.xaml.cs deleted file mode 100644 index 4dcd98bd7..000000000 --- a/src/client/spark/mspark/Shell/Securities/Synthetic/ExecutionStrategyEditor.xaml.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Windows.Controls; - -namespace mbts.ui.spark -{ - /// - /// Interaction logic for ExecutionStrategyEditor.xaml - /// - public partial class ExecutionStrategyEditor : UserControl - { - public ExecutionStrategyEditor() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic2/LegSpreaderParamsTuple.cs b/src/client/spark/mspark/Shell/Securities/Synthetic/LegSpreaderParamsTuple.cs similarity index 100% rename from src/client/spark/mspark/Shell/Securities/Synthetic2/LegSpreaderParamsTuple.cs rename to src/client/spark/mspark/Shell/Securities/Synthetic/LegSpreaderParamsTuple.cs diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditor.xaml b/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditor.xaml index 62d23010b..5472d3420 100644 --- a/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditor.xaml +++ b/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditor.xaml @@ -1,212 +1,210 @@ - - - 8.0 - 4.0 - - - None - - - - - - - - - - - - - - - - - - - - - - - - - Name - - Tick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Name + + Pricing + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditor.xaml.cs b/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditor.xaml.cs index c1efdf21c..103e4fab0 100644 --- a/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditor.xaml.cs +++ b/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditor.xaml.cs @@ -1,14 +1,176 @@ -using System.Windows; +using bts.api; +using mbts.ui.controls; +using mbts.ui.utility; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Globalization; +using System.Linq; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; namespace mbts.ui.spark { /// /// Interaction logic for SyntheticEditor.xaml /// - public partial class SyntheticEditor : Window + /// + internal partial class SyntheticEditor : Control { - public SyntheticEditor() { - InitializeComponent(); + static SyntheticEditor() { + DefaultStyleKeyProperty.OverrideMetadata(typeof(SyntheticEditor), new FrameworkPropertyMetadata(typeof(SyntheticEditor))); + } + + public interface IParameterViewMetadata { + string[] section_path { get; } + bool read_only { get; } + } + + #region SyntheticName + public static readonly DependencyProperty SyntheticNameProperty = DependencyProperty.Register("SyntheticName", typeof(string), typeof(SyntheticEditor), + new FrameworkPropertyMetadata(string.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault)); + public string SyntheticName { get => GetValue(SyntheticNameProperty) as string; set => SetValue(SyntheticNameProperty, value); } + #endregion + + #region PriceCalc + public static readonly DependencyProperty PriceCalcProperty = DependencyProperty.Register("PriceCalc", typeof(SyntheticContract.Types.PriceCalc), typeof(SyntheticEditor), + new FrameworkPropertyMetadata(SyntheticContract.Types.PriceCalc.Diff, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault)); + public SyntheticContract.Types.PriceCalc PriceCalc { get => (SyntheticContract.Types.PriceCalc)GetValue(PriceCalcProperty); set => SetValue(PriceCalcProperty, value); } + + public static readonly IEnumerable PriceCalcItems = EnumHelper.get_values(); + #endregion + + #region LegTuples + public static readonly DependencyProperty LegTuplesProperty = DependencyProperty.Register("LegTuples", typeof(IReadOnlyCollection), typeof(SyntheticEditor), + new FrameworkPropertyMetadata(new LegSpreaderParamsTuple[0], FrameworkPropertyMetadataOptions.AffectsMeasure, SyncColumns, CoerceLegTuples)); + private static object CoerceLegTuples(DependencyObject d, object baseValue) { + return baseValue is IReadOnlyCollection ? baseValue : new List(); + } + public IReadOnlyCollection LegTuples { get => GetValue(LegTuplesProperty) as IReadOnlyCollection; set => SetValue(LegTuplesProperty, value); } + #endregion + + #region ParameterRows + public static readonly DependencyProperty ParameterRowsProperty = DependencyProperty.Register("ParameterRows", typeof(IEnumerable), typeof(SyntheticEditor), + new PropertyMetadata(Enumerable.Empty(), OnParameterRowsChanged)); + private static void OnParameterRowsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { + var rows = e.NewValue as IEnumerable; + if (rows != null) { + var prv = CollectionViewSource.GetDefaultView(rows); + int n_groups = rows.Max(r => r.section_path.Length); + for (int i = 0; i < n_groups; i++) prv.GroupDescriptions.Add(new PropertyGroupDescription($"[{i}]")); + d.SetValue(ParameterRowsViewPropertyKey, prv); + } else d.SetValue(ParameterRowsViewPropertyKey, null); + } + public IEnumerable ParameterRows { get => GetValue(ParameterRowsProperty) as IEnumerable; set => SetValue(ParameterRowsProperty, value); } + #endregion + + #region ParameterRowsView (ReadOnly) + private static readonly DependencyPropertyKey ParameterRowsViewPropertyKey = DependencyProperty.RegisterReadOnly("ParameterRowsView", typeof(ICollectionView), typeof(SyntheticEditor), + new PropertyMetadata()); + public static readonly DependencyProperty ParameterRowsViewProperty = ParameterRowsViewPropertyKey.DependencyProperty; + public ICollectionView ParameterRowsView { get => GetValue(ParameterRowsViewProperty) as ICollectionView; private set => SetValue(ParameterRowsViewPropertyKey, value); } + #endregion + + #region ParameterCellTemplateConverter + public static readonly DependencyProperty ParameterCellTemplateConverterProperty = DependencyProperty.Register("ParameterCellTemplateConverter", typeof(IValueConverter), typeof(SyntheticEditor), + new PropertyMetadata(SyncColumns)); + public IValueConverter ParameterCellTemplateConverter { get => GetValue(ParameterCellTemplateConverterProperty) as IValueConverter; set => SetValue(ParameterCellTemplateConverterProperty, value); } + #endregion + + #region ParameterCellEditingTemplateConverter + public static readonly DependencyProperty ParameterCellEditingTemplateConverterProperty = DependencyProperty.Register("ParameterCellEditingTemplateConverter", typeof(IValueConverter), typeof(SyntheticEditor), + new PropertyMetadata(SyncColumns)); + public IValueConverter ParameterCellEditingTemplateConverter { get => GetValue(ParameterCellEditingTemplateConverterProperty) as IValueConverter; set => SetValue(ParameterCellEditingTemplateConverterProperty, value); } + #endregion + + #region RowHasError + public static readonly DependencyProperty RowHasErrorsProperty = DependencyProperty.RegisterAttached("RowHasErrors", typeof(bool), typeof(SyntheticEditor), new PropertyMetadata(false)); + public static bool GetRowHasErrors(DependencyObject d) { return (bool)d.GetValue(RowHasErrorsProperty); } + public static void SetRowHasErrors(DependencyObject d, bool value) { d.SetValue(RowHasErrorsProperty, value); } + #endregion + + #region CellDataType + public static readonly DependencyProperty CellDataTypeProperty = DependencyProperty.RegisterAttached("CellDataType", typeof(Type), typeof(SyntheticEditor), new PropertyMetadata(null)); + public static Type GetCellDataType(DependencyObject d) { return d.GetValue(CellDataTypeProperty) as Type; } + public static void SetCellDataType(DependencyObject d, Type value) { d.SetValue(CellDataTypeProperty, value); } + #endregion + + private static void SyncColumns(DependencyObject d, DependencyPropertyChangedEventArgs e) { ((SyntheticEditor)d)._sync_columns(); } + public override void OnApplyTemplate() { _sync_columns(); } + + private SyntheticEditorGridLineAdorner _dg_line_adorner; + + private void _sync_columns() { + _dg_line_adorner?.Dispose(); + var dg = (DataGridEx)GetTemplateChild("PART_DataGrid"); + if (dg != null) { + dg.Columns.SetItems(LegTuples.Select(l => { + var col = new DataGridColumnInternal(l.leg.Security, ParameterCellTemplateConverter, ParameterCellEditingTemplateConverter) { Width = 60 }; + DataGridEx.SetRightBorder(col, new DataGridExVerticalLine(false, true, System.Windows.Media.Colors.DarkGray, 1)); + return col; + })); + _dg_line_adorner = new SyntheticEditorGridLineAdorner(dg); + } + } + + private class DataGridColumnInternal : DataGridDynamicColumn { + public DataGridColumnInternal(Security security, IValueConverter cell_template_converter, IValueConverter cell_editing_template_converter) { + Header = security.ToString(null); + SetValue(DataGridEx.CellKeyProperty, security); + _cell_template_converter = cell_template_converter; + _cell_editing_template_converter = cell_editing_template_converter; + } + + private readonly IValueConverter _cell_template_converter, _cell_editing_template_converter; + + // I decided this was an easy and simple enough solution to justify breaking the mvvm paradigm + // The alternative - within strict bounds of the paradigm - is to change the DataGridParameterCellTemplateConverter into an IMultiValueConverter, bound to data_type AND read_only + protected override FrameworkElement GenerateEditingElement(DataGridCell cell, object dataItem) { + var rm = dataItem as IParameterViewMetadata; + return rm != null && rm.read_only ? base.GenerateElement(cell, dataItem) : base.GenerateEditingElement(cell, dataItem); + } + protected override FrameworkElement generate_element_internal() { return _generate_element(_cell_template_converter); } + protected override FrameworkElement generate_editing_element_internal() { return _generate_element(_cell_editing_template_converter); } + + private FrameworkElement _generate_element(IValueConverter cell_template_converter) { + var rv = new ContentControl(); + rv.SetBinding(ContentControl.ContentProperty, new Binding()); + rv.SetBinding(ContentControl.ContentTemplateProperty, new Binding("data_type") { Converter = cell_template_converter }); + return rv; + } + } + } + + [ValueConversion(typeof(int), typeof(Thickness))] + internal class RowHeaderGroupIndentConverter : IValueConverter { + public double Indent { get; set; } + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { + return new Thickness(((int)value + 1) * Indent, 0, 0, 0); + } + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { + throw new NotImplementedException(); + } + } + + [ValueConversion(typeof(Type), typeof(DataTemplate))] + internal class DataGridParameterCellTemplateConverter : IValueConverter { + public DataTemplate DoubleTemplate { get; set; } + public DataTemplate BooleanTemplate { get; set; } + public DataTemplate IntTemplate { get; set; } + public DataTemplate UIntTemplate { get; set; } + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { + Type t = (Type)value; + if (t == typeof(double)) return DoubleTemplate; + else if (t == typeof(bool)) return BooleanTemplate; + else if (t == typeof(int)) return IntTemplate; + else if (t == typeof(uint)) return UIntTemplate; + else return null; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { + throw new NotImplementedException(); } } } \ No newline at end of file diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditorDialog.xaml b/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorDialog.xaml similarity index 79% rename from src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditorDialog.xaml rename to src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorDialog.xaml index 71058a275..a7f4aee02 100644 --- a/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditorDialog.xaml +++ b/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorDialog.xaml @@ -4,13 +4,12 @@ xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" xmlns:usp="clr-namespace:mbts.ui.spark" - u:WindowStyle.AllowResize="True" u:WindowStyle.SizeToContent="WidthAndHeight" Style="{StaticResource BTSDialogTitleTemplate}"> - + @@ -19,7 +18,7 @@ - + diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditorDialog.xaml.cs b/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorDialog.xaml.cs similarity index 100% rename from src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditorDialog.xaml.cs rename to src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorDialog.xaml.cs diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorGridLineAdorner.cs b/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorGridLineAdorner.cs new file mode 100644 index 000000000..ee1019239 --- /dev/null +++ b/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorGridLineAdorner.cs @@ -0,0 +1,33 @@ +using mbts.ui.controls; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Controls; +using System.Windows; +using System.Windows.Media; + +namespace mbts.ui.spark +{ + internal partial class SyntheticEditor : Control { + internal class SyntheticEditorGridLineAdorner : DataGridExVerticalLineAdorner + { + public SyntheticEditorGridLineAdorner(DataGridEx grid) : base(grid) { } + + private ItemsPresenter _items_presenter; + + protected override IEnumerable get_other_hooks() { + _items_presenter = _grid.visual_children_where(el => el is ItemsPresenter).Cast().FirstOrDefault(); + if (_items_presenter != null) { + _items_presenter.SizeChanged += _items_presenter_SizeChanged; + yield return Disposable.Create(() => _items_presenter.SizeChanged -= _items_presenter_SizeChanged); + } + } + + private void _items_presenter_SizeChanged(object sender, SizeChangedEventArgs e) { InvalidateVisual(); } + + protected override void draw_vertical_line(DrawingContext dc, double x, DataGridExVerticalLine line) { + if (_items_presenter != null) dc.DrawLine(line.pen.Value, new Point(x - 10, 58), new Point(x - 10, _items_presenter.ActualHeight + 58)); + } + } + } +} diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorVM.cs b/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorVM.cs deleted file mode 100644 index adf00a560..000000000 --- a/src/client/spark/mspark/Shell/Securities/Synthetic/SyntheticEditorVM.cs +++ /dev/null @@ -1,186 +0,0 @@ -using bts.api; -using bts.spark; -using mbts.collections.extensions; -using mbts.ui; -using mbts.ui.shell; -using System; -using System.Collections.ObjectModel; -using System.Linq; -using System.Reactive.Linq; -using System.Windows.Input; - -namespace mbts.spark -{ - internal class SyntheticEditorVM : ViewModelBase - { - public SyntheticEditorVM(IBus bus, Security security, ExecutionStrategy strategy, bool is_new) { - var model = new SyntheticEditorModel(bus); - if (this.is_new = is_new) { - commit = new DelegateCommand(() => model.save(get_security(), get_strategy())); - title = "Create Synthetic"; - } else { - if (strategy == null) throw new ArgumentNullException("strategy"); - commit = new DelegateCommand(() => model.save(get_security(), get_strategy())); - title = "{0} Strategy".fmt(security.Synthetic.Name); - } - name = security.Synthetic.Name; - legs = new ObservableCollection(security.Synthetic.Legs.Select(l => new LegVM(l, strategy?.SecurityIdToParams?.GetValueOrDefault(l.Security.Id)))); - _tick_size = backing(nameof(tick_size), security.ContractSpec.LowTick); - } - - private Security get_security() { - var contract = new SyntheticContract { Name = name }; - foreach (var l in legs) contract.Legs.Add(l.get_contract_leg()); - return new Security { Synthetic = contract, ContractSpec = new ContractSpecification { HighTick = tick_size, LowTick = tick_size, PriceBreak = double.MinValue } }; - } - private ExecutionStrategy get_strategy() { - var rv = new ExecutionStrategy(); - foreach (var l in legs.Where(l => l.security != null)) rv.SecurityIdToParams[l.security.Id] = l.get_params_obj(); - return rv; - } - - private readonly Property _tick_size; - - public bool is_new { get; } - public string title { get; } - public string name { get; set; } - public double tick_size { get => _tick_size.Value; set => _tick_size.Value = value; } - public ObservableCollection legs { get; } - public ICommand commit { get; private set; } - - public class LegVM : ViewModelBase { - public LegVM(ContractLeg l, SyntheticLegExecutionParams selp) { - security = l.Security; - side = l.Side; - if (selp == null) selp = new SyntheticLegExecutionParams { HedgeParams = _default_hedge_params(), QuoteParams = _default_quote_params() }; - else _sanitize_execution_params(ref selp); - _is_working = backing(nameof(is_working), selp.QuoteParams.IsWorking); - _show_strategy = backing(nameof(show_strategy), true); - quote_params = new QuoteParamsVM(selp.QuoteParams); - hedge_params = new HedgeParamsVM(selp.HedgeParams); - } - private readonly Property _is_working, _show_strategy; - - #region Defaults/Sanitization - private static QuoteParams _default_quote_params() { - var rv = new QuoteParams { LeanQuantityRatio = 1.0, IsWorking = true, PessimisticHedgePricing = true }; - _sanitize_quote_params(rv); - return rv; - } - private static HedgeParams _default_hedge_params() { - var rv = new HedgeParams(); - _sanitize_hedge_params(rv); - return rv; - } - private static void _sanitize_execution_params(ref SyntheticLegExecutionParams selp) { - _sanitize_quote_params(selp.QuoteParams); - _sanitize_hedge_params(selp.HedgeParams); - } - private static void _sanitize_quote_params(QuoteParams quote_parms) { - if (quote_parms == null) quote_parms = new QuoteParams { LeanQuantityRatio = 1.0, IsWorking = true, PessimisticHedgePricing = true }; - if (quote_parms.TickRangeRequoteRules == null) quote_parms.TickRangeRequoteRules = new TickRangeRequoteRules(); - } - private static void _sanitize_hedge_params(HedgeParams hedge_params) { - if (hedge_params == null) hedge_params = new HedgeParams(); - if (hedge_params.PayupHedgeRules == null) hedge_params.PayupHedgeRules = new PayupHedgeRules { RatioThreshold = 1.0, SizeThreshold = 0 }; - if (hedge_params.PaylessHedgeRules == null) hedge_params.PaylessHedgeRules = new PaylessHedgeRules { RatioThreshold = 1.0, SizeThreshold = 0 }; - if (hedge_params.PostHedgeRules == null) hedge_params.PostHedgeRules = new PostHedgeRules { CrossRatioThreshold = 1.0, CrossSizeThreshold = 0 }; - } - #endregion - - public Security security { get; } - public BuySell side { get; set; } - public uint quantity { get; set; } = 1u; - public double multiplier { get; set; } = 1.0; - public bool is_working { get => _is_working.Value; set => _is_working.Value = value; } - public bool show_strategy { get => _show_strategy.Value; set => _show_strategy.Value = value; } - public QuoteParamsVM quote_params { get; private set; } - public HedgeParamsVM hedge_params { get; private set; } - - public ContractLeg get_contract_leg() { return new ContractLeg { Quantity = quantity, Security = security, Side = side, PriceMultiplier = multiplier }; } - public SyntheticLegExecutionParams get_params_obj() { return new SyntheticLegExecutionParams { QuoteParams = quote_params.get_params_obj(is_working), HedgeParams = hedge_params.get_params_obj() }; } - - public class QuoteParamsVM { - public QuoteParamsVM(QuoteParams from) { - lean_quantity_ratio = from.LeanQuantityRatio; - pessimistic_hedge_pricing = from.PessimisticHedgePricing; - foreach (var rr in from.TickRangeRequoteRules.TicksAwayToSensitivity) tick_range_requote_items.Add(new TickRangeRequoteVM(rr.Key, rr.Value)); - remove_tick_range_requote_item = new DelegateCommand(item => tick_range_requote_items.Remove(item)); - add_tick_range_requote_item = new DelegateCommand(() => tick_range_requote_items.Add(new TickRangeRequoteVM(tick_range_requote_items.Count == 0 ? 0 : tick_range_requote_items.Select(trr => trr.range).Max(), 1))); - } - public double lean_quantity_ratio { get; set; } - public bool pessimistic_hedge_pricing { get; set; } - public ObservableCollection tick_range_requote_items { get; } = new ObservableCollection(); - public ICommand remove_tick_range_requote_item { get; private set; } - public ICommand add_tick_range_requote_item { get; private set; } - - public QuoteParams get_params_obj(bool is_working) { - var rv = new QuoteParams { PessimisticHedgePricing = pessimistic_hedge_pricing, LeanQuantityRatio = lean_quantity_ratio, IsWorking = is_working, TickRangeRequoteRules = new TickRangeRequoteRules() }; - foreach (var rr in tick_range_requote_items) rv.TickRangeRequoteRules.TicksAwayToSensitivity[rr.range] = rr.sensitivity; - return rv; - } - - public class TickRangeRequoteVM { - public TickRangeRequoteVM() : this(0, 0) { } - public TickRangeRequoteVM(uint range, uint sensitivity) { this.range = range; this.sensitivity = sensitivity; } - public uint range { get; set; } - public uint sensitivity { get; set; } - } - } - - public class HedgeParamsVM { - public HedgeParamsVM(HedgeParams from) { - payup_hedge_rules = new PayupHedgeRulesVM(from.PayupHedgeRules); - payless_hedge_rules = new PaylessHedgeRulesVM(from.PaylessHedgeRules); - post_hedge_rules = new PostHedgeRulesVM(from.PostHedgeRules); - } - - public PayupHedgeRulesVM payup_hedge_rules { get; private set; } - public PaylessHedgeRulesVM payless_hedge_rules { get; private set; } - public PostHedgeRulesVM post_hedge_rules { get; private set; } - - public HedgeParams get_params_obj() { return new HedgeParams { PayupHedgeRules = payup_hedge_rules.get_params_obj(), PaylessHedgeRules = payless_hedge_rules.get_params_obj() , PostHedgeRules = post_hedge_rules.get_params_obj() }; } - - public class PayupHedgeRulesVM { - public PayupHedgeRulesVM(PayupHedgeRules from) { - enable_payup = from.EnablePayup; - payup_ticks = from.PayupTicks; - size_threshold = from.SizeThreshold; - ratio_threshold = from.RatioThreshold; - } - public bool enable_payup { get; set; } - public uint payup_ticks { get; set; } - public uint size_threshold { get; set; } - public double ratio_threshold { get; set; } - public PayupHedgeRules get_params_obj() { return new PayupHedgeRules { EnablePayup = enable_payup, PayupTicks = payup_ticks, SizeThreshold = size_threshold, RatioThreshold = ratio_threshold }; } - } - - public class PaylessHedgeRulesVM { - public PaylessHedgeRulesVM(PaylessHedgeRules from) { - enable_payless = from.EnablePayless; - payless_ticks = from.PaylessTicks; - size_threshold = from.SizeThreshold; - ratio_threshold = from.RatioThreshold; - } - public bool enable_payless { get; set; } - public uint payless_ticks { get; set; } - public uint size_threshold { get; set; } - public double ratio_threshold { get; set; } - public PaylessHedgeRules get_params_obj() { return new PaylessHedgeRules { EnablePayless = enable_payless, PaylessTicks = payless_ticks, SizeThreshold = size_threshold, RatioThreshold = ratio_threshold }; } - } - - public class PostHedgeRulesVM { - public PostHedgeRulesVM(PostHedgeRules from) { - enable_post_hedge = from.EnablePostHedge; - cross_size_threshold = from.CrossSizeThreshold; - cross_ratio_threshold = from.CrossRatioThreshold; - } - public bool enable_post_hedge { get; set; } - public uint cross_size_threshold { get; set; } - public double cross_ratio_threshold { get; set; } - public PostHedgeRules get_params_obj() { return new PostHedgeRules { EnablePostHedge = enable_post_hedge, CrossSizeThreshold = cross_size_threshold, CrossRatioThreshold = cross_ratio_threshold }; } - } - } - } - } -} \ No newline at end of file diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic2/VM/Cell.cs b/src/client/spark/mspark/Shell/Securities/Synthetic/VM/Cell.cs similarity index 93% rename from src/client/spark/mspark/Shell/Securities/Synthetic2/VM/Cell.cs rename to src/client/spark/mspark/Shell/Securities/Synthetic/VM/Cell.cs index dbba8d099..4cae60496 100644 --- a/src/client/spark/mspark/Shell/Securities/Synthetic2/VM/Cell.cs +++ b/src/client/spark/mspark/Shell/Securities/Synthetic/VM/Cell.cs @@ -4,8 +4,7 @@ using System; namespace mbts.spark { - internal partial class SyntheticEditorVM2 - { + internal partial class SyntheticEditorVM { internal class Cell : ViewModelBase, ICell { public Cell(RowModelBase model, LegSpreaderParamsTuple leg_tup) { _model = model; diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic2/VM/RowModel.cs b/src/client/spark/mspark/Shell/Securities/Synthetic/VM/RowModel.cs similarity index 97% rename from src/client/spark/mspark/Shell/Securities/Synthetic2/VM/RowModel.cs rename to src/client/spark/mspark/Shell/Securities/Synthetic/VM/RowModel.cs index 2f8dbe70c..fd6582c52 100644 --- a/src/client/spark/mspark/Shell/Securities/Synthetic2/VM/RowModel.cs +++ b/src/client/spark/mspark/Shell/Securities/Synthetic/VM/RowModel.cs @@ -9,9 +9,8 @@ using System.Reactive.Linq; namespace mbts.spark { - internal partial class SyntheticEditorVM2 - { - internal interface IRowModel : SyntheticEditor2.IParameterViewMetadata { + internal partial class SyntheticEditorVM { + internal interface IRowModel : SyntheticEditor.IParameterViewMetadata { string display_name { get; } bool has_errors(IReadOnlyCollection leg_tups); ICell create_cell(LegSpreaderParamsTuple leg_tup); @@ -38,7 +37,7 @@ namespace mbts.spark Payless = "Pay Less", Payup = "Pay up", OrderType = "Order Type", - MarketForcedCross = "Price-Based Mkt Forced Cross", + MarketForcedCross = "Price-Based Forced Cross", TimeForcedCross = "Time-Based Forced Cross"; } diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic2/VM/RowVM.cs b/src/client/spark/mspark/Shell/Securities/Synthetic/VM/RowVM.cs similarity index 92% rename from src/client/spark/mspark/Shell/Securities/Synthetic2/VM/RowVM.cs rename to src/client/spark/mspark/Shell/Securities/Synthetic/VM/RowVM.cs index 0cfc60969..6c2289a75 100644 --- a/src/client/spark/mspark/Shell/Securities/Synthetic2/VM/RowVM.cs +++ b/src/client/spark/mspark/Shell/Securities/Synthetic/VM/RowVM.cs @@ -8,9 +8,9 @@ using System.Linq; namespace mbts.spark { - internal partial class SyntheticEditorVM2 + internal partial class SyntheticEditorVM { - internal class RowVM : DataGridExRow, SyntheticEditor2.IParameterViewMetadata, IDisposable { + internal class RowVM : DataGridExRow, SyntheticEditor.IParameterViewMetadata, IDisposable { public RowVM(IRowModel model, IReadOnlyCollection legs) { display_name = model.display_name; section_path = model.section_path; diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic2/VM/SyntheticEditorVM2.cs b/src/client/spark/mspark/Shell/Securities/Synthetic/VM/SyntheticEditorVM.cs similarity index 89% rename from src/client/spark/mspark/Shell/Securities/Synthetic2/VM/SyntheticEditorVM2.cs rename to src/client/spark/mspark/Shell/Securities/Synthetic/VM/SyntheticEditorVM.cs index ab05876c6..0de8549e4 100644 --- a/src/client/spark/mspark/Shell/Securities/Synthetic2/VM/SyntheticEditorVM2.cs +++ b/src/client/spark/mspark/Shell/Securities/Synthetic/VM/SyntheticEditorVM.cs @@ -2,6 +2,7 @@ using bts.spark; using mbts.ui; using mbts.ui.spark; +using System; using System.Collections.Generic; using System.Linq; using System.Windows.Input; @@ -11,14 +12,14 @@ namespace mbts.spark /// /// The view model designed to serve as the DataContext for the SyntheticEditor2 control /// - internal partial class SyntheticEditorVM2 { + internal partial class SyntheticEditorVM : IDisposable { /// /// Initializes a new instance of SyntheticEditorVM2 class. The commit command will create a new Synthetic if synthetic's Id is 0, otherwise it will modify the existing synthetic's strategy. /// /// The application bus /// The new synthetic security to create, or existing synthetic security who's strategy to modify, on commit /// The new strategy to create, or existing strategy to modify, on commit - public SyntheticEditorVM2(IBus bus, Security synthetic, ExecutionStrategy strategy) { + public SyntheticEditorVM(IBus bus, Security synthetic, ExecutionStrategy strategy) { _synthetic = synthetic; leg_tuples = _synthetic.Synthetic.Legs.Select(l => new LegSpreaderParamsTuple(l, strategy.LegParamsMap[l.Security.Id])).ToList(); var payless = new PaylessRowGroup(); @@ -57,5 +58,9 @@ namespace mbts.spark public IReadOnlyCollection leg_tuples { get; } public IReadOnlyCollection rows { get; } public ICommand commit { get; } + + public void Dispose() { + foreach (var r in rows) r.Dispose(); + } } } \ No newline at end of file diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditor2.xaml b/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditor2.xaml deleted file mode 100644 index a9d49b804..000000000 --- a/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditor2.xaml +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Name - - Pricing - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditor2.xaml.cs b/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditor2.xaml.cs deleted file mode 100644 index 8bd237b86..000000000 --- a/src/client/spark/mspark/Shell/Securities/Synthetic2/SyntheticEditor2.xaml.cs +++ /dev/null @@ -1,165 +0,0 @@ -using bts.api; -using mbts.ui.controls; -using mbts.ui.utility; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Globalization; -using System.Linq; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; - -namespace mbts.ui.spark -{ - /// - /// Interaction logic for SyntheticEditor2.xaml - /// - /// - internal partial class SyntheticEditor2 : Control - { - static SyntheticEditor2() { - DefaultStyleKeyProperty.OverrideMetadata(typeof(SyntheticEditor2), new FrameworkPropertyMetadata(typeof(SyntheticEditor2))); - } - - public interface IParameterViewMetadata { - string[] section_path { get; } - bool read_only { get; } - } - - #region SyntheticName - public static readonly DependencyProperty SyntheticNameProperty = DependencyProperty.Register("SyntheticName", typeof(string), typeof(SyntheticEditor2), - new FrameworkPropertyMetadata(string.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault)); - public string SyntheticName { get => GetValue(SyntheticNameProperty) as string; set => SetValue(SyntheticNameProperty, value); } - #endregion - - #region PriceCalc - public static readonly DependencyProperty PriceCalcProperty = DependencyProperty.Register("PriceCalc", typeof(SyntheticContract.Types.PriceCalc), typeof(SyntheticEditor2), - new FrameworkPropertyMetadata(SyntheticContract.Types.PriceCalc.Diff, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault)); - public SyntheticContract.Types.PriceCalc PriceCalc { get => (SyntheticContract.Types.PriceCalc)GetValue(PriceCalcProperty); set => SetValue(PriceCalcProperty, value); } - - public static readonly IEnumerable PriceCalcItems = EnumHelper.get_values(); - #endregion - - #region LegTuples - public static readonly DependencyProperty LegTuplesProperty = DependencyProperty.Register("LegTuples", typeof(IReadOnlyCollection), typeof(SyntheticEditor2), - new FrameworkPropertyMetadata(new LegSpreaderParamsTuple[0], FrameworkPropertyMetadataOptions.AffectsMeasure, SyncColumns, CoerceLegTuples)); - private static object CoerceLegTuples(DependencyObject d, object baseValue) { - return baseValue is IReadOnlyCollection ? baseValue : new List(); - } - public IReadOnlyCollection LegTuples { get => GetValue(LegTuplesProperty) as IReadOnlyCollection; set => SetValue(LegTuplesProperty, value); } - #endregion - - #region ParameterRows - public static readonly DependencyProperty ParameterRowsProperty = DependencyProperty.Register("ParameterRows", typeof(IEnumerable), typeof(SyntheticEditor2), - new PropertyMetadata(Enumerable.Empty(), OnParameterRowsChanged)); - private static void OnParameterRowsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { - var rows = e.NewValue as IEnumerable; - if (rows != null) { - var prv = CollectionViewSource.GetDefaultView(rows); - int n_groups = rows.Max(r => r.section_path.Length); - for (int i = 0; i < n_groups; i++) prv.GroupDescriptions.Add(new PropertyGroupDescription($"[{i}]")); - d.SetValue(ParameterRowsViewPropertyKey, prv); - } else d.SetValue(ParameterRowsViewPropertyKey, null); - } - public IEnumerable ParameterRows { get => GetValue(ParameterRowsProperty) as IEnumerable; set => SetValue(ParameterRowsProperty, value); } - #endregion - - #region ParameterRowsView (ReadOnly) - private static readonly DependencyPropertyKey ParameterRowsViewPropertyKey = DependencyProperty.RegisterReadOnly("ParameterRowsView", typeof(ICollectionView), typeof(SyntheticEditor2), - new PropertyMetadata()); - public static readonly DependencyProperty ParameterRowsViewProperty = ParameterRowsViewPropertyKey.DependencyProperty; - public ICollectionView ParameterRowsView { get => GetValue(ParameterRowsViewProperty) as ICollectionView; private set => SetValue(ParameterRowsViewPropertyKey, value); } - #endregion - - #region ParameterCellTemplateConverter - public static readonly DependencyProperty ParameterCellTemplateConverterProperty = DependencyProperty.Register("ParameterCellTemplateConverter", typeof(IValueConverter), typeof(SyntheticEditor2), - new PropertyMetadata(SyncColumns)); - public IValueConverter ParameterCellTemplateConverter { get => GetValue(ParameterCellTemplateConverterProperty) as IValueConverter; set => SetValue(ParameterCellTemplateConverterProperty, value); } - #endregion - - #region ParameterCellEditingTemplateConverter - public static readonly DependencyProperty ParameterCellEditingTemplateConverterProperty = DependencyProperty.Register("ParameterCellEditingTemplateConverter", typeof(IValueConverter), typeof(SyntheticEditor2), - new PropertyMetadata(SyncColumns)); - public IValueConverter ParameterCellEditingTemplateConverter { get => GetValue(ParameterCellEditingTemplateConverterProperty) as IValueConverter; set => SetValue(ParameterCellEditingTemplateConverterProperty, value); } - #endregion - - #region RowHasError - public static readonly DependencyProperty RowHasErrorsProperty = DependencyProperty.RegisterAttached("RowHasErrors", typeof(bool), typeof(SyntheticEditor2), new PropertyMetadata(false)); - public static bool GetRowHasErrors(DependencyObject d) { return (bool)d.GetValue(RowHasErrorsProperty); } - public static void SetRowHasErrors(DependencyObject d, bool value) { d.SetValue(RowHasErrorsProperty, value); } - #endregion - - #region CellDataType - public static readonly DependencyProperty CellDataTypeProperty = DependencyProperty.RegisterAttached("CellDataType", typeof(Type), typeof(SyntheticEditor2), new PropertyMetadata(null)); - public static Type GetCellDataType(DependencyObject d) { return d.GetValue(CellDataTypeProperty) as Type; } - public static void SetCellDataType(DependencyObject d, Type value) { d.SetValue(CellDataTypeProperty, value); } - #endregion - - private static void SyncColumns(DependencyObject d, DependencyPropertyChangedEventArgs e) { ((SyntheticEditor2)d)._sync_columns(); } - public override void OnApplyTemplate() { _sync_columns(); } - - private void _sync_columns() { - ((DataGrid)GetTemplateChild("PART_DataGrid"))?.Columns.SetItems(LegTuples.Select(l => new DataGridColumnInternal(l.leg.Security, ParameterCellTemplateConverter, ParameterCellEditingTemplateConverter) { Width = 60 })); - } - - private class DataGridColumnInternal : DataGridDynamicColumn { - public DataGridColumnInternal(Security security, IValueConverter cell_template_converter, IValueConverter cell_editing_template_converter) { - Header = security.ToString(null); - SetValue(DataGridEx.CellKeyProperty, security); - _cell_template_converter = cell_template_converter; - _cell_editing_template_converter = cell_editing_template_converter; - } - - private readonly IValueConverter _cell_template_converter, _cell_editing_template_converter; - - // I decided this was an easy and simple enough solution to justify breaking the mvvm paradigm - // The alternative - within strict bounds of the paradigm - is to change the DataGridParameterCellTemplateConverter into an IMultiValueConverter, bound to data_type AND read_only - protected override FrameworkElement GenerateEditingElement(DataGridCell cell, object dataItem) { - var rm = dataItem as IParameterViewMetadata; - return rm != null && rm.read_only ? base.GenerateElement(cell, dataItem) : base.GenerateEditingElement(cell, dataItem); - } - protected override FrameworkElement generate_element_internal() { return _generate_element(_cell_template_converter); } - protected override FrameworkElement generate_editing_element_internal() { return _generate_element(_cell_editing_template_converter); } - - private FrameworkElement _generate_element(IValueConverter cell_template_converter) { - var rv = new ContentControl(); - rv.SetBinding(ContentControl.ContentProperty, new Binding()); - rv.SetBinding(ContentControl.ContentTemplateProperty, new Binding("data_type") { Converter = cell_template_converter }); - return rv; - } - } - } - - [ValueConversion(typeof(int), typeof(Thickness))] - internal class RowHeaderGroupIndentConverter : IValueConverter { - public double Indent { get; set; } - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - return new Thickness(((int)value + 1) * Indent, 0, 0, 0); - } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { - throw new NotImplementedException(); - } - } - - [ValueConversion(typeof(Type), typeof(DataTemplate))] - internal class DataGridParameterCellTemplateConverter : IValueConverter { - public DataTemplate DoubleTemplate { get; set; } - public DataTemplate BooleanTemplate { get; set; } - public DataTemplate IntTemplate { get; set; } - public DataTemplate UIntTemplate { get; set; } - - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - Type t = (Type)value; - if (t == typeof(double)) return DoubleTemplate; - else if (t == typeof(bool)) return BooleanTemplate; - else if (t == typeof(int)) return IntTemplate; - else if (t == typeof(uint)) return UIntTemplate; - else return null; - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { - throw new NotImplementedException(); - } - } -} \ No newline at end of file diff --git a/src/client/spark/mspark/Utilities/Grid/GridAnimation/GridAnimationAdorner.cs b/src/client/spark/mspark/Utilities/Grid/GridAnimation/GridAnimationAdorner.cs index e47bde421..00ecdf9f1 100644 --- a/src/client/spark/mspark/Utilities/Grid/GridAnimation/GridAnimationAdorner.cs +++ b/src/client/spark/mspark/Utilities/Grid/GridAnimation/GridAnimationAdorner.cs @@ -91,9 +91,10 @@ namespace mbts.ui.spark } protected override void OnRender(DrawingContext drawingContext) { + double y_min = _col_header_presenter.TranslatePoint(new Point(0, _col_header_presenter.ActualHeight), this).Y; foreach (var kv in _row_animation_map) { var row = _grid.ItemContainerGenerator.ContainerFromItem(kv.Key) as DataGridRow; - if (row != null) { + if (row != null && row.TranslatePoint(new Point(0, row.ActualHeight * 0.5), this).Y > y_min) { var cells = row.descendants_of_type(); var cell_map = _grid.Columns.Select(c => Tuple.Create(c, DataGridEx.GetArgument(c))).Where(t => t.Item2 != null).ToDictionary(t => t.Item2, t => cells.First(c => c.Column.Equals(t.Item1))); foreach (var cell_animations in kv.Value) { diff --git a/src/client/spark/mspark/Utilities/OrderDataHelper.cs b/src/client/spark/mspark/Utilities/OrderDataHelper.cs index 3e94452ac..d11846aa8 100644 --- a/src/client/spark/mspark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/mspark/Utilities/OrderDataHelper.cs @@ -25,6 +25,7 @@ namespace mbts.spark.utilities public static OrderTime OrderTime => new OrderTime { Now = true }; public static BTSTimedWindowParameters TimeWindow => new BTSTimedWindowParameters { Cancel = true, StartTime = OrderTime, StopTime = new OrderTime() }; public static BTSWithATickParameters WithATick => new BTSWithATickParameters { QuantityThreshold = QuantityMeasure }; + public static BTSStopOrder BTSStopOrder => new BTSStopOrder { LimitOrder = new LimitOrder(), Price = 1, PriceTrigger = PriceTrigger, OptionalTimedParameters = TimeWindow, OptionalWithatickParameters = WithATick }; public static BTSIcebergOrder BTSIcebergOrder => new BTSIcebergOrder { DisplayQuantity = QuantityMeasure, MarketOffset = PriceOffset, PriceTrigger = PriceTrigger, TimedWindowParameters = TimeWindow, WithatickParameters = WithATick }; public static IMessage[] Algos => new IMessage[] { @@ -33,14 +34,8 @@ namespace mbts.spark.utilities new StopMarketOrder(), new StopLimitOrder(), new IcebergOrder(), - new BTSStopOrder(), - new BTSIcebergOrder { - DisplayQuantity = QuantityMeasure, - MarketOffset = PriceOffset, - PriceTrigger = PriceTrigger, - TimedWindowParameters = TimeWindow, - WithatickParameters = WithATick - } + BTSStopOrder, + BTSIcebergOrder }; public static Order Order(Security security) { diff --git a/src/client/spark/mspark/Utilities/SyntheticDataHelper.cs b/src/client/spark/mspark/Utilities/SyntheticDataHelper.cs index 7a0c90b9b..ae4b883d7 100644 --- a/src/client/spark/mspark/Utilities/SyntheticDataHelper.cs +++ b/src/client/spark/mspark/Utilities/SyntheticDataHelper.cs @@ -27,7 +27,6 @@ namespace mbts.spark.utilities else sanitize(data.QuoteMuteZone); if (data.QuoteRepriceThrottle == null) data.QuoteRepriceThrottle = Defaults.QuoteRepriceThrottle; else sanitize(data.QuoteRepriceThrottle); - if (data.TickRangeRequoteRules == null) data.TickRangeRequoteRules = Defaults.TickRangeRequoteRules; if (data.QuoteMaxOrderMove == null) data.QuoteMaxOrderMove = Defaults.QuoteMaxOrderMove; } public static void sanitize(QuoteInsideMarketDistance data) { @@ -79,17 +78,7 @@ namespace mbts.spark.utilities PreHedgeParams = PreHedgeParams, PostHedgeParams = PostHedgeParams, }; - public static PaylessHedgeRules PayLessHedgeRules => new PaylessHedgeRules(); - public static PayupHedgeRules PayUpHedgeRules => new PayupHedgeRules(); public static RulePriority RulePriority => new RulePriority(); - public static TickRangeRequoteRules TickRangeRequoteRules { - get { - var rv = new TickRangeRequoteRules(); - rv.TicksAwayToSensitivity.Add(1, 1); - rv.TicksAwayToSensitivity.Add(5, 3); - return rv; - } - } #region QuoteParams public static QuoteParams QuoteParams => new QuoteParams { @@ -99,7 +88,6 @@ namespace mbts.spark.utilities QuoteMuteZone = QuoteMuteZone, QuoteRepriceThrottle = QuoteRepriceThrottle, QuoteInsideMarketDistanceWithTravel = QuoteInsideMarketDistanceWithTravel, - TickRangeRequoteRules = TickRangeRequoteRules }; public static QuoteMaxOrderMove QuoteMaxOrderMove => new QuoteMaxOrderMove { MaxOrderMoveThreshold = 1 diff --git a/src/client/spark/view/Controls/Algo/BTSIcebergOrderControl.xaml b/src/client/spark/view/Controls/Algo/BTSIcebergOrderControl.xaml index 22e2e7015..3838fc744 100644 --- a/src/client/spark/view/Controls/Algo/BTSIcebergOrderControl.xaml +++ b/src/client/spark/view/Controls/Algo/BTSIcebergOrderControl.xaml @@ -46,7 +46,7 @@ Display Quantity - + Child Order Offset @@ -106,12 +106,12 @@ Ticks Price Trigger - + Time Window Start - + Stop - + diff --git a/src/client/spark/view/Controls/Algo/BTSIcebergOrderControl.xaml.cs b/src/client/spark/view/Controls/Algo/BTSIcebergOrderControl.xaml.cs index 64ea8a383..7a4142b91 100644 --- a/src/client/spark/view/Controls/Algo/BTSIcebergOrderControl.xaml.cs +++ b/src/client/spark/view/Controls/Algo/BTSIcebergOrderControl.xaml.cs @@ -52,12 +52,9 @@ namespace mbts.ui.spark.algo } } - public QuantityMeasure display_quantity => _model.DisplayQuantity; - public BTSIcebergOrder.ChildOrderOffsetOneofCase offset_case - { + public BTSIcebergOrder.ChildOrderOffsetOneofCase offset_case { get => _model.ChildOrderOffsetCase; - set - { + set { if (value != offset_case) { _assign_template(); switch (value) { @@ -69,6 +66,8 @@ namespace mbts.ui.spark.algo } } } + + public QuantityMeasure display_quantity => _model.DisplayQuantity; public double diff_from_last_fill { get => _model.DiffFromLastFill; set => _model.DiffFromLastFill = value; } public PriceOffset market_offset => _model.MarketOffset; public BTSWithATickParameters withatick_parameters => _model.WithatickParameters; diff --git a/src/client/spark/view/Controls/Algo/BTSStopOrderControl.xaml b/src/client/spark/view/Controls/Algo/BTSStopOrderControl.xaml new file mode 100644 index 000000000..2e962bf7e --- /dev/null +++ b/src/client/spark/view/Controls/Algo/BTSStopOrderControl.xaml @@ -0,0 +1,98 @@ + + + + + + + + + + + 6.0 + 6.0 + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/view/Controls/Algo/BTSStopOrderControl.xaml.cs b/src/client/spark/view/Controls/Algo/BTSStopOrderControl.xaml.cs new file mode 100644 index 000000000..4fea44279 --- /dev/null +++ b/src/client/spark/view/Controls/Algo/BTSStopOrderControl.xaml.cs @@ -0,0 +1,88 @@ +using bts.spark; +using mbts.spark.utilities; +using mbts.ui.shell; +using System.ComponentModel; +using System.Windows; +using System.Windows.Controls; + +namespace mbts.ui.spark.algo +{ + /// + /// Interaction logic for BTSStopMarketOrderControl.xaml + /// + public class BTSStopOrderControl : Control + { + static BTSStopOrderControl() { + DefaultStyleKeyProperty.OverrideMetadata(typeof(BTSStopOrderControl), new FrameworkPropertyMetadata(typeof(BTSStopOrderControl))); + } + + #region Order + public static readonly DependencyProperty OrderProperty = DependencyProperty.Register("Order", typeof(BTSStopOrder), typeof(BTSStopOrderControl), new PropertyMetadata(null, OnOrderChanged, CoerceOrder)); + private static object CoerceOrder(DependencyObject d, object baseValue) { return baseValue is BTSStopOrder ? baseValue : OrderDataHelper.Defaults.BTSStopOrder; } + private static void OnOrderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { d.SetValue(OrderVMPropertyKey, new BTSStopOrderVM((BTSStopOrder)e.NewValue)); } + public BTSStopOrder Order { get => GetValue(OrderProperty) as BTSStopOrder; set => SetValue(OrderProperty, value); } + #endregion + + #region OrderVM (ReadOnly) + private static readonly DependencyPropertyKey OrderVMPropertyKey = DependencyProperty.RegisterReadOnly("OrderVM", typeof(BTSStopOrderVM), typeof(BTSStopOrderControl), new PropertyMetadata(null)); + internal static readonly DependencyProperty OrderVMProperty = OrderVMPropertyKey.DependencyProperty; + [EditorBrowsable(EditorBrowsableState.Never)] + internal BTSStopOrderVM OrderVM { get => GetValue(OrderVMProperty) as BTSStopOrderVM; private set => SetValue(OrderVMPropertyKey, value); } + #endregion + } + + internal class BTSStopOrderVM : ViewModelBase + { + public BTSStopOrderVM(BTSStopOrder model) { + _model = model; + _assign_template(); + } + + private readonly BTSStopOrder _model; + private double _price; + private PriceOffset _payup = OrderDataHelper.Defaults.PriceOffset; + + private void _assign_template() { + switch (_model.TriggerOrderPriceCase) { + case BTSStopOrder.TriggerOrderPriceOneofCase.Price: _price = _model.Price; break; + case BTSStopOrder.TriggerOrderPriceOneofCase.Payup: _payup = _model.Payup; break; + } + } + + public BTSStopOrder.NativeTriggerOrderTypeOneofCase order_type { + get => _model.NativeTriggerOrderTypeCase; + set { + if (value != order_type) { + switch (value) { + case BTSStopOrder.NativeTriggerOrderTypeOneofCase.LimitOrder: _model.LimitOrder = new LimitOrder(); break; + case BTSStopOrder.NativeTriggerOrderTypeOneofCase.MarketOrder: _model.MarketOrder = new MarketOrder(); break; + } + } + } + } + + public BTSStopOrder.TriggerOrderPriceOneofCase price_type { + get => _model.TriggerOrderPriceCase; + set { + if (value != price_type) { + _assign_template(); + switch (value) { + case BTSStopOrder.TriggerOrderPriceOneofCase.Price: _model.Price = _price; break; + case BTSStopOrder.TriggerOrderPriceOneofCase.Payup: _model.Payup = new PriceOffset(_payup); break; + } + RaisePropertyChanged(nameof(price_type), nameof(price), nameof(payup)); + } + } + } + + public PriceTrigger price_trigger => _model.PriceTrigger; + public double price { get => _model.Price; set => _model.Price = value; } + public PriceOffset payup => _model.Payup; + + // exposing start_time and stop_time properties so the OrderTime [TimeCase]header ComboBox can be in the same ColumnDefinition SharedSizeGroup in the xaml. + // In the xaml 2 OrderTimeControls are used instead of 1 TimeWindowControl (with 2 OrderTimeControls inside)...it makes the layout geometry (lining up TextBlock/ComboBox headers) MUCH easier. + // public BTSTimedWindowParameters time_window => _model.TimedWindowParameters; + public OrderTime start_time => _model.OptionalTimedParameters.StartTime; + public OrderTime stop_time => _model.OptionalTimedParameters.StopTime; + } +} \ No newline at end of file diff --git a/src/client/spark/view/Controls/DataGridEx/DataGridExVerticalLineAdorner.cs b/src/client/spark/view/Controls/DataGridEx/DataGridExVerticalLineAdorner.cs index cf34b7327..f6134f548 100644 --- a/src/client/spark/view/Controls/DataGridEx/DataGridExVerticalLineAdorner.cs +++ b/src/client/spark/view/Controls/DataGridEx/DataGridExVerticalLineAdorner.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; using System.Windows; @@ -13,22 +12,24 @@ namespace mbts.ui.controls { public class DataGridExVerticalLineAdorner : Adorner, IDisposable { - public DataGridExVerticalLineAdorner(DataGridEx grid) - : base(grid) { + public DataGridExVerticalLineAdorner(DataGridEx grid) : base(grid) { _grid = grid; if (_grid.IsLoaded) _init(); - else _grid.Loaded += (s, e) => _init(); - this.attach(); + _grid.Loaded += _grid_Loaded; + _grid.Unloaded += _grid_Unloaded; } - private readonly DataGridEx _grid; + protected readonly DataGridEx _grid; private IList _grid_hooks = new List(); - private IDictionary _column_hooks = new Dictionary(); - private ScrollViewer _scroll_viewer; - private ScrollBar _h_scroll, _v_scroll; - private DataGridColumnHeadersPresenter _col_header_presenter; + private IDictionary> _column_hooks = new Dictionary>(); + protected ScrollViewer _scroll_viewer; + protected ScrollBar _h_scroll, _v_scroll; + protected DataGridColumnHeadersPresenter _col_header_presenter; private double _horizontal_offset = 0d; + private void _grid_Loaded(object sender, RoutedEventArgs e) { _init(); } + private void _grid_Unloaded(object sender, RoutedEventArgs e) { _dispose_hooks(); this.detach(); } + private void _init() { _dispose_hooks(); _scroll_viewer = _grid.visual_children_where(fe => fe is ScrollViewer).Cast().FirstOrDefault(); @@ -37,25 +38,22 @@ namespace mbts.ui.controls _v_scroll = _grid.visual_children_where(fe => fe is ScrollBar).Cast().Where(s => s.Orientation == Orientation.Vertical).FirstOrDefault(); // do not add hooks if any components are null (prevents null ref exceptions in OnRender) if (_scroll_viewer == null || _col_header_presenter == null || _h_scroll == null || _v_scroll == null) return; - _grid_hooks.Add(_get_scrollbar_hook(_h_scroll)); - _grid_hooks.Add(_get_scrollbar_hook(_v_scroll)); + _grid_hooks.AddRange(get_scrollbar_hooks(_h_scroll)); + _grid_hooks.AddRange(get_scrollbar_hooks(_v_scroll)); _grid_hooks.Add(_grid.ObserveProperty(DataGridEx.ActualHeightProperty, (s, e) => InvalidateVisual())); - foreach (var c in _grid.Columns) _column_hooks.Add(c, _get_col_hook(c)); + _grid_hooks.AddRange(get_other_hooks()); + foreach (var c in _grid.Columns) _column_hooks.Add(c, get_col_hooks(c).ToList()); _grid_hooks.Add(_grid.Columns.Subscribe(_columns_CollectionChanged)); _scroll_viewer.ScrollChanged += _scroll_viewer_ScrollChanged; _grid_hooks.Add(Disposable.Create(() => _scroll_viewer.ScrollChanged -= _scroll_viewer_ScrollChanged)); + this.attach(); InvalidateVisual(); } private void _columns_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) { switch (e.Action) { - case NotifyCollectionChangedAction.Add: foreach (DataGridColumn c in e.NewItems) _column_hooks.Add(c, _get_col_hook(c)); break; - case NotifyCollectionChangedAction.Remove: - foreach (DataGridColumn c in e.OldItems) { - IDisposable d; - if (_column_hooks.TryGetValue(c, out d)) Disposable.dispose(ref d); - } - break; + case NotifyCollectionChangedAction.Add: foreach (DataGridColumn c in e.NewItems) _column_hooks.Add(c, get_col_hooks(c).ToList()); break; + case NotifyCollectionChangedAction.Remove: foreach (DataGridColumn c in e.OldItems) if (_column_hooks.TryGetValue(c, out IList d)) Disposable.dispose(d); break; } InvalidateVisual(); } @@ -67,29 +65,27 @@ namespace mbts.ui.controls _horizontal_offset = tt.X; } - private IDisposable _get_col_hook(DataGridColumn col) { - return Disposable.Create( - col.ObserveProperty(DataGridColumn.WidthProperty, (s, e) => InvalidateVisual()), - col.ObserveProperty(DataGridColumn.VisibilityProperty, (s, e) => InvalidateVisual()), - col.ObserveProperty(DataGridEx.LeftBorderProperty, (s, e) => InvalidateVisual()), - col.ObserveProperty(DataGridEx.RightBorderProperty, (s, e) => InvalidateVisual()) - ); - } - - private IDisposable _get_scrollbar_hook(ScrollBar sb) { - return Disposable.Create( - sb.ObserveProperty(ScrollBar.VisibilityProperty, (s, e) => InvalidateVisual()), - sb.ObserveProperty(ScrollBar.ActualWidthProperty, (s, e) => InvalidateVisual()), - sb.ObserveProperty(ScrollBar.ActualHeightProperty, (s, e) => InvalidateVisual()) - ); - } - private void _dispose_hooks() { Disposable.dispose(_grid_hooks); - foreach (var hook in _column_hooks.Values) hook.Dispose(); + foreach (var hook in _column_hooks.Values) Disposable.dispose(hook); _column_hooks.Clear(); } + protected virtual IEnumerable get_col_hooks(DataGridColumn col) { + yield return col.ObserveProperty(DataGridColumn.WidthProperty, (s, e) => InvalidateVisual()); + yield return col.ObserveProperty(DataGridColumn.VisibilityProperty, (s, e) => InvalidateVisual()); + yield return col.ObserveProperty(DataGridEx.LeftBorderProperty, (s, e) => InvalidateVisual()); + yield return col.ObserveProperty(DataGridEx.RightBorderProperty, (s, e) => InvalidateVisual()); + } + + protected virtual IEnumerable get_scrollbar_hooks(ScrollBar sb) { + yield return sb.ObserveProperty(ScrollBar.VisibilityProperty, (s, e) => InvalidateVisual()); + yield return sb.ObserveProperty(ScrollBar.ActualWidthProperty, (s, e) => InvalidateVisual()); + yield return sb.ObserveProperty(ScrollBar.ActualHeightProperty, (s, e) => InvalidateVisual()); + } + + protected virtual IEnumerable get_other_hooks() { return Enumerable.Empty(); } + protected override void OnRender(DrawingContext drawingContext) { double x = _grid.Columns.Take(_grid.FrozenColumnCount).Where(c => c.Visibility == Visibility.Visible).Select(c => c.ActualWidth).Sum(); DataGridHeadersVisibility header_vis = _grid.HeadersVisibility; @@ -99,30 +95,25 @@ namespace mbts.ui.controls } foreach (var c in _grid.Columns.Skip(_grid.FrozenColumnCount).Where(c => c.Visibility == Visibility.Visible)) { var lb = DataGridEx.GetLeftBorder(c); - if (lb != null) _draw_vertical_line(drawingContext, x, lb); + if (lb != null) draw_vertical_line(drawingContext, x, lb); x += c.ActualWidth; var rb = DataGridEx.GetRightBorder(c); - if (rb != null) _draw_vertical_line(drawingContext, x, rb); + if (rb != null) draw_vertical_line(drawingContext, x, rb); } if (!(RenderTransform is TranslateTransform)) RenderTransform = new TranslateTransform(_horizontal_offset, 0d); } //draw 1 continuous line if possible to help performance - private void _draw_vertical_line(DrawingContext dc, double x, DataGridExVerticalLine line) { + protected virtual void draw_vertical_line(DrawingContext dc, double x, DataGridExVerticalLine line) { if (line.through_colum_header) { if (line.through_cells) dc.DrawLine(line.pen.Value, new Point(x, 0), new Point(x, _grid.ActualHeight - _h_scroll.ActualHeight)); else dc.DrawLine(line.pen.Value, new Point(x, 0), new Point(x, _grid.super_header_height + _col_header_presenter.ActualHeight)); } else if (line.through_cells) - _draw_through_cells(dc, x, line.pen.Value); + dc.DrawLine(line.pen.Value, new Point(x, _grid.super_header_height + _col_header_presenter.ActualHeight), new Point(x, _grid.ActualHeight)); } - private void _draw_through_cells(DrawingContext dc, double x, Pen pen) { dc.DrawLine(pen, new Point(x, _grid.super_header_height + _col_header_presenter.ActualHeight), new Point(x, _grid.ActualHeight - _h_scroll.ActualHeight)); } - - public void Dispose() { - _dispose_hooks(); - this.detach(); - } + public void Dispose() { _dispose_hooks(); this.detach(); } } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs b/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs index 3c89b831d..d1bcbae1f 100644 --- a/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs +++ b/src/client/spark/view/Controls/SecuritySelectorControl/SecurityItem.cs @@ -1,7 +1,6 @@ using bts.api; using mbts.ui.shell; using System; -using System.Linq; using System.Windows.Controls; using static bts.api.Security; diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index c5a0efc06..6fff5a2c8 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -126,10 +126,13 @@ message NativeOrderState { // Mutable, always available orderman.ManualOrderIndicator manual_order_indicator = 11; + double price = 17; + uint32 order_quantity = 13; + + uint32 filled_quantity=16; double last_price = 12; double avg_price = 15; - uint32 order_quantity = 13; - uint32 filled_quantity=16; + OrderStatus order_status= 14; } diff --git a/src/lib/sparkproto/SparkProtos.proto b/src/lib/sparkproto/SparkProtos.proto index 3b7148ac7..f3a2d2abb 100644 --- a/src/lib/sparkproto/SparkProtos.proto +++ b/src/lib/sparkproto/SparkProtos.proto @@ -40,39 +40,12 @@ message Order { BTSStopOrder bts_stop_order = 400; CrossingHedgeOrder crossing_hedge_order = 50000; - SimpleHedgeOrder simple_hedge_order = 51000; - CustomOrder custom_order = 1000000; } ExecutionStrategy execution_strategy = 2000; - SimpleExecutionStrategy simple_execution_strategy = 2100; } /***************************************Algo Order Support Data**********************************/ -/********************* SIMPLE *********************************/ -message SimpleExecutionStrategy -{ - SimpleExecutionParams leg1 = 10; - SimpleExecutionParams leg2 = 20; -} -message SimpleExecutionParams -{ - bts.api.Security security = 10; - - int32 pre_hedge_payup_ticks = 100; - bool is_working = 110; - bool is_hedging = 120; - - QuoteMuteZone slop = 200; - PostHedgePriceBasedForcedCross post = 300; -} -message SimpleHedgeOrder -{ - PostHedgePriceBasedForcedCross post = 10; -} - -/********************* END SIMPLE *********************************/ - /********** Fundamental Data **********/ message PriceType @@ -414,6 +387,20 @@ message LegSpreaderParams ******************************************Quote************************************************** *************************************************************************************************/ +message QuoteParams +{ + // Defines how much volume required to price off of a hedge leg level, as a ratio of working leg size. + // e.g. If you are working N lots of 2 (leg_1) by 3 spread, you will work leg_1 at a price determined by + // the price level at which you can sell N*3*lean_quantity_ratio. + double lean_quantity_ratio = 20; + + QuoteMuteZone quote_mute_zone = 1000; + QuoteRepriceThrottle quote_reprice_throttle = 1010; + QuoteInsideMarketDistance quote_inside_market_distance = 1020; + QuoteInsideMarketDistanceWithTravel quote_inside_market_distance_with_travel = 1030; + QuoteMaxOrderMove quote_max_order_move = 1040; +} + /*************************************Quote MuteZone*********************************** (TT Basic Slop) This rule sets a band above and below the quoting order inside of which any price changes will be @@ -436,9 +423,9 @@ THEN */ message QuoteMuteZone { + RulePriority priority = 1; uint32 outside_ticks = 10; - uint32 inside_ticks = 20; - RulePriority priority = 30; + uint32 inside_ticks = 20; } /*************************************Quote RepriceThrottle******************************* @@ -450,8 +437,8 @@ f(new_price, curr_price, market_bid, market_ask) -> new_price */ message QuoteRepriceThrottle { + RulePriority priority = 1; map ticks_away_to_sensitivity = 10; - RulePriority priority = 20; } @@ -482,8 +469,8 @@ THEN message QuoteInsideMarketDistance { + RulePriority priority = 1; uint32 ticks_from_inside = 10; - RulePriority priority = 20; } /******************************Quote InsideMarketDistanceWithTravel****************************** @@ -516,9 +503,9 @@ THEN message QuoteInsideMarketDistanceWithTravel { + RulePriority priority = 1; uint32 ticks_from_inside = 10; uint32 limit = 20; - RulePriority priority = 30; } /*************************************Quote MaxOrderMove***************************************** @@ -539,6 +526,7 @@ rememberred in order to put it back in message QuoteMaxOrderMove { + RulePriority priority = 1; uint32 max_order_move_threshold = 10; } @@ -576,6 +564,7 @@ THEN calculated_hedge_price = market_bid_price - tick_size * hedge_tick_limit message PreHedgeMaxPriceFromInsideMarket { + RulePriority priority = 1; uint32 hedge_tick_limit = 10; } @@ -615,6 +604,7 @@ IF (TRUE) message PreHedgeSendHedgeAsMarketOrder { + RulePriority priority = 1; bool send_hedge_as_market_order = 10; } @@ -635,6 +625,7 @@ if (quantity_at_price (calculated_hedge_order_price) < quantity_threshold) message PreHedgeQuantityBasedPayupTicks { + RulePriority priority = 1; QuantityMeasure quantity_threshold = 10; uint32 payup_ticks = 20; } @@ -656,6 +647,7 @@ if (quantity_at_price (calculated_hedge_order_price) > quantity_threshold) message PreHedgeQuantityBasedPayLessTicks { + RulePriority priority = 1; QuantityMeasure quantity_threshold = 10; uint32 payless_ticks = 20; } @@ -692,6 +684,7 @@ THEN hedge_order_price = market_buy - tick_size * market_cross_ticks message PostHedgeTimeBasedForcedCross { + RulePriority priority = 1; uint32 time_in_ms_threshold = 10; uint32 market_cross_ticks = 20; } @@ -716,6 +709,7 @@ IF (hedge_order_price > market_bid + tick_size * ticks_threshold) message PostHedgePriceBasedForcedCross { + RulePriority priority = 1; uint32 ticks_threshold = 10; uint32 market_cross_ticks = 20; } @@ -787,114 +781,20 @@ message IcebergOrder { uint32 show_quantity = 20; } //This is the order type used to encapsulate (and localize) the post hedge rules; it should be called 'With A Tick' -message CrossingHedgeOrder { - uint32 ticks_better_threshold = 5; - uint32 cross_size_threshold = 10; - double cross_ratio_threshold = 20; -} - -//Nice place to use the server API -message CustomOrder { - string order_impl_type = 20; - map custom_parameters = 30; +message CrossingHedgeOrder +{ + uint32 ticks_threshold = 10; + uint32 market_cross_ticks = 20; } message ExecutionStrategy { - map security_id_to_params = 10; map leg_params_map = 20; } -message SyntheticLegExecutionParams +message SyntheticExecutionStrategy { - QuoteParams quote_params = 10; - HedgeParams hedge_params = 20; -} - -message QuoteParams -{ - // If it's working, an order is sent immediatly. Else the order is sent based on a fill of the other leg - // TODO:retire since its available in LegSpreaderParams - bool is_working = 10; - // Defines how much volume required to price off of a hedge leg level, as a ratio of working leg size. - // e.g. If you are working N lots of 2 (leg_1) by 3 spread, you will work leg_1 at a price determined by - // the price level at which you can sell N*3*lean_quantity_ratio. - double lean_quantity_ratio = 20; - // This tells whether to use the volume weighted average price or the worst price for the other legs, - // when computing the price of this active quoting leg - bool pessimistic_hedge_pricing = 30; - // TODO:retire since its a Parameter - oneof quote_rules - { - TickRangeRequoteRules tick_range_requote_rules = 60; - CustomRequoteRules custom_requote_rules = 100; - } - QuoteMuteZone quote_mute_zone = 1000; - QuoteRepriceThrottle quote_reprice_throttle = 1010; - QuoteInsideMarketDistance quote_inside_market_distance = 1020; - QuoteInsideMarketDistanceWithTravel quote_inside_market_distance_with_travel = 1030; - QuoteMaxOrderMove quote_max_order_move = 1040; -} - -message TickRangeRequoteRules -{ - //From zero to map[0].key ticks to inside market requote the working leg every map[0].value - //From map[0].key to map[1].key distance to inside market requote the working leg every map[1].value - map ticks_away_to_sensitivity = 10; -} - -message CustomRequoteRules -{ - string requote_rule_type = 10; - map custom_parameters = 20; -} - -message HedgeParams { - PayupHedgeRules payup_hedge_rules = 10; - PaylessHedgeRules payless_hedge_rules = 20; - PostHedgeRules post_hedge_rules = 30; - CustomHedgeRules custom_hedge_rules = 100; -} - -message PayupHedgeRules { - //To 'pay up' means to buy payup_ticks through the target hedge price or sell for payup_ticks lower than the target hedge price - //Paying up is conditional on the size at the target hedge price level. - //The condition is satisfied if either the target size is <= size_threshold - //or the target size is <= ratio_threshold*hedge_order_size - //(Note that setting the size threshold to a very large number would make the payup virtually unconditional) - bool enable_payup = 5; - uint32 payup_ticks = 10; - uint32 size_threshold = 20; - double ratio_threshold = 30; -} -message PaylessHedgeRules { - //To 'pay less' means to buy or sell payless_ticks better than the target hedge price, thereby 'working' all - //or part of the hedge order. - //Paying less is conditional on the size at the target hedge price level. - //The condition is satisfied if either the target size is >= size_threshold - //or the target size is >= ratio_threshold*hedge_order_size - //(Note that setting the size threshold to a very small, nonzero number would make the payless virtually unconditional) - bool enable_payless = 5; - uint32 payless_ticks = 10; - uint32 size_threshold = 20; - double ratio_threshold = 30; -} -message PostHedgeRules { - //The post hedger watches all working hedges (arising through a deliberate payless or getting legged). - //If the the opposite inside market size meets the threshold, the hedge is amended to cross the bid / offer spread. - //For instance, we'd amend the hedge if the inside market size is <= size_threshold or - //the inside market size is <= ratio_threshold*the size of the hedge order (ignoring zero) - //This algorithm is implemented at the hedge site through the submission of a CrossingHedgeOrder - bool enable_post_hedge = 5; - uint32 cross_size_threshold = 10; - double cross_ratio_threshold = 20; -} -message CustomHedgeRules { - string hedge_rule_type = 10; - map custom_parameters = 20; -} - -message SyntheticExecutionStrategy { bts.api.Security security = 10; ExecutionStrategy execution_strategy = 20; } + diff --git a/src/server/sparkd/cmds/TestOrderman.cpp b/src/server/sparkd/cmds/TestOrderman.cpp index b24405d61..2d04d2644 100644 --- a/src/server/sparkd/cmds/TestOrderman.cpp +++ b/src/server/sparkd/cmds/TestOrderman.cpp @@ -22,18 +22,6 @@ namespace cmd { using namespace orderman; -template -inline void print_buffer(const char*label,T const&array) -{ - const char * p = (const char*) &array; - - std::cout << label << ": " ; - for (size_t i = 0; i < sizeof(array); i++) { - std::cout << (int) p[i] << ","; - } - std::cout << "\n"; -} - api::orderman::CreateOrderRequest make_create_request(SecurityKey sec, api::BuySell side, Price price, Quantity quantity) { @@ -77,68 +65,69 @@ api::orderman::CancelOrderRequest make_cancel_request(OrderKey k) int TestOrderman::execute(std::vector const &) { - using Node = event_grid::EventNode ; - Node::Msg msg; - auto ev = event::GatewayBeginReplay { GatewayName ("hello") }; - print_buffer("ev",ev); - new (&msg.payload[0]) event::GatewayBeginReplay (ev); - print_buffer("pl",msg.payload); - auto ptr = *(event::GatewayBeginReplay*) (&msg.payload[0]); - print_buffer("*ptr",ptr); - std::cout << ptr.name.value() << "\n"; - return 0; - // OrderKey current_order (null_order_key()); - // api::ServiceContext ctx; - // OrderServiceServer server(ctx); - // api::orderman::OrderService client(ctx.locate ()); + OrderKey current_order (null_order_key()); + api::ServiceContext ctx; + OrderServiceServer server(ctx); + api::orderman::OrderService client(ctx.locate ()); - // while (true) { - // std::cout << "create order: c sec_key b/s price quantity\nupdate order: u price quantity\ncancel order: x\nchange current order: o order_key\n"; - // char choice; - // std::cin >> choice; - // switch (choice) { - // case 'c': { - // uint32_t sec_key;char side; double price; int quantity; - // std::cin >> sec_key >> side >> price >> quantity; - // auto resp = client.create_order(make_create_request(SecurityKey(sec_key), - // side == 'b' ? api::BUY : api::SELL, - // Price(price), - // Quantity(quantity))); - // if (resp.success()) { - // current_order = OrderKey(resp.result()->order_key()); - // std::cout << utils::pb::to_string(*resp.result()) << "\n"; - // } - // else - // std::cout << resp.error_message() << "\n"; - // break; - // } - // case 'u': { - // double price; int quantity; - // std::cin >> price >> quantity; - // auto resp = client.update_order(make_update_request(current_order, - // Price(price), - // Quantity(quantity))); - // if (resp.success()) - // std::cout << utils::pb::to_string(*resp.result()) << "\n"; - // else - // std::cout << resp.error_message() << "\n"; - // break; - // } - // case 'x': { - // auto resp = client.cancel_order(make_cancel_request(current_order)); - // if (resp.success()) - // std::cout << utils::pb::to_string(*resp.result()) << "\n"; - // else - // std::cout << resp.error_message() << "\n"; - // break; - // } - // case 'o': { - // std::cin >> current_order.value(); - // std::cout << "Current order: " << current_order.value() << "\n"; - // break; - // } - // } - // } + client.subscribe_orders().subscribe([](const api::orderman::OrdersUpdate &update) { + for (auto const &os : update.added()) + std::cout << utils::pb::to_string(*os); + for (auto const &os : update.removed()) + std::cout << "Removed: " << os->order_key() << "\n"; + }); + + while (true) { + std::cout << + "create order: c sec_key b/s price quantity\n" + "update order: u price quantity\n" + "cancel order: x\nchange current order: o order_key\n"; + + char choice; + std::cin >> choice; + switch (choice) { + case 'c': { + uint32_t sec_key;char side; double price; int quantity; + std::cin >> sec_key >> side >> price >> quantity; + auto resp = client.create_order(make_create_request(SecurityKey(sec_key), + side == 'b' ? api::BUY : api::SELL, + Price(price), + Quantity(quantity))); + if (resp.success()) { + current_order = OrderKey(resp.result()->order_key()); + std::cout << utils::pb::to_string(*resp.result()) << "\n"; + } + else + std::cout << resp.error_message() << "\n"; + break; + } + case 'u': { + double price; int quantity; + std::cin >> price >> quantity; + auto resp = client.update_order(make_update_request(current_order, + Price(price), + Quantity(quantity))); + if (resp.success()) + std::cout << utils::pb::to_string(*resp.result()) << "\n"; + else + std::cout << resp.error_message() << "\n"; + break; + } + case 'x': { + auto resp = client.cancel_order(make_cancel_request(current_order)); + if (resp.success()) + std::cout << utils::pb::to_string(*resp.result()) << "\n"; + else + std::cout << resp.error_message() << "\n"; + break; + } + case 'o': { + std::cin >> current_order.value(); + std::cout << "Current order: " << current_order.value() << "\n"; + break; + } + } + } } std::string TestOrderman::help () diff --git a/src/server/sparkd/event_grid/Component.h b/src/server/sparkd/event_grid/Component.h deleted file mode 100644 index 136b789cf..000000000 --- a/src/server/sparkd/event_grid/Component.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include - -namespace bts { -namespace event_grid { - -template struct Consumes - } - -}; - - - - template struct Produces {}; - -template -class Component -{ - template - void set_node(EN &en) { - } -}; - -}} diff --git a/src/server/sparkd/event_grid/EventNode.h b/src/server/sparkd/event_grid/EventNode.h index 04b66d00e..6ed839fc3 100644 --- a/src/server/sparkd/event_grid/EventNode.h +++ b/src/server/sparkd/event_grid/EventNode.h @@ -1,50 +1,52 @@ #pragma once - + #include "lib/utils/bts_assert.h" #include "lib/utils/meta_programming.h" #include "server/sparkd/event_grid/events/Init.h" - +#include "server/sparkd/event_grid/HeterogeneousQueue.h" + #include -#include - + namespace bts { namespace event_grid { - - + + template class EventRecord { public: EventRecord() :_n_observers(0),_observers() {} - + using Event = E; using Observer = std::function; using NoFwdObserver = std::function; - + void observe(Observer const &o) { bts_assert(_n_observers < MaxObs); _observers[_n_observers++] = o; } - + void signal(const E&e, bool fwd) { for (size_t i = 0;i < _n_observers;i++) _observers[i](e,fwd); } - + private: uint8_t _n_observers; std::array _observers; }; - - + + template struct HandlerInit { static void init(HandlerArray &handlers,EventRecordTuple &event_records) { using Event = typename std::tuple_element::type::Event; handlers[N] = [&event_records] (Payload const&pl, bool fwd) { - std::get(event_records).signal(*(Event*) (&pl[0]),fwd); + auto &ev = *(Event*) &pl; + std::get(event_records).signal(ev,fwd); + ev.~Event(); }; HandlerInit::init(handlers,event_records); } @@ -54,9 +56,9 @@ struct HandlerInit<-1,HandlerArray,EventRecordTuple,Payload> { static void init(HandlerArray &,EventRecordTuple &) {} }; - - - + + + template class EventNode { public: @@ -66,18 +68,23 @@ public: using EventRecordTuple = std::tuple...> ; using EventHandler = std::function ; using HandlerArray = std::array ; - + struct MsgHeader { + uint8_t handler_idx; + uint8_t forwarded; + }; + EventNode() : _queue(), _handlers(), _events() { HandlerInit::init (_handlers,_events); - // send(event::Init()); + send(); } - - template - void send(Event const&ev) {send(ev,false);} - + + template + void send(Args&&... args) + {send(false,std::forward(args)...);} + template void observe(typename EventRecord::Observer const&o) { @@ -85,7 +92,7 @@ public: std::get,EventRecordTuple>::value> (_events); ev_record.observe(o); } - + template void observe(typename EventRecord::NoFwdObserver const&o) { @@ -93,51 +100,47 @@ public: std::get,EventRecordTuple>::value> (_events); ev_record.observe([o](auto const&ev,bool) {o(ev);}); } - + bool do_work() { - Msg m; - if (_queue.try_dequeue(m)) { - _handlers[m.handler_idx](m.payload,m.forwarded); + auto raw_msg = _queue.pop(); + if (raw_msg) { + auto const &header = raw_msg->header; + _handlers[header.handler_idx](raw_msg->payload,header.forwarded); + _queue.release(raw_msg); return true; } else return false; } - + template friend void forward(N1 &from, N2& to); - + public: - struct Msg { - uint8_t handler_idx; - uint8_t forwarded; - Payload payload; - }; - - template - void send(Event const&ev,bool fwd) + + + template + void send(bool fwd,Args&&... args) { - Msg m; - m.handler_idx = meta::GetTypeIdxInTuple,EventRecordTuple>::value; - m.forwarded = fwd; - - new (&m.payload[0]) Event (ev); - _queue.enqueue(m); + _queue.template inplace_push ( + MsgHeader {meta::GetTypeIdxInTuple,EventRecordTuple>::value,fwd}, + std::forward(args)...); } - moodycamel::ConcurrentQueue _queue; + + HeterogenousQueue _queue; std::array _handlers; EventRecordTuple _events; - + }; - + template void forward(N1 &from, N2& to) { from.template observe([&to](Event const&ev, bool fwded) { if (!fwded) - to.send(ev,true); + to.template send(true,ev); }); } - + }} diff --git a/src/server/sparkd/event_grid/HeterogeneousQueue.h b/src/server/sparkd/event_grid/HeterogeneousQueue.h new file mode 100644 index 000000000..d584541cd --- /dev/null +++ b/src/server/sparkd/event_grid/HeterogeneousQueue.h @@ -0,0 +1,85 @@ +#pragma once + +#include +#include +#include + +#include +#include + +namespace bts { +namespace event_grid { + +template +class HeterogenousQueue +{ +public: + struct Item { + Header header; + std::array payload; + }; + + HeterogenousQueue() : _queue(BlockSize),_free(InitialCapacity),_storage() + {alloc_block();} + + template + void inplace_push(Header const &header,Args&&... args) + { + static_assert(sizeof(T) <= PayloadSize,"Type is too large for this queue"); + + auto free_item = get_free_item(); + free_item->header = header; + new (&free_item->payload) T{std::forward(args)...}; + + _queue.push(free_item); + } + + Item* pop() + { + Item*result=nullptr; + _queue.pop(result); + return result; + } + + void release(Item*item) + { + _free.push(item); + } + +private: + using Block = std::array; + using BlockPtr = std::unique_ptr; + using Queue = boost::lockfree::queue; + using FreeList = boost::lockfree::stack; + + Item* get_free_item() + { + Item *result; + for(;;) { + if (_free.pop(result)) + return result; + else + alloc_block(); + } + } + + void alloc_block() + { + auto block = std::make_unique(); + for (auto &item : *block) + _free.push(&item); + + std::lock_guard l (_storage_lock); + _storage.push_back(std::move(block)); + } + + Queue _queue; + FreeList _free; + std::vector _storage; + std::mutex _storage_lock; +}; + +}} diff --git a/src/server/sparkd/event_grid/HeterogenousQueue.h b/src/server/sparkd/event_grid/HeterogenousQueue.h new file mode 100644 index 000000000..3d83464aa --- /dev/null +++ b/src/server/sparkd/event_grid/HeterogenousQueue.h @@ -0,0 +1,86 @@ +#pragma once + +#include +#include +#include + +#include +#include + +namespace bts { +namespace orderman { + +template +class HeterogenousQueue +{ +public: + struct Item { + Header header; + std::array payload; + }; + + HeterogenousQueue() : _queue(),_free(),_storage() + {alloc_block();} + + template + void create_and_push(Header const &header,Args&&... args) + { + static_assert(sizeof(header) <= PayloadSize,"Type is too large for this queue"); + + auto free_item = get_free_item(); + free_item->header = header; + new (&free_item->payload) T(std::forward(args)...); + + _queue.push(free_item); + } + + Item* pop() + { + Item*result=nullptr; + _queue.pop(&result); + return result; + } + + template + void release(Item*item) + { + ((T*) (&item->payload))->~T(); + _free.push(item); + } + +private: + using Block = std::array; + using BlockPtr = std::unique_ptr; + using Queue = boost::lockfree::queue; + using FreeList = boost::lockfree::stack; + + Item* get_free_item() + { + Item *result; + for(;;) { + if (_free.pop(result)) + return result; + else + alloc_block(); + } + } + + void alloc_block() + { + auto block = std::make_unique(); + for (auto &item : block) + _free.push(&item); + + std::lock_guard l (_storage_lock); + _storage.push_back(block); + } + + Queue _queue; + FreeList _free; + std::vector _storage; + std::mutex _storage_lock; +}; + +}} diff --git a/src/server/sparkd/orderman/components/FillRecorder.cpp b/src/server/sparkd/orderman/components/FillRecorder.cpp index 37ffd1ccc..516869593 100644 --- a/src/server/sparkd/orderman/components/FillRecorder.cpp +++ b/src/server/sparkd/orderman/components/FillRecorder.cpp @@ -30,12 +30,15 @@ FillRecorder::~FillRecorder () {} void FillRecorder::on(event::ExecutionReport const&er) { - auto pb = event::to_pb(*er.data); - me->store.store(pb); - LOG(OrderMan,Info,"Storing fill: {} ",utils::pb::to_string(pb)); + if (er.data->exec_type == api::orderman::ET_PARTIAL_FILL || + er.data->exec_type == api::orderman::ET_FILL) { + auto pb = event::to_pb(*er.data); + LOG(OrderMan,Info,"Storing fill: {} ",utils::pb::to_string(pb)); + me->store.store(pb); - std::vector v {pb}; - native_fill_signal(event::NativeFills {v}); + std::vector v {pb}; + native_fill_signal(event::NativeFills {v}); + } } void FillRecorder::on(event_grid::event::Init const&) diff --git a/src/server/sparkd/orderman/components/FillRecorder.h b/src/server/sparkd/orderman/components/FillRecorder.h index 963d8f1d4..2fb1da05e 100644 --- a/src/server/sparkd/orderman/components/FillRecorder.h +++ b/src/server/sparkd/orderman/components/FillRecorder.h @@ -28,3 +28,4 @@ private: }; }} + diff --git a/src/server/sparkd/orderman/components/Gateway.cpp b/src/server/sparkd/orderman/components/Gateway.cpp index fc30c7175..0cc98b3b1 100644 --- a/src/server/sparkd/orderman/components/Gateway.cpp +++ b/src/server/sparkd/orderman/components/Gateway.cpp @@ -61,12 +61,19 @@ Gateway::Gateway(config::JetFIX::Connection const&c, securities::SecurityDB &db) api::orderman::OrderStatus(msg.get()), msg.get() ? api::orderman::MOI_YES: api::orderman::MOI_NO, to(msg.get()), - Price (msg.get()), + securities::decode_exchange_price(*sec,Price (msg.get())), Quantity(msg.get()), Quantity(msg.get()), - Quantity(msg.get()), - securities::decode_exchange_price(*sec,Price(msg.get())), - securities::decode_exchange_price(*sec,Price(msg.get())), + + msg.has()? + Quantity(msg.get()):Quantity(0), + + msg.has()? + securities::decode_exchange_price(*sec,Price(msg.get())) : Price(0), + + msg.has()? + securities::decode_exchange_price(*sec,Price(msg.get())) : Price(0), + to(msg.get()), to(msg.get()), reject_msg diff --git a/src/server/sparkd/orderman/components/NativeOrderMan.cpp b/src/server/sparkd/orderman/components/NativeOrderMan.cpp index 0ce2c68f4..f9ddc3167 100644 --- a/src/server/sparkd/orderman/components/NativeOrderMan.cpp +++ b/src/server/sparkd/orderman/components/NativeOrderMan.cpp @@ -113,7 +113,7 @@ void NativeOrderMan::on(event::CreateNativeOrder const&create) LOG(OrderMan,Error, "Someone tried to create a native order " "using existing id {}. Order was for security: {}" - " This is a dangerous bug" , + " This is a dangerous bug, please report it to development" , k.value(), securities::descriptor(*order._header.security)); return; } @@ -139,17 +139,31 @@ void NativeOrderMan::on(event::CreateNativeOrder const&create) void NativeOrderMan::on(event::UpdateNativeOrder const&update) { auto &order = const_cast (*update.order); - LOG(OrderMan,Diag, "NativeOrderMan UpdateNativeOrder {}",order.key().value()); - if (order.can_be_udpated()) { - auto buffer = get_fix_bufer(); - order.encode_update(me->latest_timestamp,update.price,update.quantity,&buffer->fix[0]); - out_gateway_msg_signal(event::OutGatewayMsg {buffer}); - } - else { - LOG(OrderMan,Warn, "Attempt to update in flight order {}. Request will be ignored",order.key().value()); - order.set_reject_msg("Order has not yet been aknowledged by the exchange and cannot be updated"); + + switch (me->state) { + case State::REPLAY: + bts_assert(false); + break; + case State::DISCONNECTED: + LOG(OrderMan,Warn, + "Unable to update order {} because gateway connection is down. " + "Update request will be ignored",order.key().value()); + order.set_reject_msg("Order gateway is not ready"); native_order_state_change_signal(event::NativeOrderStateChange {&order,&order.header(),order.state()}); + return; + case State::CONNECTED: + if (order.can_be_udpated()) { + auto buffer = get_fix_bufer(); + order.encode_update(me->latest_timestamp,update.price,update.quantity,&buffer->fix[0]); + out_gateway_msg_signal(event::OutGatewayMsg {buffer}); + } + else { + LOG(OrderMan,Warn, "Attempt to update in flight order {}. Request will be ignored",order.key().value()); + order.set_reject_msg("Order cannot be updated until it is aknowledged by the order gateway"); + native_order_state_change_signal(event::NativeOrderStateChange {&order,&order.header(),order.state()}); + } + return; } } @@ -159,15 +173,29 @@ void NativeOrderMan::on(event::CancelNativeOrder const&cancel) LOG(OrderMan,Diag, "NativeOrderMan CancelNativeOrder {}",order.key().value()); - if (order.can_be_canceled()) { - auto buffer = get_fix_bufer(); - order.encode_cancel(me->latest_timestamp,&buffer->fix[0]); - out_gateway_msg_signal(event::OutGatewayMsg {buffer}); - } - else { - LOG(OrderMan,Warn, "Attempt to cancel in flight order {}. Request will be ignored",order.key().value()); - order.set_reject_msg("Order has not yet been aknowledged by the exchange and cannot be canceled"); + switch (me->state) { + case State::REPLAY: + bts_assert(false); + break; + case State::DISCONNECTED: + LOG(OrderMan,Warn, + "Unable to cancel order {} because gateway connection is down. " + "Cancel request will be ignored",order.key().value()); + order.set_reject_msg("Order gateway is not ready"); native_order_state_change_signal(event::NativeOrderStateChange {&order,&order.header(),order.state()}); + return; + case State::CONNECTED: + if (order.can_be_canceled()) { + auto buffer = get_fix_bufer(); + order.encode_cancel(me->latest_timestamp,&buffer->fix[0]); + out_gateway_msg_signal(event::OutGatewayMsg {buffer}); + } + else { + LOG(OrderMan,Warn, "Attempt to cancel in flight order {}. Request will be ignored",order.key().value()); + order.set_reject_msg("Order cannot be canceled until it is aknowledged by the order gateway"); + native_order_state_change_signal(event::NativeOrderStateChange {&order,&order.header(),order.state()}); + } + return; } } @@ -227,9 +255,9 @@ void NativeOrderMan::on(event::ExecutionReport const&er) else { LOG(OrderMan,Error, "Received an execution report for an unknown order with key {} " - ". Order state will be recovered from this report but fields " - "CustomerOrFirm, CTI code and parent/child relationship cannot be recovered and will be set " - "to default values", k.value()); + ". Order state will be reconstructed from this report but some information " + " cannot be recovered, including fix fields CustomerOrFirm and CTI code" + " and the parent order id (if any)", k.value()); api::orderman::NativeOrderState recovered; recovered.set_account_name(to_str(er.data->account_name)); @@ -271,7 +299,7 @@ void NativeOrderMan::on(event::CancelReject const&cr) else LOG(OrderMan,Error, "Received a cancel reject for an unknown order with key {} " - "This should not happen and should be investigated", k.value()); + ". This should not happen. Please investigate", k.value()); } void NativeOrderMan::on(event::TimeChange const&new_time) @@ -313,6 +341,7 @@ void NativeOrderMan::transition(State new_state) { LOG(OrderMan,Info,"Transitioning NativeOrderMan from {} to {}", state_name(me->state),state_name(new_state)); + me->state = new_state; } }} diff --git a/src/server/sparkd/orderman/components/OrderRecorder.cpp b/src/server/sparkd/orderman/components/OrderRecorder.cpp index f5d97f476..0413d536b 100644 --- a/src/server/sparkd/orderman/components/OrderRecorder.cpp +++ b/src/server/sparkd/orderman/components/OrderRecorder.cpp @@ -30,8 +30,8 @@ OrderRecorder::~OrderRecorder () {} void OrderRecorder::on(event::NativeOrderStateChange const&ch) { auto pb = event::to_pb(*ch.header,ch.current_state); - me->store.store(pb); LOG(OrderMan,Info,"Storing order: {} ",utils::pb::to_string(pb)); + me->store.store(pb); std::vector v {pb}; order_state_change_signal(event::OrderStateChange {v}); diff --git a/src/server/sparkd/orderman/components/TimeSource.h b/src/server/sparkd/orderman/components/TimeSource.h index e776e9c68..316b5e4a2 100644 --- a/src/server/sparkd/orderman/components/TimeSource.h +++ b/src/server/sparkd/orderman/components/TimeSource.h @@ -12,10 +12,10 @@ class TimeSource { public: - TimeSource() : time_update_signal([](auto){}),_last() {} + TimeSource() : time_change_signal([](auto){}),_last() {} // out - std::function time_update_signal; + std::function time_change_signal; void do_work() { auto now = Timer::now(); @@ -25,7 +25,7 @@ public: Timer::now(), to (datetime::FIX_timestamp(datetime::now())) }; - time_update_signal(change); + time_change_signal(change); } } diff --git a/src/server/sparkd/orderman/doc/order_man_notes.org b/src/server/sparkd/orderman/doc/order_man_notes.org index 634711edb..a95d3a88c 100644 --- a/src/server/sparkd/orderman/doc/order_man_notes.org +++ b/src/server/sparkd/orderman/doc/order_man_notes.org @@ -279,4 +279,59 @@ CheckSum = 151 10=151 - need to get a handle on transact time - probably best design is to flatten order, making copies cheaper - consider including restatement reason +- Compile newer cgdb +- Add all source paths to gdb init +- Publish gdb init +- see if handling of cancel rejects is any good +- batch handling of orders, batch handling of fills +- better event_grid + - simpler wiring + - less indirection in dispatch + - consider passing lambdas around +* Notes on "A guide to spread trading futures" +- Spread trading exploits correlations between securities and mean + reversion +- Correlations are discovered by traders +- Types of spreads + - Calendar: same security, different maturities + - Nearer month ditacts naming of spread: long on near month == + long on spread + - Butterfly (fly): two calendar spreads + - 3 maturity dates + - body: -2 + - Wings: +1, +1 + - Long if long wings, short if short wings + - Condor + - 4 Maturity dates + - Like a flat butterfly: + - 1, -1, -1, 1 + - Intra-market spreads + - Different securities + - Examples: + - Crack Spread (crude oil and an oil by-product) + - Spark Spread (natural gas and electricity) + - Crush Spread (soybeans and a byproduct) + - Exchange Listed Spreads are not cross product spreads + - Spread Matrix: + - Display Exchange in a tabular form for every month pair + - Factors to consider when determining hedge ratios + - Tick Value. + - Different products might have different tick values + - To be hedged you make sure that for a 1 tick move the price + movements of both contracts are the same + - Currency of contract + - Relative movement of contract + - Trader preferance + - Exchange that contract is listed on + - Trading hours will vary + - Trade Ratio/Price Ratio + - Integrate the relative movement and tick ratios to determine the + final ratio +- Strategies + - Mean Reversion + + + + + diff --git a/src/server/sparkd/orderman/events/CreateOrder.h b/src/server/sparkd/orderman/events/CreateOrder.h deleted file mode 100644 index 8e32c4767..000000000 --- a/src/server/sparkd/orderman/events/CreateOrder.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include - -namespace bts { - -namespace api { namespace orderman { class CreateOrderRequest;}} - -namespace orderman { -namespace event { - -class CreateOrder -{ -public: - api::orderman::CreateOrderRequest request; - std::function (0,PriceFieldSz); - _fix_data.update_quantity_bm = encoding.add (0,SizeFieldSz); + _fix_data.update_price_bm = encoding.add (0,price_sz()); + _fix_data.update_quantity_bm = encoding.add (0,quantity_sz()); _fix_data.update_transact_time_bm = encoding.add (datetime::FIX_timestamp(datetime::now())); @@ -25,6 +22,7 @@ void NativeOrder::init_update_fix() encoding.add (_header.side); encoding.add (_header.time_in_force); encoding.add (_header.order_type); + encoding.add (_header.manual_order_indicator); encoding.add (_header.customer_or_firm); encoding.add (_header.cti_code); encoding.add (_header.security->glbx().security_desc()); @@ -34,22 +32,17 @@ void NativeOrder::init_update_fix() encoding.add (clordid); encoding.add (clordid); encoding.add (clordid); - - // if we have an exchange order id use it, otherwise we will - // do it when get our first execution report - if (_state.exchange_order_id) - update_exchange_order_id(*_state.exchange_order_id); } void NativeOrder::init_create_fix() { - auto &encoding = _fix_data.update_encoding; + auto &encoding = _fix_data.create_encoding; using namespace jetfix; // price, quantity, transact time will all be changing on every order update - _fix_data.create_price_bm = encoding.add (0,PriceFieldSz); - _fix_data.create_quantity_bm = encoding.add (0,SizeFieldSz); + _fix_data.create_price_bm = encoding.add (0,price_sz()); + _fix_data.create_quantity_bm = encoding.add (0,quantity_sz()); _fix_data.create_transact_time_bm = encoding.add (datetime::FIX_timestamp(datetime::now())); @@ -58,6 +51,7 @@ void NativeOrder::init_create_fix() encoding.add (_header.side); encoding.add (_header.time_in_force); encoding.add (_header.order_type); + encoding.add (_header.manual_order_indicator); encoding.add (_header.customer_or_firm); encoding.add (_header.cti_code); encoding.add (_header.security->glbx().security_desc()); @@ -69,7 +63,7 @@ void NativeOrder::init_create_fix() void NativeOrder::init_cancel_fix() { - auto &encoding = _fix_data.update_encoding; + auto &encoding = _fix_data.cancel_encoding; using namespace jetfix; @@ -81,18 +75,14 @@ void NativeOrder::init_cancel_fix() encoding.add (_header.side); encoding.add (_header.time_in_force); encoding.add (_header.order_type); - encoding.add (_header.customer_or_firm); - encoding.add (_header.cti_code); + encoding.add (_header.manual_order_indicator); encoding.add (_header.security->glbx().security_desc()); std::string clordid(clordid_sz(),' '); encode_clorid(_header.order_key,SecurityKey(_header.security->id()),&clordid); encoding.add (clordid); - - // if we have an exchange order id use it, otherwise we will - // do it when get our first execution report - if (_state.exchange_order_id) - update_exchange_order_id(*_state.exchange_order_id); + encoding.add (clordid); + encoding.add (clordid); } void NativeOrder::init_fix() diff --git a/src/server/sparkd/orderman/native_orders/NativeOrder.h b/src/server/sparkd/orderman/native_orders/NativeOrder.h index 744fb1287..bad8496d7 100644 --- a/src/server/sparkd/orderman/native_orders/NativeOrder.h +++ b/src/server/sparkd/orderman/native_orders/NativeOrder.h @@ -50,24 +50,25 @@ public: }; _state = NativeOrderState { + Price(pb.price()), + Quantity(pb.order_quantity()), Price(pb.last_price()), Price(pb.avg_price()), - Quantity(pb.order_quantity()), Quantity(pb.filled_quantity()), pb.order_status(), - &_exchange_order_id, + nullptr, nullptr }; if (reject_msg) set_reject_msg(*reject_msg); + init_fix(); + if (pb.exchange_order_id().size()) update_exchange_order_id(to(pb.exchange_order_id())); else _state.exchange_order_id = nullptr; - - init_fix(); } NativeOrder(NativeOrderHeader const&header) : @@ -77,8 +78,8 @@ public: _exchange_order_id(), _keep_alive_rej() { - _state.exchange_order_id = nullptr; init_fix(); + _state.exchange_order_id = nullptr; } void mark_rejected_by_spark(std::string const&msg) @@ -107,9 +108,10 @@ public: // no ops return false; default: { + _state.price = er.data->price; + _state.order_quantity = er.data->order_quantity; _state.last_price = er.data->last_price; _state.avg_price = er.data->avg_price; - _state.order_quantity = er.data->order_quantity; _state.filled_quantity = er.data->filled_quantity; _state.order_status = er.data->order_status; if (er.data->reject_msg.size()) @@ -148,6 +150,7 @@ public: auto &f = stream->new_msg(jetfix::MessageTypes::NewOrderSingle); f.append(_fix_data.create_encoding); + stream->close(); } void encode_update(OrderTimeStamp const&ts,Price p,Quantity q, jetfix::FIXEncodingStream *stream) @@ -175,6 +178,7 @@ public: auto &f = stream->new_msg(jetfix::MessageTypes::CancelReplace); f.append(_fix_data.update_encoding); + stream->close(); } void encode_cancel(OrderTimeStamp const&ts,jetfix::FIXEncodingStream *stream) @@ -188,8 +192,9 @@ public: encoding.overwrite(_fix_data.cancel_transact_time_bm, &ts.value()[0],ts.value().size()); - auto &f = stream->new_msg(jetfix::MessageTypes::CancelReplace); + auto &f = stream->new_msg(jetfix::MessageTypes::Cancel); f.append(_fix_data.cancel_encoding); + stream->close(); } OrderKey key() const {return _header.order_key;} diff --git a/src/server/sparkd/orderman/native_orders/NativeOrderState.h b/src/server/sparkd/orderman/native_orders/NativeOrderState.h index 4fb21583a..7a7886e18 100644 --- a/src/server/sparkd/orderman/native_orders/NativeOrderState.h +++ b/src/server/sparkd/orderman/native_orders/NativeOrderState.h @@ -11,9 +11,10 @@ namespace orderman { class NativeOrderState { public: + Price price; + Quantity order_quantity; Price last_price; Price avg_price; - Quantity order_quantity; Quantity filled_quantity; api::orderman::OrderStatus order_status; ExchangeOrderID const *exchange_order_id; diff --git a/src/server/sparkd/orderman/service/OrderServiceServer.cpp b/src/server/sparkd/orderman/service/OrderServiceServer.cpp index 97cec96e9..197e427e5 100644 --- a/src/server/sparkd/orderman/service/OrderServiceServer.cpp +++ b/src/server/sparkd/orderman/service/OrderServiceServer.cpp @@ -35,6 +35,7 @@ #include "lib/api/public/ServiceContext.h" #include "server/sparkd/event_grid/events/Init.h" #include "lib/utils/PBUtils.h" +#include "lib/logging/logging.h" namespace bts { namespace orderman { @@ -101,18 +102,18 @@ struct FastExecutor { // in node.observe ([this] (const auto &ev) { gw.on(ev);}); // out - gw.execution_report_signal = [this] (auto const &ev) {node.send(ev);}; - gw.cancel_reject_signal = [this] (auto const &ev) {node.send(ev);}; - gw.gateway_status_change_signal = [this] (auto const &ev) {node.send(ev);}; - gw.gateway_begin_replay_signal = [this] (auto const &ev) {node.send(ev);}; - gw.gateway_end_replay_signal = [this] (auto const &ev) {node.send(ev);}; + gw.execution_report_signal = [this] (auto const &ev) {node.send(ev);}; + gw.cancel_reject_signal = [this] (auto const &ev) {node.send(ev);}; + gw.gateway_status_change_signal = [this] (auto const &ev) {node.send(ev);}; + gw.gateway_begin_replay_signal = [this] (auto const &ev) {node.send(ev);}; + gw.gateway_end_replay_signal = [this] (auto const &ev) {node.send(ev);}; // wiring up md // in node.observe ([this] (const auto &ev) {md.on(ev);}); // out - md.book_update_signal = [this] (auto const&ev) {node.send(ev);}; + md.book_update_signal = [this] (auto const&ev) {node.send(ev);}; // wiring up order_man // in @@ -128,8 +129,8 @@ struct FastExecutor { node.observe ([this] (const auto &ev) {order_man.on(ev);}); // out - order_man.out_gateway_msg_signal = [this] (auto const &ev) {node.send(ev);}; - order_man.native_order_state_change_signal = [this] (auto const &ev) {node.send(ev);}; + order_man.out_gateway_msg_signal = [this] (auto const &ev) {node.send(ev);}; + order_man.native_order_state_change_signal = [this] (auto const &ev) {node.send(ev);}; } ~FastExecutor() @@ -175,15 +176,20 @@ struct SlowExecutor { worker() { // time source - time_source.time_update_signal = [this] (const auto &ev) { node.send(ev);}; + time_source.time_change_signal = [this] (const auto &ev) { node.send(ev);}; // fill storage node.observe ([this] (const auto &ev) {fill_recorder.on(ev);}); node.observe ([this] (const auto &ev) {fill_recorder.on(ev);}); - // order storage + // order storage node.observe ([this] (const auto &ev) {order_recorder.on(ev);}); node.observe ([this] (const auto &ev) {order_recorder.on(ev);}); + + // order PB publication + order_recorder.order_state_change_signal = [this] (const auto &ev) { node.send(ev);}; + // fill PB publication + fill_recorder.native_fill_signal = [this] (const auto &ev) { node.send(ev);}; } ~SlowExecutor() @@ -266,6 +272,7 @@ OrderServiceServer::OrderServiceServer (bts::api::ServiceContext& ctx) me->slow.node.observe ([&ctx,this] (auto const&os) { ctx.post([this,os] () { + LOG(OrderMan,Info,"Post Received order update for publishing"); this->on_order_updates(os); }); }); @@ -311,6 +318,7 @@ void OrderServiceServer::on_fills(event::NativeFills const&f) void OrderServiceServer::on_order_updates(event::OrderStateChange const&os) { + LOG(OrderMan,Info,"Received order update for publishing"); std::vector created; created.reserve(os.state.size()); std::vector updated; @@ -411,7 +419,7 @@ void OrderServiceServer::create_order(const api::orderman::CreateOrderRequest& r new NativeOrder(header) }; - me->fast.node.send(ev); + me->fast.node.send(ev); resp.set_order_key(header.order_key.value()); resp.set_error_code(api::orderman::OE_OK); @@ -445,7 +453,7 @@ void OrderServiceServer::cancel_order(const api::orderman::CancelOrderRequest& c auto ev = event::CancelNativeOrder {it->second}; - me->fast.node.send(ev); + me->fast.node.send(ev); resp.set_error_code(api::orderman::OE_OK); on_reply(resp); } @@ -484,7 +492,7 @@ void OrderServiceServer::update_order(const api::orderman::UpdateOrderRequest& u } auto ev = event::UpdateNativeOrder {Price(native.price()),Quantity(native.quantity()),it->second}; - me->fast.node.send(ev); + me->fast.node.send(ev); resp.set_error_code(api::orderman::OE_OK); on_reply(resp); } diff --git a/src/server/sparkd/persistence/SqliteStore.cpp b/src/server/sparkd/persistence/SqliteStore.cpp index cc2b36056..de5a73771 100644 --- a/src/server/sparkd/persistence/SqliteStore.cpp +++ b/src/server/sparkd/persistence/SqliteStore.cpp @@ -118,9 +118,9 @@ SqliteStore::Data SqliteStore::retrieve_all() { int sqlite_result; do { - sqlite3_stmt* pq = query.get(); + auto pq = query.get(); sqlite_result = sqlite3_step(pq); - if (sqlite_result == SQLITE_ROW || sqlite_result == SQLITE_DONE) { + if (sqlite_result == SQLITE_ROW ) { std::string ns((char*)sqlite3_column_text(pq, 0), sqlite3_column_bytes(pq, 0)); std::string key((char*)sqlite3_column_text(pq, 1), sqlite3_column_bytes(pq, 1)); std::string val((char*)sqlite3_column_blob(pq, 2), sqlite3_column_bytes(pq, 2)); @@ -134,23 +134,20 @@ SqliteStore::Data SqliteStore::retrieve_all() { std::pair SqliteStore::retrieve_one(std::string const&ns, std::string const&k) { - auto query_str = fmt::format ("select ns,key,value from store where ns='{}' and k='{}'", ns,k); + auto query_str = fmt::format ("select ns,key,value from store where ns='{}' and key='{}'", ns,k); sqlite3_stmt_ptr query = utils::prepare_query(me->conn,query_str.c_str()); std::pair result {false,""}; - int sqlite_result; - do { - sqlite3_stmt* pq = query.get(); - sqlite_result = sqlite3_step(pq); - if (sqlite_result == SQLITE_ROW || sqlite_result == SQLITE_DONE) { - std::string ns((char*)sqlite3_column_text(pq, 0), sqlite3_column_bytes(pq, 0)); - std::string key((char*)sqlite3_column_text(pq, 1), sqlite3_column_bytes(pq, 1)); - std::string val((char*)sqlite3_column_blob(pq, 2), sqlite3_column_bytes(pq, 2)); - result.first = true; - result.second = std::move(val); - } - } while(sqlite_result == SQLITE_ROW); + auto pq = query.get(); + auto sqlite_result = sqlite3_step(pq); + if (sqlite_result == SQLITE_ROW ) { + std::string ns((char*)sqlite3_column_text(pq, 0), sqlite3_column_bytes(pq, 0)); + std::string key((char*)sqlite3_column_text(pq, 1), sqlite3_column_bytes(pq, 1)); + std::string val((char*)sqlite3_column_blob(pq, 2), sqlite3_column_bytes(pq, 2)); + result.first = true; + result.second = std::move(val); + } return result; } diff --git a/src/server/sparkd/spreader/SimpleSpreader.h b/src/server/sparkd/spreader/SimpleSpreader.h index 784d00ce5..9937700a3 100644 --- a/src/server/sparkd/spreader/SimpleSpreader.h +++ b/src/server/sparkd/spreader/SimpleSpreader.h @@ -32,7 +32,7 @@ namespace spreader SimpleSpreader(); virtual ~SimpleSpreader(); - SpreaderSubscriptions init(orderman::OrderKey my_key, const SpreaderCreate&); + SpreaderSubscriptions init(orderman::OrderKey my_key, const SpreaderCreate&) override; void on_connect() override; void on_disconnect() override; void on_md(const orderman::Book&) override; @@ -82,4 +82,4 @@ namespace spreader }; } -} \ No newline at end of file +} diff --git a/src/server/sparkd/spreader/SingleFillHedger.cpp b/src/server/sparkd/spreader/SingleFillHedger.cpp index d36217654..d8b48a628 100644 --- a/src/server/sparkd/spreader/SingleFillHedger.cpp +++ b/src/server/sparkd/spreader/SingleFillHedger.cpp @@ -7,17 +7,17 @@ namespace bts { namespace spreader { SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, - size_t leg_index, + size_t, //leg_index, const OrderTemplate& order_template, - const LegPropertyData& leg_property_data, + const LegPropertyData&, //leg_property_data, bts::Price hedge_price, bts::Quantity hedge_quantity, api::BuySell hedge_side) : _spreader_manager(spreader_manager), - _leg_index (leg_index), + // _leg_index (leg_index), _order_template (order_template), - _leg_property_data (leg_property_data), + // _leg_property_data (leg_property_data), _price_quantity_state(hedge_price, hedge_quantity, hedge_side), _state(HedgerState::START) { diff --git a/src/server/sparkd/spreader/SingleFillHedger.h b/src/server/sparkd/spreader/SingleFillHedger.h index dac3c9eeb..35b343815 100644 --- a/src/server/sparkd/spreader/SingleFillHedger.h +++ b/src/server/sparkd/spreader/SingleFillHedger.h @@ -110,9 +110,9 @@ class SingleFillHedger private: ISpreaderManager& _spreader_manager; - const size_t _leg_index; + //const size_t _leg_index; const OrderTemplate& _order_template; - const LegPropertyData& _leg_property_data; + // const LegPropertyData& _leg_property_data; HedgePriceQuantityState _price_quantity_state; HedgerState _state; bts::orderman::OrderKey _order_key; diff --git a/src/server/sparkd/spreader/SingleLegQuoter.cpp b/src/server/sparkd/spreader/SingleLegQuoter.cpp index 94c6d85d0..88b6b5b53 100644 --- a/src/server/sparkd/spreader/SingleLegQuoter.cpp +++ b/src/server/sparkd/spreader/SingleLegQuoter.cpp @@ -407,7 +407,6 @@ void SingleLegQuoter::_compute_price_quantity(Price& price, Quantity& quantity) if (_aux_comp_data.at(min_quoter_leg_quantity_index).quoter_leg_quantity.value() <= quoter_leg_quantity.value()) min_quoter_leg_quantity_index = idx; } - idx++; } quantity = _aux_comp_data.at(min_quoter_leg_quantity_index).quoter_leg_quantity; price = _compute_leg_price(_aux_comp_data); @@ -436,4 +435,4 @@ double SingleLegQuoter::_get_equivelant_quantity(size_t leg_index, Quantity quan return static_cast (quantity.value() * this_leg_data.leg_contract.quantity() / leg_data.leg_contract.quantity()); } -}} \ No newline at end of file +}} diff --git a/tools/serverbuild.cmd b/tools/serverbuild.cmd new file mode 100644 index 000000000..96d568968 --- /dev/null +++ b/tools/serverbuild.cmd @@ -0,0 +1,7 @@ +@setlocal +@echo off +cd %~dp0\.. +@call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat" > nul +cd %~dp0\.. +msbuild /m /p:platform=x64 /clp:verbosity=minimal /clp:summary spark_server.sln + diff --git a/tools/sparkdir.cmd b/tools/sparkdir.cmd new file mode 100644 index 000000000..1bef93676 --- /dev/null +++ b/tools/sparkdir.cmd @@ -0,0 +1,2 @@ +@echo off +cd %~dp0\.. \ No newline at end of file