diff --git a/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs b/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs index ffd1863d2..c4e2684e0 100644 --- a/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs +++ b/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs @@ -62,9 +62,7 @@ namespace bts.shell.pnl { double ask_price = 0, double last_price = 0, double settlement_price = 0, - double sod_pnl = 0, PositionPriceSizeWithGreeks? sod = null, - double day_pnl = 0, PositionPriceSizeWithGreeks? day = null, WorkingOrderData? working = null, SecurityImmutable? security = null, @@ -81,9 +79,7 @@ namespace bts.shell.pnl { this.ask_price = ask_price; this.last_price = last_price; this.settlement_price = settlement_price; - this.sod_pnl = sod_pnl; this.sod = sod ?? PositionPriceSizeWithGreeks.empty; - this.day_pnl = day_pnl; this.day = day ?? PositionPriceSizeWithGreeks.empty; this.working = working ?? WorkingOrderData.Empty; this.security = security; @@ -104,7 +100,7 @@ namespace bts.shell.pnl { public double pnl_price { get; } /// Sod - public double sod_pnl { get; } + public double sod_pnl => new[] { sod_realized_pnl, sod_unrealized_pnl }.sum_real(); public double sod_long_pos => sod.long_pos; public double sod_long_avg_price => sod.long_avg; public double sod_long_avg_pnl => bid_price - sod.long_avg; @@ -126,7 +122,7 @@ namespace bts.shell.pnl { public double display_sod_short_pos => qty_conversion.to_display(sod_short_pos); /// Day - public double day_pnl { get; } + public double day_pnl => new[] { day_realized_pnl + day_unrealized_pnl }.sum_real(); public double day_long_pos => day.long_pos; public double day_long_avg_price => day.long_avg; public double day_long_avg_pnl => bid_price - day.long_avg; @@ -199,7 +195,8 @@ namespace bts.shell.pnl { ask_price: double.NaN, last_price: double.NaN, settlement_price: u.settle_price, - sod_pnl: u.start_pnl, + // Now computed as the sum: sod_realized_pnl + sod_unrealized_pnl + // sod_pnl: u.start_pnl, sod: new() { price_size = new( u.start_long_pos, @@ -213,7 +210,8 @@ namespace bts.shell.pnl { theta = u.start_theta } }, - day_pnl: u.day_pnl, + // Now computed as the sum: day_realized_pnl + day_unrealized_pnl + // day_pnl: u.day_pnl, day: new() { price_size = new( u.day_long_pos, @@ -251,9 +249,7 @@ namespace bts.shell.pnl { ask_price ?? this.ask_price, last_price, settlement_price, - sod_pnl: sod_pnl, sod, - day_pnl: day_pnl, day, working ?? this.working, security ?? this.security,