diff --git a/src/client/spark/AW2/VolSurfaceDisplayModel.cs b/src/client/spark/AW2/VolSurfaceDisplayModel.cs index 77fbdaccf..982ac12c2 100644 --- a/src/client/spark/AW2/VolSurfaceDisplayModel.cs +++ b/src/client/spark/AW2/VolSurfaceDisplayModel.cs @@ -250,7 +250,7 @@ public IEnumerable> get_committed_volpath(VolSurfaceDisplayGridExpiration exp) { if (_committed_data != null && _committed_data.vs_output != null) { - VolCurveOutput exp_out = _committed_data.vs_output[new VolSurfaceExpiration(exp.symbol, exp.expiration)]; + VolCurveOutput exp_out = _committed_data.vs_output[new VolSurfaceExpiration(SecurityType.Option, exp.symbol, exp.expiration)]; return VolSurfaceUtilityFunctions.get_vol_path_points(exp_out); } else return Enumerable.Empty>(); @@ -258,7 +258,7 @@ public IEnumerable> get_candidate_volpath(VolSurfaceDisplayGridExpiration exp) { if (is_dirty && _candidate_data != null && _candidate_data.vs_output != null) { - VolCurveOutput exp_out = _candidate_data.vs_output[new VolSurfaceExpiration(exp.symbol, exp.expiration)]; + VolCurveOutput exp_out = _candidate_data.vs_output[new VolSurfaceExpiration(SecurityType.Option, exp.symbol, exp.expiration)]; return VolSurfaceUtilityFunctions.get_vol_path_points(exp_out); } else return Enumerable.Empty>(); diff --git a/src/client/spark/Analytics/Core/VolSurfaceExpiration.cs b/src/client/spark/Analytics/Core/VolSurfaceExpiration.cs index a9c258cf9..c76b7f869 100644 --- a/src/client/spark/Analytics/Core/VolSurfaceExpiration.cs +++ b/src/client/spark/Analytics/Core/VolSurfaceExpiration.cs @@ -24,12 +24,8 @@ namespace mbts.analytics { /// [ProtoBuf.ProtoContract(Name = "VolSurfaceExpiration")] public class VolSurfaceExpiration : IEquatable, IComparable { - public VolSurfaceExpiration() : this(string.Empty, default(DateTime)) { } - - public VolSurfaceExpiration(string symbol, DateTime expiration) - : - this(bts.api.SecurityType.Option, symbol, expiration) { - } + public VolSurfaceExpiration() + : this(SecurityType.Unset, string.Empty, default) { } public VolSurfaceExpiration(bts.api.SecurityType security_type, string symbol, DateTime expiration) { this.security_type = security_type; @@ -51,8 +47,7 @@ namespace mbts.analytics { [ProtoBuf.ProtoMember(20)] public DateTime expiration; [ProtoBuf.ProtoMember(30)] - public bts.api.SecurityType security_type = bts.api.SecurityType.Option; - + public bts.api.SecurityType security_type; public bool Equals(VolSurfaceExpiration other) { return other != null && symbol.Equals(other.symbol) && expiration.Equals(other.expiration); diff --git a/src/client/spark/Risk/Combo/ComboReportFutureRow.cs b/src/client/spark/Risk/Combo/ComboReportFutureRow.cs index 5a588ff52..ba8abc6e9 100644 --- a/src/client/spark/Risk/Combo/ComboReportFutureRow.cs +++ b/src/client/spark/Risk/Combo/ComboReportFutureRow.cs @@ -23,12 +23,12 @@ namespace mbts.analytics { foreach (var kv in exp_date_data) { _cell_cache.AddOrUpdate( - new VolSurfaceExpiration(string.Empty, kv.Key), + new VolSurfaceExpiration(SecurityType.Option, string.Empty, kv.Key), c => c.update(kv.Value.aggregate), () => new ComboReportFutureExpirationCell(kv.Value.aggregate)); foreach (var sym_kv in kv.Value.symbol_data) { _cell_cache.AddOrUpdate( - new VolSurfaceExpiration(sym_kv.Key, kv.Key), + new VolSurfaceExpiration(SecurityType.Option, sym_kv.Key, kv.Key), c => c.update(sym_kv.Value), () => new ComboReportFutureSymbolCell(sym_kv.Value)); } diff --git a/src/client/spark/Risk/Combo/ComboReportFuturesGrid.cs b/src/client/spark/Risk/Combo/ComboReportFuturesGrid.cs index cc177fe1d..12d27beac 100644 --- a/src/client/spark/Risk/Combo/ComboReportFuturesGrid.cs +++ b/src/client/spark/Risk/Combo/ComboReportFuturesGrid.cs @@ -47,7 +47,7 @@ namespace mbts.analytics { var exp_agg_cols = data.future_expirations .Select(vse => vse.expiration) .Distinct() - .Select(exp_date => new VolSurfaceExpiration(string.Empty, exp_date)); + .Select(exp_date => new VolSurfaceExpiration(SecurityType.Option, string.Empty, exp_date)); _expirations.sync_with(exp_agg_cols.Ordered(), allow_duplicates: false); _row.update(data.get_future_exp_date_map()); } diff --git a/src/client/spark/Risk/Combo/ComboReportOptionRow.cs b/src/client/spark/Risk/Combo/ComboReportOptionRow.cs index 743355eac..837a6c853 100644 --- a/src/client/spark/Risk/Combo/ComboReportOptionRow.cs +++ b/src/client/spark/Risk/Combo/ComboReportOptionRow.cs @@ -27,12 +27,12 @@ namespace mbts.analytics { } foreach (var kv in exp_date_data) { _cell_cache.AddOrUpdate( - new VolSurfaceExpiration(string.Empty, kv.Key), + new VolSurfaceExpiration(SecurityType.Option, string.Empty, kv.Key), c => c.update(kv.Value.aggregate), () => new ComboReportOptionExpirationCell(kv.Value.aggregate)); foreach (var sym_kv in kv.Value.symbol_data) { _cell_cache.AddOrUpdate( - new VolSurfaceExpiration(sym_kv.Key, kv.Key), + new VolSurfaceExpiration(SecurityType.Option, sym_kv.Key, kv.Key), c => c.update(sym_kv.Value), () => new ComboReportOptionSymbolCell(sym_kv.Value)); } diff --git a/src/client/spark/Risk/Combo/ComboReportOptionsGrid.cs b/src/client/spark/Risk/Combo/ComboReportOptionsGrid.cs index fda85f83d..642bd7127 100644 --- a/src/client/spark/Risk/Combo/ComboReportOptionsGrid.cs +++ b/src/client/spark/Risk/Combo/ComboReportOptionsGrid.cs @@ -98,7 +98,7 @@ namespace mbts.analytics { var exp_agg_cols = data.option_expirations .Select(vse => vse.expiration) .Distinct() - .Select(exp_date => new VolSurfaceExpiration(string.Empty, exp_date)); + .Select(exp_date => new VolSurfaceExpiration(SecurityType.Option, string.Empty, exp_date)); _expirations.sync_with( data.option_expirations.Concat(exp_agg_cols).Ordered(_exp_comparer)); foreach (var r in rows) { diff --git a/src/client/spark/Risk/Slide/SlideReportCalculator.cs b/src/client/spark/Risk/Slide/SlideReportCalculator.cs index 0c52a7ccb..6028bab24 100644 --- a/src/client/spark/Risk/Slide/SlideReportCalculator.cs +++ b/src/client/spark/Risk/Slide/SlideReportCalculator.cs @@ -293,7 +293,7 @@ namespace mbts.analytics { /// because of aggregation var exp_data = new Dictionary>(option_exp_data); foreach (var kv in future_exp_data) { - exp_data.Add(new VolSurfaceExpiration(kv.Key.symbol + " Future", kv.Key.expiration), kv.Value); + exp_data.Add(new VolSurfaceExpiration(SecurityType.Future, kv.Key.symbol, kv.Key.expiration), kv.Value); } // foreach (var kv in option_exp_data) { // VolSurfaceExpiration formatted_exp = new VolSurfaceExpiration(kv.Key.symbol, mbts.ui.utility.ExpirationFormatter.convert_real_to_mapped(SecurityType.Option, kv.Key.symbol, kv.Key.expiration)); diff --git a/src/client/spark/Risk/VolSurfaceSlideCalculator.cs b/src/client/spark/Risk/VolSurfaceSlideCalculator.cs index 15ae54317..224d31d54 100644 --- a/src/client/spark/Risk/VolSurfaceSlideCalculator.cs +++ b/src/client/spark/Risk/VolSurfaceSlideCalculator.cs @@ -63,7 +63,7 @@ namespace mbts.analytics { } } option_pos_map = option_pos_map_aux.ToDictionary( - kv => new VolSurfaceExpiration(kv.Key.symbol, kv.Key.expiration), + kv => new VolSurfaceExpiration(SecurityType.Option, kv.Key.symbol, kv.Key.expiration), kv => kv.Value.ToDictionaryDupes(i => i.Key, i => Tuple.Create(i.Value[0], i.Value[1]))); future_pos_map = future_pos_map_aux.ToDictionary( kv => new VolSurfaceExpiration(bts.api.SecurityType.Future, kv.Key.symbol, kv.Key.expiration), @@ -500,7 +500,8 @@ namespace mbts.analytics { #region Conversions - internal static VolSurfaceExpiration _to_vs_exp(SecurityExpiration exp) { return new VolSurfaceExpiration(exp.symbol, exp.expiration); } + internal static VolSurfaceExpiration _to_vs_exp(SecurityExpiration exp) => + new(SecurityType.Option, exp.symbol, exp.expiration); internal static mbts.SecurityExpiration _to_sec_exp(VolSurfaceExpiration exp, bool is_option) { return new SecurityExpiration(Venue.Unset, is_option ? SecurityType.Option : SecurityType.Future, exp.symbol, exp.expiration);