TriggerOrderVM can represent non-uniform values
This commit is contained in:
1 parent
5a77bb31ce
commit
d4ed08c104
2 files changed
+78
-19
No files matched your search
@@ -409,9 +409,9 @@ namespace mbts.spark {
|
||||
return prop;
|
||||
}
|
||||
|
||||
protected Property<T> add_property<T>(string prop_name, int[] target_field_number_path, T init_value = default, bool validate_on_changed = false, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) {
|
||||
protected Property<T> add_property<T>(string prop_name, int[] target_field_number_path, T init_value = default, T non_uniform_value = default, bool validate_on_changed = false, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) {
|
||||
var prop = backing(prop_name, init_value);
|
||||
_on_property_added(prop_name, prop_name, DisplayNameHelper.snake_to_title_case(prop_name), target_field_number_path, prop, prop.set, validate_on_changed, permissions);
|
||||
_on_property_added(prop_name, prop_name, DisplayNameHelper.snake_to_title_case(prop_name), target_field_number_path, prop, prop.set, non_uniform_value, validate_on_changed, permissions);
|
||||
return prop;
|
||||
}
|
||||
|
||||
@@ -421,21 +421,39 @@ namespace mbts.spark {
|
||||
return prop;
|
||||
}
|
||||
|
||||
protected UserProperty<T?> add_nullable_user_property<T>(string prop_name, int target_field_number, T init_value = default, bool validate_on_changed = false) where T : struct {
|
||||
var prop = user_backing<T?>(prop_name, init_value);
|
||||
_on_nullable_property_added(prop_name, target_field_number, prop, prop.bypass_setter, validate_on_changed, AlgoParamPermissions.ReadWrite);
|
||||
return prop;
|
||||
}
|
||||
|
||||
protected UserProperty<T> add_user_property<T>(string prop_name, int target_field_number, OneofDescriptor oneof_descriptor, T init_value = default, bool validate_on_changed = false, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) where T : struct {
|
||||
var prop = user_backing(prop_name, init_value);
|
||||
_on_property_added(prop_name, target_field_number, oneof_descriptor, prop, prop.bypass_setter, validate_on_changed, permissions);
|
||||
return prop;
|
||||
}
|
||||
|
||||
protected UserProperty<T> add_user_property<T>(string prop_name, int[] target_field_number_path, T init_value = default, bool validate_on_changed = false, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) {
|
||||
protected UserProperty<T> add_user_property<T>(string prop_name, int[] target_field_number_path, T init_value = default, T non_uniform_value = default, bool validate_on_changed = false, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) {
|
||||
var prop = user_backing(prop_name, init_value);
|
||||
_on_property_added(prop_name, prop_name, DisplayNameHelper.snake_to_title_case(prop_name), target_field_number_path, prop, prop.bypass_setter, validate_on_changed, permissions);
|
||||
_on_property_added(prop_name, prop_name, DisplayNameHelper.snake_to_title_case(prop_name), target_field_number_path, prop, prop.bypass_setter, non_uniform_value, validate_on_changed, permissions);
|
||||
return prop;
|
||||
}
|
||||
|
||||
protected UserProperty<T> add_user_property<T>(string prop_name, string display_name, int[] target_field_number_path, T init_value = default, bool validate_on_changed = false) {
|
||||
protected UserProperty<T?> add_nullable_user_property<T>(string prop_name, int[] target_field_number_path, T init_value = default, bool validate_on_changed = false, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) where T : struct {
|
||||
var prop = user_backing<T?>(prop_name, init_value);
|
||||
_on_nullable_property_added(prop_name, prop_name, DisplayNameHelper.snake_to_title_case(prop_name), target_field_number_path, prop, prop.bypass_setter, validate_on_changed, permissions);
|
||||
return prop;
|
||||
}
|
||||
|
||||
protected UserProperty<T?> add_nullable_user_property<T>(string prop_name, string display_name, int[] target_field_number_path, T init_value = default, bool validate_on_changed = false, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) where T : struct {
|
||||
var prop = user_backing<T?>(prop_name, init_value);
|
||||
_on_nullable_property_added(prop_name, prop_name, display_name, target_field_number_path, prop, prop.bypass_setter, validate_on_changed, permissions);
|
||||
return prop;
|
||||
}
|
||||
|
||||
protected UserProperty<T> add_user_property<T>(string prop_name, string display_name, int[] target_field_number_path, T init_value = default, T non_uniform_value = default, bool validate_on_changed = false) {
|
||||
var prop = user_backing(prop_name, init_value);
|
||||
_on_property_added(prop_name, prop_name, display_name, target_field_number_path, prop, prop.bypass_setter, validate_on_changed);
|
||||
_on_property_added(prop_name, prop_name, display_name, target_field_number_path, prop, prop.bypass_setter, non_uniform_value, validate_on_changed);
|
||||
return prop;
|
||||
}
|
||||
|
||||
@@ -593,7 +611,7 @@ namespace mbts.spark {
|
||||
_link_props(param, prop, assign_to_prop, validate_on_changed)));
|
||||
}
|
||||
|
||||
void _on_property_added<T>(string id, string prop_name, string display_name, int[] target_field_number_path, IProperty<T> prop, Action<T> assign_to_prop, bool validate_on_changed, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) {
|
||||
void _on_property_added<T>(string id, string prop_name, string display_name, int[] target_field_number_path, IProperty<T> prop, Action<T> assign_to_prop, T non_uniform_value = default, bool validate_on_changed = false, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) {
|
||||
IMessage seed = new TMutable();
|
||||
var field_descs = Array.ConvertAll(target_field_number_path, n => {
|
||||
var fd = seed.Descriptor.FindFieldByNumber(n);
|
||||
@@ -620,7 +638,48 @@ namespace mbts.spark {
|
||||
}
|
||||
}, mval => assign_to_prop(get_from_def(mval)),
|
||||
mvals => {
|
||||
var distinct_val = mvals.Select(get_from_def).Distinct().SafeSingleOrDefault();
|
||||
var distinct_val = mvals.Select(get_from_def).Distinct().SafeSingleOrDefault(non_uniform_value);
|
||||
assign_to_prop(distinct_val);
|
||||
},
|
||||
_link_props(param, prop, assign_to_prop, validate_on_changed)));
|
||||
|
||||
T get_from_def(TMutable mval) {
|
||||
var v = mval as IMessage;
|
||||
for (int i = 0; i < field_descs.Length - 1 && v != null; i++)
|
||||
v = field_descs[i].Accessor.GetValue(v) as IMessage;
|
||||
return v == null ? default : ConvertUtils.try_convert<T>(field_descs[field_descs.Length - 1].Accessor.GetValue(v));
|
||||
}
|
||||
}
|
||||
|
||||
void _on_nullable_property_added<T>(string id, string prop_name, string display_name, int[] target_field_number_path, IProperty<T?> prop, Action<T?> assign_to_prop, bool validate_on_changed, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) where T : struct{
|
||||
IMessage seed = new TMutable();
|
||||
var field_descs = Array.ConvertAll(target_field_number_path, n => {
|
||||
var fd = seed.Descriptor.FindFieldByNumber(n);
|
||||
var next_type = ProtoHelper.get_field_type(fd);
|
||||
seed = Activator.CreateInstance(next_type) as IMessage;
|
||||
return fd;
|
||||
});
|
||||
var param = new AlgoParamVM<T?>(id, display_name, prop.Value) { permissions = permissions};
|
||||
_algo_params.Add(param);
|
||||
_auto_props.Add(new AutoProp(prop_name, mval => {
|
||||
if (mval != null) {
|
||||
IMessage src = mval;
|
||||
int i = 0;
|
||||
do {
|
||||
if (!(field_descs[i].Accessor.GetValue(src) is IMessage val)) {
|
||||
var type = ProtoHelper.get_field_type(field_descs[i]);
|
||||
val = Activator.CreateInstance(type) as IMessage;
|
||||
if (val == null) return;
|
||||
field_descs[i].Accessor.SetValue(src, val);
|
||||
}
|
||||
src = val;
|
||||
} while (++i < field_descs.Length - 1);
|
||||
if (prop.Value.HasValue)
|
||||
field_descs[field_descs.Length - 1].Accessor.SetValue(src, prop.Value.Value);
|
||||
}
|
||||
}, mval => assign_to_prop(get_from_def(mval)),
|
||||
mvals => {
|
||||
var distinct_val = mvals.Select(get_from_def).Distinct().TryGetSingle(out T dv) ? dv : (T?)null;
|
||||
assign_to_prop(distinct_val);
|
||||
},
|
||||
_link_props(param, prop, assign_to_prop, validate_on_changed)));
|
||||
|
||||
@@ -13,11 +13,11 @@ namespace mbts.spark {
|
||||
static partial class OrderTypeVMFactory {
|
||||
class TriggerOrderVM : OrderTypeVMBase<TriggerDef, TriggerDefi>, IObserver<SecurityMD?> {
|
||||
readonly UserProperty<PayupPriceType> _payup_price_type;
|
||||
readonly UserProperty<TriggerPriceType> _trigger_price_type;
|
||||
readonly UserProperty<TriggerPriceType?> _trigger_price_type;
|
||||
readonly UserProperty<OrderpriceOneofCase> _order_price_case;
|
||||
readonly UserProperty<double> _fixed_price;
|
||||
readonly UserProperty<int> _payup_ticks;
|
||||
readonly UserProperty<uint> _timeout_secs;
|
||||
readonly UserProperty<int?> _payup_ticks;
|
||||
readonly UserProperty<uint?> _timeout_secs;
|
||||
readonly UserProperty<bool> _is_timeout_checked, _is_priceout_checked;
|
||||
readonly Property<uint> _security_id;
|
||||
ulong _bbo_ref = 0, _last_trade_ref = 0;
|
||||
@@ -27,13 +27,13 @@ namespace mbts.spark {
|
||||
: base(key, display_name, editing_permissions) {
|
||||
// props
|
||||
/*hide*/ _order_price_case = add_user_property(nameof(order_price_case), TriggerDef.TriggerActionFieldNumber, ProtoHelper.get_oneof_descriptor<TriggerAction>(nameof(TriggerAction.OrderpriceCase)), OrderpriceOneofCase.Payup, true, AlgoParamPermissions.None);
|
||||
/*hide*/ _fixed_price = add_user_property(nameof(fixed_price), new[] { TriggerDef.TriggerActionFieldNumber, TriggerAction.PriceFieldNumber }, double.NaN, true, AlgoParamPermissions.None);
|
||||
_trigger_price_type = add_user_property("price_type", new[] { TriggerDef.TriggerConditionFieldNumber, TriggerCondition.PriceTypeFieldNumber }, TriggerPriceType.Bid);
|
||||
_payup_ticks = add_user_property("payup_price", new[] { TriggerDef.TriggerActionFieldNumber, TriggerAction.PayupFieldNumber, TriggerPayupPrice.PayupTicksFieldNumber }, 0);
|
||||
/*hide*/ _payup_price_type = add_user_property(nameof(payup_price_type), new[] { TriggerDef.TriggerActionFieldNumber, TriggerAction.PayupFieldNumber, TriggerPayupPrice.PayupPriceTypeFieldNumber }, PayupPriceType.Trigger, true, AlgoParamPermissions.None);
|
||||
/*hide*/ _fixed_price = add_user_property(nameof(fixed_price), new[] { TriggerDef.TriggerActionFieldNumber, TriggerAction.PriceFieldNumber }, double.NaN, double.NaN, true, AlgoParamPermissions.None);
|
||||
_trigger_price_type = add_nullable_user_property("price_type", new[] { TriggerDef.TriggerConditionFieldNumber, TriggerCondition.PriceTypeFieldNumber }, TriggerPriceType.Bid);
|
||||
_payup_ticks = add_nullable_user_property("payup_price", new[] { TriggerDef.TriggerActionFieldNumber, TriggerAction.PayupFieldNumber, TriggerPayupPrice.PayupTicksFieldNumber }, 0);
|
||||
/*hide*/ _payup_price_type = add_user_property(nameof(payup_price_type), new[] { TriggerDef.TriggerActionFieldNumber, TriggerAction.PayupFieldNumber, TriggerPayupPrice.PayupPriceTypeFieldNumber }, PayupPriceType.Trigger, validate_on_changed: true, permissions: AlgoParamPermissions.None);
|
||||
_is_priceout_checked = add_user_property(nameof(is_priceout_checked), "Priceout Enabled", new[] { TriggerDef.ExitConditionFieldNumber, TriggerExitCondition.ConditionalCancelFieldNumber }, false, true);
|
||||
_is_timeout_checked = add_user_property(nameof(is_timeout_checked), "Timeout Enabled", new[] { TriggerDef.ExitConditionFieldNumber, TriggerExitCondition.TimeoutEnabledFieldNumber }, false, true);
|
||||
_timeout_secs = add_user_property(nameof(timeout_secs), "Timeout (secs)", new[] { TriggerDef.ExitConditionFieldNumber, TriggerExitCondition.TimeoutSecondsFieldNumber }, 10u, true);
|
||||
_timeout_secs = add_nullable_user_property(nameof(timeout_secs), "Timeout (secs)", new[] { TriggerDef.ExitConditionFieldNumber, TriggerExitCondition.TimeoutSecondsFieldNumber }, 10u, true);
|
||||
/*hide*/ _security_id = add_property<uint>(nameof(TriggerDef.TriggerAction.SecurityId), new[] { TriggerDef.TriggerActionFieldNumber, TriggerAction.SecurityIdFieldNumber }, permissions: AlgoParamPermissions.None);
|
||||
link_enabled(nameof(is_timeout_checked), nameof(timeout_secs));
|
||||
validate();
|
||||
@@ -41,18 +41,18 @@ namespace mbts.spark {
|
||||
|
||||
/// trigger price
|
||||
public IEnumerable<TriggerPriceType> trigger_price_types => EnumHelper.get_values_except(TriggerPriceType.LastTradePrice);
|
||||
public TriggerPriceType trigger_price_type { get => _trigger_price_type.Value; set => _trigger_price_type.Value = value; }
|
||||
public TriggerPriceType? trigger_price_type { get => _trigger_price_type.Value; set => _trigger_price_type.Value = value; }
|
||||
public OrderpriceOneofCase order_price_case { get => _order_price_case.Value; set => _order_price_case.Value = value; }
|
||||
// fixed
|
||||
public double fixed_price { get => _fixed_price.Value; set => _fixed_price.Value = value; }
|
||||
// payup
|
||||
public IEnumerable<PayupPriceType> payup_price_types => new[] { PayupPriceType.Trigger };
|
||||
public PayupPriceType payup_price_type { get => _payup_price_type.Value; set => _payup_price_type.Value = value; }
|
||||
public int payup_ticks { get => _payup_ticks.Value; set => _payup_ticks.Value = value; }
|
||||
public int? payup_ticks { get => _payup_ticks.Value; set => _payup_ticks.Value = value; }
|
||||
/// exit
|
||||
public bool is_priceout_checked { get => _is_priceout_checked.Value; set => _is_priceout_checked.Value = value; }
|
||||
public bool is_timeout_checked { get => _is_timeout_checked.Value; set => _is_timeout_checked.Value = value; }
|
||||
public uint timeout_secs { get => _timeout_secs.Value; set => _timeout_secs.Value = value; }
|
||||
public uint? timeout_secs { get => _timeout_secs.Value; set => _timeout_secs.Value = value; }
|
||||
|
||||
protected override void on_security_md_internal() {
|
||||
if (security.HasValue) {
|
||||
|
||||
Reference in new issue
Block a user