Compare commits
8
Commits
20.0.0_rc2
...
20.0.0_rc3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
04db38d627 | ||
|
|
007af71bb2 | ||
|
|
a216d1cc81 | ||
|
|
2b0e46ed38 | ||
|
|
5f3b243265 | ||
|
|
c9ce2d18bf | ||
|
|
7b563ba66c | ||
|
|
3e1be70923 |
No files matched your search
@@ -87,6 +87,15 @@ namespace mbts.spark {
|
||||
public static bool operator !=(LadderColumnSettings x, LadderColumnSettings y) => !(x == y);
|
||||
}
|
||||
|
||||
[ProtoContract]
|
||||
class LadderOrderLimits : IEquatable<LadderOrderLimits> {
|
||||
[ProtoMember(1)]
|
||||
public ToggleInt32Proto max_settlement_cross_ticks { get; set; }
|
||||
|
||||
public bool Equals(LadderOrderLimits other) =>
|
||||
other != null && max_settlement_cross_ticks == other.max_settlement_cross_ticks;
|
||||
}
|
||||
|
||||
[ProtoContract]
|
||||
class HistogramBarAnimation : IEquatable<HistogramBarAnimation> {
|
||||
// this class is 100% mutable (there are literally 0 readonly members),
|
||||
@@ -314,6 +323,8 @@ namespace mbts.spark {
|
||||
// Settings are liable to change in the near future, so an internal IEqualityComparer simply won't do as it risks becoming out of date.
|
||||
[ProtoContract]
|
||||
class LadderSettings : IEquatable<LadderSettings> {
|
||||
// RESERVED ProtoMember indices
|
||||
// 900-999: dj settings
|
||||
const double _default_order_entry_panel_width = 110.0;
|
||||
const double _default_zoom_factor = 1.0;
|
||||
const bool _default_show_warn_on_cross = true;
|
||||
@@ -592,6 +603,9 @@ namespace mbts.spark {
|
||||
[ProtoMember(61), DefaultValue(true)]
|
||||
public bool status_message_visible { get; set; }
|
||||
|
||||
[ProtoMember(900)]
|
||||
public LadderOrderLimits ladder_order_limits { get; set; }
|
||||
|
||||
public void sanitize() =>
|
||||
sanitize(this);
|
||||
|
||||
@@ -697,7 +711,8 @@ namespace mbts.spark {
|
||||
a.enforce_max_clip == b.enforce_max_clip &&
|
||||
a.max_clip == b.max_clip &&
|
||||
a.price_display_format == b.price_display_format &&
|
||||
a.status_message_visible == b.status_message_visible;
|
||||
a.status_message_visible == b.status_message_visible &&
|
||||
a.ladder_order_limits.safe_equals(b.ladder_order_limits);
|
||||
|
||||
public bool Equals(LadderSettings other) =>
|
||||
profile_equals(this, other) &&
|
||||
|
||||
@@ -3,6 +3,7 @@ using bts.api;
|
||||
using bts.api.orderman;
|
||||
using bts.collections;
|
||||
using bts.persist.algo;
|
||||
using bts.proto;
|
||||
using bts.shell.orderbook;
|
||||
using bts.utils;
|
||||
using mbts.collections;
|
||||
@@ -44,7 +45,8 @@ namespace mbts.spark {
|
||||
LadderSettings.NetChangeTerms _price_format;
|
||||
LadderSettings.PriceDisplayFormat _price_display_format;
|
||||
double _order_entry_panel_width, _zoom_factor;
|
||||
bool _auto_clear, _show_warn_on_cross, _enforce_max_clip;
|
||||
bool _auto_clear, _show_warn_on_cross, _enforce_max_clip, _enforce_max_settlement_cross_ticks;
|
||||
int _max_settlement_cross_ticks;
|
||||
LadderSettings _current;
|
||||
LadderColumnSettingsVM
|
||||
_orders = new OrdersColumnSettingsVM(),
|
||||
@@ -190,6 +192,8 @@ namespace mbts.spark {
|
||||
public bool show_warn_on_cross { get => _show_warn_on_cross; set => Set(ref _show_warn_on_cross, value); }
|
||||
public bool enforce_max_clip { get => _enforce_max_clip; set => Set(ref _enforce_max_clip, value); }
|
||||
public uint max_clip { get => _max_clip.Value; set => _max_clip.Value = value; }
|
||||
public bool enforce_max_settlement_cross_ticks { get => _enforce_max_settlement_cross_ticks; set => Set(ref _enforce_max_settlement_cross_ticks, value); }
|
||||
public int max_settlement_cross_ticks { get => _max_settlement_cross_ticks; set => Set(ref _max_settlement_cross_ticks, value); }
|
||||
|
||||
// favorites
|
||||
public FavoriteAlgosVM favorite_algos_vm { get; }
|
||||
@@ -370,6 +374,10 @@ namespace mbts.spark {
|
||||
show_warn_on_cross = settings.show_warn_on_cross;
|
||||
enforce_max_clip = settings.enforce_max_clip;
|
||||
max_clip = settings.max_clip;
|
||||
if (settings.ladder_order_limits != null) {
|
||||
enforce_max_settlement_cross_ticks = settings.ladder_order_limits.max_settlement_cross_ticks.is_enabled;
|
||||
max_settlement_cross_ticks = settings.ladder_order_limits.max_settlement_cross_ticks.value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -448,6 +456,10 @@ namespace mbts.spark {
|
||||
clone.show_warn_on_cross = show_warn_on_cross;
|
||||
clone.enforce_max_clip = enforce_max_clip;
|
||||
clone.max_clip = max_clip;
|
||||
if (clone.ladder_order_limits == null)
|
||||
clone.ladder_order_limits = new LadderOrderLimits();
|
||||
clone.ladder_order_limits.max_settlement_cross_ticks =
|
||||
new ToggleInt32Proto(max_settlement_cross_ticks, enforce_max_settlement_cross_ticks);
|
||||
return clone;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using bts.api;
|
||||
using bts.api.orderman;
|
||||
using bts.proto;
|
||||
using bts.shell;
|
||||
using bts.spark;
|
||||
using bts.utils;
|
||||
@@ -489,6 +490,10 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
public async Task send_order_async(Side side, uint size, double price) {
|
||||
if (!_validate_price(side, price, out var invalid_price_msg)) {
|
||||
status_update(new Activity { security = security, message = invalid_price_msg, category = ActivityLogCategory.order });
|
||||
return;
|
||||
}
|
||||
var order = order_properties_vm.create(side);
|
||||
if (order.CustomDef != null) {
|
||||
if (order.CustomDef.Stop != null) {
|
||||
@@ -520,6 +525,23 @@ namespace mbts.spark {
|
||||
}
|
||||
}
|
||||
|
||||
bool _validate_price(Side side, double price, out string msg) {
|
||||
msg = null;
|
||||
if (!price.is_real()) {
|
||||
msg = "not a real number";
|
||||
} else if (settlement.is_real()) {
|
||||
var ticks_from_settle = security.ContractSpec.tickdiff(price, settlement);
|
||||
if (ticks_from_settle.HasValue) {
|
||||
var max_cross = (current_settings?.ladder_order_limits?.max_settlement_cross_ticks)?.as_nullable();
|
||||
if (max_cross.HasValue) {
|
||||
if (side == Side.Sell ? ticks_from_settle < (-1 * max_cross.Value) : ticks_from_settle > max_cross.Value)
|
||||
msg = $"exceeds settle cross ticks limit ({ticks_from_settle.Value})";
|
||||
}
|
||||
}
|
||||
}
|
||||
return msg == null;
|
||||
}
|
||||
|
||||
void _update_header() {
|
||||
bool last_updated = md.get_last_trade(ref _last_trade_time, out NativePriceSize last, out DateTime time, out ulong volume);
|
||||
if (_misc_time != _model.md.misc_timestamp || last_updated) {
|
||||
|
||||
@@ -1069,7 +1069,7 @@ namespace mbts.spark {
|
||||
double best_bid = _get_top_price(_bids);
|
||||
double best_ask = _get_top_price(_asks);
|
||||
return double.IsNaN(best_bid) ?
|
||||
double.IsNaN(best_ask) ? _vm.low : security.ContractSpec.tickdown(best_ask) :
|
||||
double.IsNaN(best_ask) ? _vm.settlement : security.ContractSpec.tickdown(best_ask) :
|
||||
best_bid;
|
||||
}
|
||||
|
||||
@@ -1077,7 +1077,7 @@ namespace mbts.spark {
|
||||
double best_bid = _get_top_price(_bids);
|
||||
double best_ask = _get_top_price(_asks);
|
||||
return double.IsNaN(best_ask) ?
|
||||
double.IsNaN(best_bid) ? security.ContractSpec.tickdown(_vm.high) : best_bid :
|
||||
double.IsNaN(best_bid) ? _vm.settlement : best_bid :
|
||||
security.ContractSpec.tickdown(best_ask);
|
||||
}
|
||||
|
||||
@@ -1085,7 +1085,7 @@ namespace mbts.spark {
|
||||
double best_bid = _get_top_price(_bids);
|
||||
double best_ask = _get_top_price(_asks);
|
||||
return double.IsNaN(best_bid) ?
|
||||
double.IsNaN(best_ask) ? 0.5 * (_vm.low + _vm.high) : security.ContractSpec.tickdown(best_ask) :
|
||||
double.IsNaN(best_ask) ? _vm.settlement : security.ContractSpec.tickdown(best_ask) :
|
||||
double.IsNaN(best_ask) ? best_bid : TickUtils.mid_tick(security.ContractSpec, best_bid, best_ask);
|
||||
}
|
||||
|
||||
|
||||
@@ -1019,45 +1019,47 @@
|
||||
<Grid HorizontalAlignment="Left" Margin="6">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}"/>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="{Binding Source={StaticResource VerticalPush1}}"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="50"/>
|
||||
<ColumnDefinition Width="{Binding Source={StaticResource HorizontalPush3}}"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<!-- market cross -->
|
||||
<CheckBox Name="warn" Grid.Column="0" FlowDirection="RightToLeft" IsChecked="{Binding show_warn_on_cross}">
|
||||
<CheckBox.Resources>
|
||||
<Style TargetType="{x:Type Path}">
|
||||
<Setter Property="FlowDirection" Value="LeftToRight"/>
|
||||
</Style>
|
||||
</CheckBox.Resources>
|
||||
<CheckBox Grid.Column="0" VerticalContentAlignment="Center" IsChecked="{Binding show_warn_on_cross}">
|
||||
<TextBlock
|
||||
Style="{StaticResource EnableDisableFeatureText}"
|
||||
IsEnabled="{Binding show_warn_on_cross}"
|
||||
Text="Warn on Market Cross"
|
||||
/>
|
||||
</CheckBox>
|
||||
<TextBlock Grid.Column="1"
|
||||
Style="{StaticResource EnableDisableFeatureText}"
|
||||
IsEnabled="{Binding ElementName=warn, Path=IsChecked}"
|
||||
Text="Warn on Market Cross" />
|
||||
<!-- max order qty -->
|
||||
<CheckBox Name="enforce_max_clip" Grid.Row="1" Grid.Column="0" FlowDirection="RightToLeft" IsChecked="{Binding enforce_max_clip}">
|
||||
<CheckBox.Resources>
|
||||
<Style TargetType="{x:Type Path}">
|
||||
<Setter Property="FlowDirection" Value="LeftToRight"/>
|
||||
</Style>
|
||||
</CheckBox.Resources>
|
||||
<CheckBox Grid.Row="2" Grid.Column="0" VerticalContentAlignment="Center" IsChecked="{Binding enforce_max_clip}">
|
||||
<TextBlock
|
||||
Style="{StaticResource EnableDisableFeatureText}"
|
||||
IsEnabled="{Binding enforce_max_clip}"
|
||||
Text="Max Order Quantity"
|
||||
/>
|
||||
</CheckBox>
|
||||
<TextBlock Grid.Row="1" Grid.Column="1"
|
||||
Style="{StaticResource EnableDisableFeatureText}"
|
||||
IsEnabled="{Binding ElementName=enforce_max_clip, Path=IsChecked}"
|
||||
MinWidth="{Binding ElementName=warn, Path=ActualWidth}"
|
||||
Text="Max Order Quantity"/>
|
||||
<c:TickUpDownUInt Grid.Row="1" Grid.Column="2"
|
||||
IsEnabled="{Binding ElementName=enforce_max_clip, Path=IsChecked}"
|
||||
Value="{Binding max_clip}" />
|
||||
<c:TickUpDownUInt
|
||||
Grid.Row="2"
|
||||
Grid.Column="2"
|
||||
IsEnabled="{Binding enforce_max_clip}"
|
||||
Value="{Binding max_clip}"
|
||||
Width="60"
|
||||
/>
|
||||
<CheckBox Grid.Row="4" VerticalContentAlignment="Center" IsChecked="{Binding enforce_max_settlement_cross_ticks}">
|
||||
<TextBlock
|
||||
Style="{StaticResource EnableDisableFeatureText}"
|
||||
IsEnabled="{Binding enforce_max_settlement_cross_ticks}"
|
||||
Text="Max Ticks from Settlement"
|
||||
/>
|
||||
</CheckBox>
|
||||
<c:TickUpDownInt Grid.Row="4" Grid.Column="2" IsEnabled="{Binding enforce_max_settlement_cross_ticks}" Value="{Binding max_settlement_cross_ticks}"/>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="Mini Order Book">
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
using ProtoBuf;
|
||||
using System;
|
||||
|
||||
namespace bts.proto {
|
||||
[ProtoContract]
|
||||
readonly struct ToggleInt32Proto : IEquatable<ToggleInt32Proto> {
|
||||
public ToggleInt32Proto(int value, bool is_enabled) {
|
||||
this.value = value;
|
||||
this.is_enabled = is_enabled;
|
||||
}
|
||||
|
||||
[ProtoMember(1)]
|
||||
public int value { get; }
|
||||
[ProtoMember(2)]
|
||||
public bool is_enabled { get; }
|
||||
|
||||
public bool Equals(ToggleInt32Proto other) =>
|
||||
value == other.value && is_enabled == other.is_enabled;
|
||||
|
||||
public override bool Equals(object obj) =>
|
||||
obj is ToggleInt32Proto other && Equals(other);
|
||||
|
||||
public override int GetHashCode() =>
|
||||
(value % (1 << 31)) | (is_enabled ? 1 << 31 : 0);
|
||||
|
||||
public static bool operator ==(ToggleInt32Proto a, ToggleInt32Proto b) => a.Equals(b);
|
||||
public static bool operator !=(ToggleInt32Proto a, ToggleInt32Proto b) => !a.Equals(b);
|
||||
}
|
||||
|
||||
static class ToggleInt32ProtoExtensions {
|
||||
public static int? as_nullable(this ToggleInt32Proto toggle) =>
|
||||
toggle.is_enabled ? toggle.value : (int?)null;
|
||||
}
|
||||
}
|
||||
@@ -124,8 +124,13 @@ private:
|
||||
const auto& sym = def.contractSymbol;
|
||||
// TODO : this is only exception right now but for HHD sstrips
|
||||
// def.contractSymbol is empty !
|
||||
if (sym.size() == 0 && def.marketDesc.rfind("NG Swing GDD Futures - Henry", 0) == 0)
|
||||
if (sym.size() == 0 &&
|
||||
(
|
||||
def.marketDesc.rfind("NG Swing GDD Futures - Henry", 0) == 0 ||
|
||||
def.marketDesc.rfind("NG GDD for LD1 Futures Spr - Henry", 0) == 0
|
||||
))
|
||||
return "HHD";
|
||||
|
||||
auto end = sym.find(' ');
|
||||
if(end == std::string::npos)
|
||||
return sym;
|
||||
|
||||
Reference in new issue
Block a user