diff --git a/src/client/spark/AW2/Bus/SingleVolSurfaceInterpGreeksPublisher.cs b/src/client/spark/AW2/Bus/SingleVolSurfaceInterpGreeksPublisher.cs index d30f48b6e..7c6a04229 100644 --- a/src/client/spark/AW2/Bus/SingleVolSurfaceInterpGreeksPublisher.cs +++ b/src/client/spark/AW2/Bus/SingleVolSurfaceInterpGreeksPublisher.cs @@ -12,8 +12,8 @@ using bts.api; using mbts.ui.converters; namespace mbts.spark { - // This class gathers all the inputs needed to calculate InterpGreeks, pass it to - // VolSurfacePrecomputedTheosProducer, and publishes the InterpGreeks to the bus + // This class gathers all the inputs needed to calculate InterpGreeks for a single vol surface, + // passes it to VolSurfacePrecomputedTheosProducer, and publishes the InterpGreeks to the bus // (called SingleVolSurfaceClientPrecomputedTheosPublisher in Edge) // It listens to // a. vol surface inputs diff --git a/src/client/spark/AW2/Bus/VolSurfaceBlackboardManager.cs b/src/client/spark/AW2/Bus/VolSurfaceBlackboardManager.cs index 2627658d4..977857500 100644 --- a/src/client/spark/AW2/Bus/VolSurfaceBlackboardManager.cs +++ b/src/client/spark/AW2/Bus/VolSurfaceBlackboardManager.cs @@ -107,6 +107,43 @@ namespace mbts.spark private bts.api.IBus _bus; private List _subs = new List(); + private static void add_temp_vsu_entries(IDictionary name_id_map, + VolSurfaceUsageList ulist) { + Action add_entry = (option_name, option_venue, vs_name) => { + + int vs_key; + if (name_id_map.TryGetValue(vs_name, out vs_key)) { + ulist.UsageList.Add(new VolSurfaceUsageEntry() { + VsId = vs_key, + SymbolName = option_name, + SecTup = new bts.api.SecurityTuple { + Type = SecurityType.Option, + Venue = option_venue, + Symbol = option_name + } + }); + } + + }; + add_entry("SPX", Venue.Cboe, "CBOE_skews"); + add_entry("SPXW", Venue.Cboe, "CBOE_skews"); + add_entry("E1B", Venue.Glbx, "CME_Skews"); + add_entry("E1C", Venue.Glbx, "CME_Skews"); + add_entry("E3B", Venue.Glbx, "CME_Skews"); + add_entry("E3C", Venue.Glbx, "CME_Skews"); + add_entry("E3D", Venue.Glbx, "CME_Skews"); + add_entry("E4A", Venue.Glbx, "CME_Skews"); + add_entry("E4B", Venue.Glbx, "CME_Skews"); + add_entry("E4C", Venue.Glbx, "CME_Skews"); + add_entry("E4C", Venue.Glbx, "CME_Skews"); + add_entry("E4D", Venue.Glbx, "CME_Skews"); + add_entry("ES", Venue.Glbx, "CME_Skews"); + add_entry("EW1", Venue.Glbx, "CME_Skews"); + add_entry("EW2", Venue.Glbx, "CME_Skews"); + add_entry("EW3", Venue.Glbx, "CME_Skews"); + add_entry("EW4", Venue.Glbx, "CME_Skews"); + } + public VolSurfaceBusManager(bts.api.IBus bus, bts.api.analytics.AnalyticsService analytics_service, bts.api.orderman.OrderService order_service) @@ -158,7 +195,7 @@ namespace mbts.spark _subs.Add(new LiveTheoPublisher(_bb)); _subs.Add(new InterpTheosServerPublisher(_bb, bus, order_service, contracts_throttle)); _subs.Add(new VolSurfaceInterpGreeksMultiplexer(_bb)); - // usage + // list of all volsurface. in this callback, we read the usage config, and detemine the id of the named vol surface var list_sub = _bus.subscribe(SparkTags.VolSurfaceListTag).OnDispatcher().Subscribe(t => { VolSurfaceUsageList ulist = new VolSurfaceUsageList(); @@ -169,9 +206,12 @@ namespace mbts.spark } Log.Ui.info($"VolSurfaceUsageList name_to_ids count: {name_to_ids.Count}"); var vs_usage = mbts.config.Configuration.get(); - Log.Ui.info($"VolSurfaceUsageList vs_usage acount: {vs_usage.Items.Count}"); + Log.Ui.info($"VolSurfaceUsageList vs_usage acount: {vs_usage.Items.Count}"); foreach (var u in vs_usage.Items) { + if (string.Compare(u.OptionName, "SPX", 0) == 0 || string.Compare(u.OptionName, "SPXW", 0) == 0){ + continue; + } if (string.Compare(u.OptionName, "SPX", 0) == 0 || string.Compare(u.OptionName, "SPXW", 0) == 0 && u.OptionVenue == Venue.Unset) { u.OptionVenue = Venue.Cboe; @@ -201,10 +241,11 @@ namespace mbts.spark else { Log.Gen.error($"Could not find vol surface with name: {vs_name}"); - } + } } + add_temp_vsu_entries(name_to_ids, ulist); var list_imm = new VolSurfaceUsageListImmutable(ulist); - Log.Ui.info(list_imm.log_string()); + Log.Ui.info("VolSurfaceUsage: " + list_imm.log_string()); _bb.post(SparkTags.VolSurfaceUsageTag, list_imm); _spin_vss(list_imm); }); diff --git a/src/client/spark/AW2/LiveTheoPublisher.cs b/src/client/spark/AW2/LiveTheoPublisher.cs index 9ba84fed4..45431388d 100644 --- a/src/client/spark/AW2/LiveTheoPublisher.cs +++ b/src/client/spark/AW2/LiveTheoPublisher.cs @@ -14,6 +14,11 @@ namespace mbts.spark { // Publishes theos for all options (on the side, also publishes the theos for TC2). // Listens to driver and interp theos, on a change, calls _interp_and_publish public class LiveTheoPublisher : IDisposable { + public enum Impetus { + DRIVER, + SKEW, + } + private ThreadedBlackboard _bb; private readonly ITag> _greeks_tag = SparkTags.AllInterpGreeks; @@ -30,13 +35,14 @@ namespace mbts.spark { _bb.subscribe(_drivers_tag); _bb.data_callback += _on_data; _bb.timer_callback += _on_timer; - _interp_and_publish(); + _interp_and_publish(Impetus.SKEW); } private void _on_data(object tag, object data) { if (tag.Equals(_drivers_tag) || tag.Equals(_greeks_tag)) { - _interp_and_publish(); + Impetus imp = tag.Equals(_drivers_tag) ? Impetus.DRIVER : Impetus.SKEW; + _interp_and_publish(imp); } } @@ -103,7 +109,7 @@ namespace mbts.spark { return TheoPoint.getNulledObject(); } - private void _publish_tc2_theos(IDictionary theos) { + private void _publish_tc2_theos(IDictionary theos, Impetus imp) { var rv = new Dictionary<(string, Venue), ExpStrikeKeyedData>(); foreach (var kv in theos) { SecurityStrike k = kv.Key; @@ -118,6 +124,9 @@ namespace mbts.spark { _override_theos(ref rv); foreach (var kv in rv) { _bb.post(SparkTags.TC2Tags.LiveTheosTag(kv.Key), kv.Value); + if (imp == Impetus.SKEW) { + _bb.post(SparkTags.TC2Tags.VolSaveEventTheosTag(kv.Key), kv.Value); + } } } @@ -167,7 +176,7 @@ namespace mbts.spark { } - private void _interp_and_publish() { + private void _interp_and_publish(Impetus imp) { var timer = Stopwatch.StartNew(); var res = new Dictionary(); var driver_map = _bb.read_state(_drivers_tag); @@ -209,13 +218,13 @@ namespace mbts.spark { } // copy and publish IReadOnlyDictionary res_ro = res; - bts.Log.Gen.info($"LiveTheoPublisher._interp_and_publish posting " + + bts.Log.Gen.info($"LiveTheoPublisher._interp_and_publish Impetus: {imp} posting " + $"count: {res_ro.Count}"); timer.Stop(); _logger.log(_log_id, _log_id, timer.Elapsed.TotalMilliseconds); _bb.post(SparkTags.Greeks, res_ro); // oh and those TC2 theos for comptability - _publish_tc2_theos(k_theos); + _publish_tc2_theos(k_theos, imp); } // If we do any rolls like SP for futures, it will be here diff --git a/src/client/spark/Analytics/Core/VolSurfaceConstants.cs b/src/client/spark/Analytics/Core/VolSurfaceConstants.cs index fa9e2e577..b2ab8de8b 100644 --- a/src/client/spark/Analytics/Core/VolSurfaceConstants.cs +++ b/src/client/spark/Analytics/Core/VolSurfaceConstants.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace mbts.analytics { public static class VolSurfaceConstants { - public static int vol_time_sample_mins = 1; + public static int vol_time_sample_mins = 5; } // TODO: remove this public static class VolSurfaceTemp { diff --git a/src/client/spark/Analytics/Pricing/VolSurfaceInterpGreeksProducer.cs b/src/client/spark/Analytics/Pricing/VolSurfaceInterpGreeksProducer.cs index c7950d31b..7e4452ffa 100644 --- a/src/client/spark/Analytics/Pricing/VolSurfaceInterpGreeksProducer.cs +++ b/src/client/spark/Analytics/Pricing/VolSurfaceInterpGreeksProducer.cs @@ -9,8 +9,8 @@ using bts.api; using mbts.spark; namespace mbts.analytics { - // This class computes the theos/greeks for a number of driver - // prices (specified in the vs settings). + // This class computes interp theos/greeks (ie for a number of driver + // prices (specified in the vs settings)) for a volsurface // It has public setters that get // 1. contracts // 2. vs input @@ -41,7 +41,8 @@ namespace mbts.analytics { private IDictionary> _computed_driver_range_map = new Dictionary>(); private readonly IEnumerable _default_abs_moves = - new double[] { 300, -200, -125, -100, -75, -50, -25, 0, 25, 50, 75, 100, 125, 200, 300 }; + //new double[] { 300, -200, -125, -100, -75, -50, -25, 0, 25, 50, 75, 100, 125, 200, 300 }; + new double[] { -100, -50, 0, 50, 100 }; private readonly double _cushion_percentage = 25.0; public event @@ -135,8 +136,8 @@ namespace mbts.analytics { false, true, false, false, false, _filter_map); timer.stop(); vol_compute_time = timer.last_interval_time_ms; - Log.Gen.info($"VolSurfacePrecomputedTheosProducer._compute_and_fire volmat time " + - $"{timer.last_interval_time_ms}"); + Log.Gen.info($"VolSurfacePrecomputedTheosProducer._compute_and_fire volmat input_type: {input_type} vs_id: {_vs_id} time " + + $"{timer.last_interval_time_ms} tid: {System.Threading.Thread.CurrentThread.ManagedThreadId}"); timer.start(); IDictionary> exp_theo_map = VolSurfaceTheoCalculator.compute_standard_greeks(synced_vs_input.surface_settings, diff --git a/src/client/spark/Daemons/MergedMDDaemon.cs b/src/client/spark/Daemons/MergedMDDaemon.cs index 72d9c0cf9..f63a7a32b 100644 --- a/src/client/spark/Daemons/MergedMDDaemon.cs +++ b/src/client/spark/Daemons/MergedMDDaemon.cs @@ -111,13 +111,43 @@ namespace bts _merge_and_post(); } + + + private static bool is_active(SecurityMD sec_md) { + SecurityImmutable sec = sec_md.security; + // temp: to see if spreads work + bool fut_or_option = (sec.security_type() == bts.api.SecurityType.Future || sec.security_type() == bts.api.SecurityType.Option); + if (!fut_or_option) + return true; + Func is_daily_option = () => { + bool is_daily = false; + if (sec.Exchange == Venue.Cboe) { + is_daily = sec.Symbol.ToLower() == "spxw"; + } + if (sec.Exchange == Venue.Glbx) { + string symbol = sec.Symbol.ToLower(); + int unused; + is_daily = symbol.Length >= 3 && symbol[0] == 'e' && Int32.TryParse(symbol[1].ToString(), out unused); + } + return is_daily; + }; + bool is_expired = !SecurityExpirationHelper.is_unexpired(sec); + if (is_expired) { + return false; + } + if (sec.security_type() == bts.api.SecurityType.Option) { + int days_to_exp = Convert.ToInt32((sec.earliest_expiration() - DateTime.Now).TotalDays); + if (is_daily_option()) { + return days_to_exp <= 14; + } else { + return days_to_exp <= 90; + } + } + return true; + } + private void _merge_and_post() { - Func is_active = (sec_md) => - { - var sec = sec_md.security; - return SecurityExpirationHelper.is_unexpired(sec); - }; var to_pub = _server_sec_map.Where(kv => is_active(kv.Value)).ToDictionary(kv => kv.Key, kv => kv.Value); foreach (var kv in _fake_sec_map) { diff --git a/src/client/spark/NMSheets/UIComponents/MainSheet/NMSheetControl.cs b/src/client/spark/NMSheets/UIComponents/MainSheet/NMSheetControl.cs index 86d9b6556..1817d3a5b 100644 --- a/src/client/spark/NMSheets/UIComponents/MainSheet/NMSheetControl.cs +++ b/src/client/spark/NMSheets/UIComponents/MainSheet/NMSheetControl.cs @@ -21,6 +21,7 @@ using System.Reactive.Linq; using System.Threading; using bts.api.orderman; using bts; +using mbts.analytics; namespace BCG { public partial class NMSheetControl : UserControl { @@ -253,7 +254,7 @@ namespace BCG { /// windows timer _windows_timer = new System.Windows.Forms.Timer(components); _windows_timer.Enabled = true; - _windows_timer.Interval = 20; + _windows_timer.Interval = 100; _windows_timer.Tick += _windows_timer_tick; _toolstripmenuitem_card.Visible = false; /// status bar @@ -721,9 +722,9 @@ namespace BCG { private void _windows_timer_tick(object sender, EventArgs e) { _publish_activation_state(); - //_threaded_bb.sec_thread_dowork(); + // this computes the data and then paints it _check_and_propagate_data(); - _poll_theo_acceptance_button(); + //_poll_theo_acceptance_button(); _refresh_statusbar_data(false); } @@ -784,21 +785,31 @@ namespace BCG { #region Coalescer NMSheetData interaction private DateTime _last_data_draw_time = DateTime.MinValue; - private const double _min_draw_period_ms = 333.3; + private const double _min_draw_period_ms = 500; private NMSheetGeometricLayout _last_geo_lo_info = null; + private VolSurfaceTimer _vs_timer = new VolSurfaceTimer(); + // this is where we assemble the data (in _coalescer.get_data()) + // and then painted in _respond_to_data private void _check_and_propagate_data() { if (is_visible) { if ((DateTime.Now - _last_data_draw_time).Milliseconds >= Math.Max(_settings.setting_grid_internal.grid_paint_throttle_ms, _min_draw_period_ms)) { + _vs_timer.start(); NMSheetData new_sheet_data = _coalescer.get_data(); + _vs_timer.stop(); + Log.Gen.info($"NMSheetControl._check_and_propagate_data get_data time: {_vs_timer.last_interval_time_ms} msecs symbols: {_title_prefix} tid: {System.Threading.Thread.CurrentThread.ManagedThreadId}"); if (new_sheet_data != null) { _last_data_draw_time = DateTime.Now; _sheet_data = new_sheet_data; + _vs_timer.start(); _respond_to_data(); + _vs_timer.stop(); + Log.Gen.info($"NMSheetControl._check_and_propagate_data _respond_to_data time: {_vs_timer.last_interval_time_ms} msecs symbols: {_title_prefix} tid: {System.Threading.Thread.CurrentThread.ManagedThreadId}"); } } } } + // this is the painting private void _respond_to_data() { if (_sheet_data != null) { _set_driver_control_display(); diff --git a/src/client/spark/Security/SecurityExpirationHelper.cs b/src/client/spark/Security/SecurityExpirationHelper.cs index 28acd4327..19ed68c60 100644 --- a/src/client/spark/Security/SecurityExpirationHelper.cs +++ b/src/client/spark/Security/SecurityExpirationHelper.cs @@ -49,7 +49,7 @@ namespace mbts { if (sec.security_tuple().Venue == Venue.Cboe || sec.security_tuple().Venue == Venue.Glbx) { var exp = sec.to_sec_exp().expiration; bool is_unexp = exp.Date >= DateTime.Now.Date; - Log.Gen.info($"SecurityExpirationMapper.is_unexpired exp: {exp} is_unexp: {is_unexp}"); +// Log.Gen.info($"SecurityExpirationMapper.is_unexpired exp: {exp} is_unexp: {is_unexp}"); return is_unexp; } var sec_type = sec.security_type(); diff --git a/src/client/spark/core/Bus/SparkTags.cs b/src/client/spark/core/Bus/SparkTags.cs index 5066868f4..736dd32de 100644 --- a/src/client/spark/core/Bus/SparkTags.cs +++ b/src/client/spark/core/Bus/SparkTags.cs @@ -384,6 +384,11 @@ namespace mbts.spark { public static ITag> LiveTheosTag((string, Venue) symbol) => _mk_tag, (string, Venue)>(symbol); + // these are the theos at time of the vol save (we use it to extrapolate the theos prices for the spreads) + public static ITag> VolSaveEventTheosTag((string, Venue) symbol) => + _mk_tag, (string, Venue)>(symbol); + + // Aggregated version of the above public static ITag>> AllLiveTheosTag { get; } = diff --git a/src/lib/config/profiles/default/toggles.conf b/src/lib/config/profiles/default/toggles.conf index 2200ca1ee..87dcf9479 100644 --- a/src/lib/config/profiles/default/toggles.conf +++ b/src/lib/config/profiles/default/toggles.conf @@ -114,13 +114,139 @@ VolSurfaceUsage { items: { option_name: "SPX" option_venue: VENUE_CBOE - vs_name: "Main" + vs_name: "CBOE_skews" } items: { option_name: "SPXW" option_venue: VENUE_CBOE - vs_name: "Main" + vs_name: "CBOE_skews" } + items: { + option_name: "ES" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E1A" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E2A" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E3A" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E4A" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E5A" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E1B" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E2B" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E3B" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E4B" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E5B" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E1C" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E2C" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E3C" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E4C" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E5C" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E1D" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E2D" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E3D" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E4D" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "E5D" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "EW1" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "EW2" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "EW3" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + items: { + option_name: "EW4" + option_venue: VENUE_GLBX + vs_name: "CME_Skews" + } + } }