Compare commits
30
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
661ccf80fc | ||
|
|
36212a8cf7 | ||
|
|
d8683151fe | ||
|
|
32b7b7f40d | ||
|
|
e7da6dd79e | ||
|
|
8bf78aa880 | ||
|
|
1c44165181 | ||
|
|
8165ec0e3d | ||
|
|
7d1ec5b82a | ||
|
|
02e7fb1ee0 | ||
|
|
c0ea6943e1 | ||
|
|
4c914a2d48 | ||
|
|
0ee86f2dd4 | ||
|
|
00bf3c7f47 | ||
|
|
60d4dd87fd | ||
|
|
3a7eeda70e | ||
|
|
712146e028 | ||
|
|
17b314ea3a | ||
|
|
e713210030 | ||
|
|
c057bf18f6 | ||
|
|
17a0bef824 | ||
|
|
9180c48b67 | ||
|
|
01acbe08f5 | ||
|
|
8a47cd4821 | ||
|
|
03050d9b07 | ||
|
|
9178878880 | ||
|
|
f38b1c7af9 | ||
|
|
45cd958b1e | ||
|
|
4d49c8f030 | ||
|
|
b2227ce37b |
No files matched your search
@@ -34,5 +34,6 @@ trace_data/
|
||||
/doc/user/public/*
|
||||
.ionide/*
|
||||
/.ignore
|
||||
*.rej
|
||||
/build
|
||||
.clangd/
|
||||
@@ -0,0 +1,193 @@
|
||||
using bts;
|
||||
using bts.api;
|
||||
using bts.api.core;
|
||||
using mbts.ui.utility;
|
||||
using mbts.utils;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.ComponentModel.Composition;
|
||||
using System.Linq;
|
||||
using System.Reactive.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase;
|
||||
|
||||
namespace mbts.spark {
|
||||
class AlgoProviderFactory {
|
||||
[ImportingConstructor]
|
||||
AlgoProviderFactory(IAlgoStudioModel studio_model, DynamicOrderHelper dynamic_helper, ISecurityAuxiliaryDataModel security_auxiliary_model) {
|
||||
var from_conf = config.Configuration.get<bts.config.AlgoTypeRuleSet>();
|
||||
if (from_conf.rules.Count == 0) {
|
||||
// There seems to be a config race bug, where the returned config values are empty, despite having entries in spark.conf.
|
||||
// [John]I've only noticed it happen when attached to the debugger,
|
||||
// but best to have a contingency plan in place anyways, to prevent any chance of regression.
|
||||
// The fallback sets below mimic the old hardcoded algo type arrays.
|
||||
var full_algo_set = new AlgoTypeSetImmutable(
|
||||
ImmutableHashSet.CreateRange(EnumHelper.get_values_except(
|
||||
// non-factory algos
|
||||
AlgoType.None,
|
||||
AlgoType.Dynamic,
|
||||
AlgoType.Composite,
|
||||
// obsolete algos
|
||||
AlgoType.Oco,
|
||||
AlgoType.TimeBox,
|
||||
AlgoType.Pricer,
|
||||
AlgoType.Tick,
|
||||
AlgoType.Trigger,
|
||||
AlgoType.QueueHolder)),
|
||||
ImmutableHashSet.CreateRange(dynamic_helper.dynamic_types));
|
||||
var rules = new[] {
|
||||
// Glbx: Futures/Spreads
|
||||
new SecurityAlgoTypeSetImmutable(
|
||||
new SecurityCriteriaClause(
|
||||
exchanges: new[] { Venue.Glbx },
|
||||
security_types: new[] { SecurityType.Future, SecurityType.Spread }),
|
||||
new AlgoTypeSetImmutable(
|
||||
full_algo_set.factory_types.Except(new[] { AlgoType.Spreader }),
|
||||
full_algo_set.dynamic_types)),
|
||||
// Gen: Futures/Spreads
|
||||
new SecurityAlgoTypeSetImmutable(
|
||||
new SecurityCriteriaClause(
|
||||
exchanges: EnumHelper.get_values_except(Venue.Glbx, Venue.Unset).ToArray(),
|
||||
security_types: new[] { SecurityType.Future, SecurityType.Spread }),
|
||||
new AlgoTypeSetImmutable(
|
||||
full_algo_set.factory_types.Except(new[] { AlgoType.Spreader, AlgoType.GlbxIceberg }),
|
||||
full_algo_set.dynamic_types)),
|
||||
// Gen: Synthetics
|
||||
new SecurityAlgoTypeSetImmutable(
|
||||
new SecurityCriteriaClause(
|
||||
security_types: new[] { SecurityType.Synthetic }),
|
||||
new AlgoTypeSetImmutable(
|
||||
ImmutableHashSet.CreateRange(new[] {
|
||||
AlgoType.Spreader,
|
||||
AlgoType.Iceberg,
|
||||
AlgoType.Lean,
|
||||
AlgoType.Join,
|
||||
AlgoType.Cover,
|
||||
AlgoType.Offset,
|
||||
AlgoType.Top,
|
||||
AlgoType.Splitter,
|
||||
AlgoType.Scratch,
|
||||
AlgoType.Prorata
|
||||
}),
|
||||
full_algo_set.dynamic_types))
|
||||
};
|
||||
// attachable
|
||||
var attachable_algos =
|
||||
ImmutableHashSet.CreateRange(new[] {
|
||||
AlgoType.Iceberg,
|
||||
AlgoType.Lean,
|
||||
AlgoType.Join,
|
||||
AlgoType.Cover,
|
||||
AlgoType.Top,
|
||||
AlgoType.Offset,
|
||||
AlgoType.Scratch,
|
||||
AlgoType.Prorata
|
||||
});
|
||||
var attachable_rules = Array.ConvertAll(rules,
|
||||
satsi => new SecurityAlgoTypeSetImmutable(
|
||||
satsi.security_criteria,
|
||||
new AlgoTypeSetImmutable(
|
||||
satsi.algo_type_set.factory_types.Intersect(attachable_algos),
|
||||
satsi.algo_type_set.dynamic_types)));
|
||||
|
||||
Log.Config.warn($"Failed to load AlgoTypes config, falling back to the following algo set rules:" +
|
||||
"\n\tStandard\n" +
|
||||
rules.fmt_diagnostic("\n\t\t") +
|
||||
"\n\n\tAttachable\n" +
|
||||
attachable_rules.fmt_diagnostic("\n\t\t"));
|
||||
|
||||
security_algo_provider = new AlgoProvider(rules, studio_model, dynamic_helper, security_auxiliary_model);
|
||||
attachable_algo_provider = new AttachableAlgoProvider(attachable_rules, studio_model, dynamic_helper, security_auxiliary_model);
|
||||
} else {
|
||||
var algo_type_data =
|
||||
EnumHelper.get_values_except(AlgoType.Dynamic, AlgoType.Composite, AlgoType.None)
|
||||
.Select(t => _get_type_data(t))
|
||||
.Concat(dynamic_helper.dynamic_types.Select(dt => _get_type_data(AlgoType.Dynamic, dt)))
|
||||
.ToListLazy();
|
||||
var conf_sets = from_conf.rules.Select(r => _to_security_algo_set(r, dynamic_helper, algo_type_data)).ToList();
|
||||
security_algo_provider = new AlgoProvider(conf_sets.Select(tup => tup.standard).ToList(), studio_model, dynamic_helper, security_auxiliary_model);
|
||||
attachable_algo_provider = new AttachableAlgoProvider(conf_sets.Select(tup => tup.attachable).ToList(), studio_model, dynamic_helper, security_auxiliary_model);
|
||||
}
|
||||
}
|
||||
|
||||
[Export]
|
||||
public IAlgoProvider security_algo_provider { get; }
|
||||
[Export]
|
||||
public IAttachableAlgoProvider attachable_algo_provider { get; }
|
||||
|
||||
static (string name, AlgoType factory, string dynamic) _get_type_data(AlgoType type, string dynamic_type = null) {
|
||||
string type_name = type.ToString();
|
||||
return (type_name, type, dynamic_type ?? type_name);
|
||||
}
|
||||
|
||||
static SecurityCriteriaClause _to_clause(bts.config.AlgoTypeContext context) =>
|
||||
context == null ?
|
||||
new SecurityCriteriaClause() :
|
||||
new SecurityCriteriaClause(
|
||||
exchanges: context.exchanges?.Select(EnumHelper.parse<Venue>)?.ToArray(),
|
||||
security_types: context.security_types?.Select(EnumHelper.parse<Security.ContractOneofCase>)?.Select(t => t.security_type())?.ToArray(),
|
||||
symbols: context.symbols?.ToArray());
|
||||
|
||||
static (SecurityAlgoTypeSetImmutable standard, SecurityAlgoTypeSetImmutable attachable) _to_security_algo_set(
|
||||
bts.config.AlgoTypeRule rule,
|
||||
DynamicOrderHelper dynamic_helper,
|
||||
IEnumerable<(string name, AlgoType factory, string dynamic)> algo_type_data) {
|
||||
//
|
||||
var factory_types = ImmutableHashSet<AlgoType>.Empty.ToBuilder();
|
||||
var dynamic_types = ImmutableHashSet<string>.Empty.ToBuilder();
|
||||
var attachable_factory_types = ImmutableHashSet<AlgoType>.Empty.ToBuilder();
|
||||
var attachable_dynamic_types = ImmutableHashSet<string>.Empty.ToBuilder();
|
||||
foreach (var a in rule.algos) {
|
||||
if (Enum.TryParse(a.name, out AlgoType sys_algo) && sys_algo != AlgoType.Composite && sys_algo != AlgoType.Dynamic) {
|
||||
on_sys_match(sys_algo, a.is_attachable);
|
||||
}
|
||||
else if (dynamic_helper.try_parse(a.name, out var dyn_type)) {
|
||||
on_dyn_match(dyn_type, a.is_attachable);
|
||||
} else {
|
||||
foreach (var (name, factory, dynamic) in algo_type_data) {
|
||||
if (Regex.Match(name, a.name).Success) {
|
||||
switch (factory) {
|
||||
case AlgoType.None:
|
||||
case AlgoType.Composite:
|
||||
// unexpected, but no need to crash
|
||||
continue;
|
||||
case AlgoType.Dynamic:
|
||||
on_dyn_match(dynamic, a.is_attachable);
|
||||
break;
|
||||
default:
|
||||
on_sys_match(factory, a.is_attachable);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return (
|
||||
// standard
|
||||
new SecurityAlgoTypeSetImmutable(
|
||||
_to_clause(rule.context),
|
||||
new AlgoTypeSetImmutable(
|
||||
factory_types.ToImmutable(),
|
||||
dynamic_types.ToImmutable())),
|
||||
// attachable
|
||||
new SecurityAlgoTypeSetImmutable(
|
||||
_to_clause(rule.context),
|
||||
new AlgoTypeSetImmutable(
|
||||
attachable_factory_types.ToImmutable(),
|
||||
attachable_dynamic_types.ToImmutable())));
|
||||
|
||||
// local methods
|
||||
void on_sys_match(AlgoType sys_algo, bool is_attachable) {
|
||||
factory_types.Add(sys_algo);
|
||||
if (is_attachable)
|
||||
attachable_factory_types.Add(sys_algo);
|
||||
}
|
||||
void on_dyn_match(string dyn_algo, bool is_attachable) {
|
||||
dynamic_types.Add(dyn_algo);
|
||||
if (is_attachable)
|
||||
attachable_dynamic_types.Add(dyn_algo);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
using bts.api.core;
|
||||
using bts.api.orderman;
|
||||
using mbts.spark.utilities;
|
||||
using mbts.utils;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.Linq;
|
||||
using System.Reactive.Linq;
|
||||
using System.Text;
|
||||
using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase;
|
||||
|
||||
namespace mbts.spark {
|
||||
readonly struct AlgoTypeSetImmutable {
|
||||
public static readonly AlgoTypeSetImmutable empty = new AlgoTypeSetImmutable(ImmutableHashSet<AlgoType>.Empty, ImmutableHashSet<string>.Empty);
|
||||
public readonly ImmutableHashSet<AlgoType> factory_types;
|
||||
public readonly ImmutableHashSet<string> dynamic_types;
|
||||
|
||||
public AlgoTypeSetImmutable(
|
||||
ImmutableHashSet<AlgoType> factory_types,
|
||||
ImmutableHashSet<string> dynamic_types) {
|
||||
this.factory_types = factory_types;
|
||||
this.dynamic_types = dynamic_types;
|
||||
}
|
||||
}
|
||||
|
||||
readonly struct SecurityAlgoTypeSetImmutable {
|
||||
public readonly SecurityCriteriaClause security_criteria;
|
||||
public readonly AlgoTypeSetImmutable algo_type_set;
|
||||
|
||||
public SecurityAlgoTypeSetImmutable(SecurityCriteriaClause security_criteria, AlgoTypeSetImmutable algo_type_set, CustomOrderDefinitionImmutable? default_algo = null) {
|
||||
this.security_criteria = security_criteria;
|
||||
this.algo_type_set = algo_type_set;
|
||||
}
|
||||
}
|
||||
|
||||
static class AlgoTypeSetExtensions {
|
||||
public static string fmt_diagnostic(this IEnumerable<SecurityAlgoTypeSetImmutable> rules, string line_delim = "\n") {
|
||||
var sb = new StringBuilder();
|
||||
int rule_count = 1;
|
||||
using (var en = rules.GetEnumerator()) {
|
||||
if (en.MoveNext()) {
|
||||
string line_delim_tab1 = line_delim + "\t";
|
||||
string line_delim_tab2 = line_delim + "\t\t";
|
||||
append_rule(en.Current);
|
||||
while (en.MoveNext()) {
|
||||
sb.AppendLine();
|
||||
append_rule(en.Current);
|
||||
}
|
||||
//
|
||||
void append_rule(SecurityAlgoTypeSetImmutable r) {
|
||||
sb.Append(line_delim + $"**RULE {rule_count++}**");
|
||||
sb.Append(line_delim_tab1);
|
||||
sb.Append("Security Criteria: ");
|
||||
sb.Append(r.security_criteria.is_defined ? string.Join("; ", r.security_criteria.fmt_diagnostic_msgs()) : "(Undefined)");
|
||||
sb.Append(line_delim_tab1);
|
||||
// Factory
|
||||
sb.Append("Factory Types:");
|
||||
sb.Append(line_delim_tab2);
|
||||
sb.Append(string.Join(line_delim_tab2, r.algo_type_set.factory_types));
|
||||
sb.Append(line_delim_tab1);
|
||||
// Dynamic
|
||||
sb.Append("Dynamic Types:");
|
||||
sb.Append(line_delim_tab2);
|
||||
sb.Append(string.Join(line_delim_tab2, r.algo_type_set.dynamic_types));
|
||||
}
|
||||
}
|
||||
}
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
public static AlgoTypeSetImmutable intersect_with(this AlgoTypeSetImmutable a, AlgoTypeSetImmutable b) =>
|
||||
new AlgoTypeSetImmutable(a.factory_types.Intersect(b.factory_types), a.dynamic_types.Intersect(b.dynamic_types));
|
||||
|
||||
public static AlgoTypeSetImmutable union_with(this AlgoTypeSetImmutable a, AlgoTypeSetImmutable b) =>
|
||||
new AlgoTypeSetImmutable(a.factory_types.Union(b.factory_types), a.dynamic_types.Union(b.dynamic_types));
|
||||
|
||||
public static IEnumerable<AlgoData> define_algos(
|
||||
this AlgoTypeSetImmutable algo_set,
|
||||
DynamicOrderHelper dynamic_helper,
|
||||
Func<CustomOrderDefinitionImmutable, CustomOrderDefinitionImmutable> fit_to_type = null,
|
||||
uint display_qty_divisor = 1) =>
|
||||
//
|
||||
algo_set.factory_types
|
||||
.Select(algo_type => {
|
||||
var def = OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(algo_type);
|
||||
if (fit_to_type != null)
|
||||
def = fit_to_type(def);
|
||||
// multiply quantity props by display qty divisor to get appropriate actual value
|
||||
if (display_qty_divisor > 1) {
|
||||
switch (def.CustomCase) {
|
||||
case AlgoType.Iceberg:
|
||||
var mdef = def.CloneToMutable();
|
||||
mdef.Iceberg.ShowQuantity *= display_qty_divisor;
|
||||
def = new CustomOrderDefinitionImmutable(mdef);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return def;
|
||||
})
|
||||
.Concat(algo_set.dynamic_types.Select(dynamic_helper.create_custom_defi))
|
||||
.Select(AlgoData.from_custom_def);
|
||||
|
||||
public static ImmutableDictionary<AlgoKey, AlgoData> match_algos(
|
||||
this IEnumerable<SecurityAlgoTypeSetImmutable> security_algo_sets,
|
||||
SecurityCriteriaClause clause,
|
||||
DynamicOrderHelper dynamic_helper,
|
||||
Func<CustomOrderDefinitionImmutable, CustomOrderDefinitionImmutable> fit_to_type = null,
|
||||
uint display_qty_divisor = 1) {
|
||||
//
|
||||
ImmutableDictionary<AlgoKey, AlgoData> rv = null;
|
||||
foreach (var set in security_algo_sets) {
|
||||
if (!clause.is_subset_of(set.security_criteria)) {
|
||||
continue;
|
||||
} else if (rv == null) {
|
||||
rv = ImmutableDictionary.CreateRange(
|
||||
set.algo_type_set.define_algos(dynamic_helper, fit_to_type, display_qty_divisor)
|
||||
.Select(a => new KeyValuePair<AlgoKey, AlgoData>(a.key, a)));
|
||||
} else {
|
||||
foreach (var kv in rv) {
|
||||
if (kv.Value.value.CustomCase == AlgoType.Dynamic) {
|
||||
if (!set.algo_type_set.dynamic_types.Contains(kv.Value.value.Dynamic.DynamicOrderType))
|
||||
rv = rv.Remove(kv.Key);
|
||||
} else if (!set.algo_type_set.factory_types.Contains(kv.Value.value.CustomCase))
|
||||
rv = rv.Remove(kv.Key);
|
||||
}
|
||||
}
|
||||
}
|
||||
return rv ?? ImmutableDictionary<AlgoKey, AlgoData>.Empty;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
using bts.api;
|
||||
using bts.api.core;
|
||||
using bts.api.orderman;
|
||||
using bts.utils;
|
||||
using mbts.spark.utilities;
|
||||
using mbts.ui.utility;
|
||||
using mbts.utils;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.Linq;
|
||||
using System.Reactive.Linq;
|
||||
|
||||
namespace mbts.spark {
|
||||
interface IAlgoProvider {
|
||||
AlgoTypeSetImmutable get_permitted_algos(SecurityImmutable security);
|
||||
AlgoTypeSetImmutable get_permitted_algos(SecurityCriteriaClause clause);
|
||||
IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos();
|
||||
IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos(SecurityImmutable security);
|
||||
IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos(SecurityCriteriaClause clause);
|
||||
}
|
||||
|
||||
// This interface is used to distinguish the attachable algo provider
|
||||
// from the standard one wrt MEF export/import.
|
||||
interface IAttachableAlgoProvider : IAlgoProvider { }
|
||||
|
||||
class AlgoProvider : IAlgoProvider {
|
||||
readonly IEnumerable<SecurityAlgoTypeSetImmutable> _security_algo_types;
|
||||
readonly IAlgoStudioModel _studio_model;
|
||||
readonly ISecurityAuxiliaryDataModel _security_auxiliary_model;
|
||||
readonly IObservable<TableUpdate<AlgoData, AlgoKey>> _studio_algos_source;
|
||||
readonly DynamicOrderHelper _dynamic_helper;
|
||||
readonly AlgoTypeSetImmutable _full_set;
|
||||
|
||||
public AlgoProvider(IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets, IAlgoStudioModel studio_model, DynamicOrderHelper dynamic_helper, ISecurityAuxiliaryDataModel security_auxiliary_model) {
|
||||
_security_algo_types = algo_sets;
|
||||
_studio_model = studio_model;
|
||||
_dynamic_helper = dynamic_helper;
|
||||
_full_set = new AlgoTypeSetImmutable(
|
||||
ImmutableHashSet.CreateRange(
|
||||
EnumHelper.get_values_except(CustomOrderDefinition.CustomOneofCase.None, CustomOrderDefinition.CustomOneofCase.Dynamic, CustomOrderDefinition.CustomOneofCase.Composite)),
|
||||
ImmutableHashSet.CreateRange(dynamic_helper.dynamic_types));
|
||||
_security_auxiliary_model = security_auxiliary_model;
|
||||
/// initialize <see cref="_studio_algos_source"/> with an empty table, so the
|
||||
/// <see cref="UpdateExtensions.AppendTable{T, TKey}(IObservable{TableUpdate{T, TKey}}, IEnumerable{T})"/>
|
||||
/// calls made by the 'subscribe_algos' methods will fire at least once, even if the underlying
|
||||
/// studio algos stream is empty have been created (this would be the case if the user had not yet created any studio algos).
|
||||
/// <see cref="subscribe_algos"/>,
|
||||
/// <see cref="subscribe_algos(SecurityCriteriaClause)"/>,
|
||||
/// <see cref="subscribe_algos(SecurityImmutable)"/>
|
||||
_studio_algos_source = studio_model.definitions
|
||||
.StartWith(TableUpdate<AlgoData, AlgoKey>.mk_empty(AlgoData.key_fn))
|
||||
.Cache();
|
||||
}
|
||||
|
||||
public AlgoTypeSetImmutable get_permitted_algos(SecurityImmutable security) =>
|
||||
_security_algo_types.Where(p => p.security_criteria.includes(security))
|
||||
.Select(sec_algos => sec_algos.algo_type_set)
|
||||
.Aggregate(_full_set, (result, algos) => result.intersect_with(algos));
|
||||
|
||||
public AlgoTypeSetImmutable get_permitted_algos(SecurityCriteriaClause clause) =>
|
||||
_security_algo_types.Where(p => p.security_criteria.is_subset_of(clause))
|
||||
.Select(sec_algos => sec_algos.algo_type_set)
|
||||
.Aggregate(_full_set, (result, algos) => result.intersect_with(algos));
|
||||
|
||||
public IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos() =>
|
||||
_studio_algos_source
|
||||
.AppendTable(_security_algo_types
|
||||
.Select(s => s.algo_type_set)
|
||||
.Aggregate(AlgoTypeSetImmutable.empty, (a, b) => a.union_with(b))
|
||||
.define_algos(_dynamic_helper));
|
||||
|
||||
public IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos(SecurityCriteriaClause security_clause) {
|
||||
var system_algos = _security_algo_types.match_algos(
|
||||
security_clause,
|
||||
_dynamic_helper,
|
||||
def => _fit_to_type(def, security_clause, _security_algo_types));
|
||||
|
||||
return _studio_algos_source.Select(
|
||||
a => (algo: a, fitted_def: _fit_to_type(a.value, security_clause, _security_algo_types)),
|
||||
tup => tup.algo.key)
|
||||
.Select(tup => AlgoData.create(tup.fitted_def, tup.algo.name, tup.algo.key), a => a.key)
|
||||
.AppendTable(system_algos.Values);
|
||||
}
|
||||
|
||||
public IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos(SecurityImmutable security) {
|
||||
var clause = new SecurityCriteriaClause(
|
||||
exchanges: new[] { security.Exchange },
|
||||
security_types: new[] { security.security_type() });
|
||||
// i.e., non-studio algos
|
||||
var system_algos = _security_algo_types.match_algos(
|
||||
clause,
|
||||
_dynamic_helper,
|
||||
def => _fit_to_type(def, security, _security_algo_types),
|
||||
_security_auxiliary_model.get_display_quantity_divisor(security));
|
||||
|
||||
return _studio_algos_source.Select(
|
||||
a => (algo: a, fitted_def: _fit_to_type(a.value, security, _security_algo_types)),
|
||||
tup => tup.algo.key)
|
||||
// filter out algos that use an unsupported root, because this would have the effect of duplicating the default algo
|
||||
// (e.g., GlbxIceberg orders would be converted to Limit/Spreader orders for non-Glbx securities).
|
||||
.Filter(tup => tup.fitted_def.actual().CustomCase == tup.algo.value.actual().CustomCase, tup => tup.algo.key)
|
||||
.Select(tup => AlgoData.create(tup.fitted_def, tup.algo.name, tup.algo.key), AlgoData.key_fn)
|
||||
.AppendTable(system_algos.Values);
|
||||
}
|
||||
|
||||
protected virtual void assign_fallback_algo(CustomOrderDefinition mdef, SecurityCriteriaClause security_clause) {
|
||||
if (security_clause.security_types.empty_if_null().Contains(Security.ContractOneofCase.Synthetic.security_type())) {
|
||||
mdef.Spreader = new SpreaderOrderDefinition();
|
||||
} else {
|
||||
mdef.Limit = new LimitOrderDefinition();
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void assign_fallback_algo(CustomOrderDefinition mdef, SecurityImmutable security) {
|
||||
if (security.ContractCase == Security.ContractOneofCase.Synthetic) {
|
||||
mdef.Spreader = new SpreaderOrderDefinition {
|
||||
Security = security.CloneToMutable()
|
||||
};
|
||||
} else {
|
||||
mdef.Limit = new LimitOrderDefinition();
|
||||
}
|
||||
}
|
||||
|
||||
CustomOrderDefinitionImmutable _fit_to_type(CustomOrderDefinitionImmutable defi, SecurityCriteriaClause security_clause, IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets) {
|
||||
var mroot = defi.CloneToMutable();
|
||||
if (_fit_to_type(mroot, security_clause, algo_sets)) {
|
||||
defi = new CustomOrderDefinitionImmutable(mroot);
|
||||
}
|
||||
return defi;
|
||||
}
|
||||
|
||||
CustomOrderDefinitionImmutable _fit_to_type(CustomOrderDefinitionImmutable defi, SecurityImmutable security, IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets) {
|
||||
var mroot = defi.CloneToMutable();
|
||||
if (_fit_to_type(mroot, security, algo_sets)) {
|
||||
defi = new CustomOrderDefinitionImmutable(mroot);
|
||||
}
|
||||
return defi;
|
||||
}
|
||||
|
||||
bool _fit_to_type(CustomOrderDefinition mdef, SecurityCriteriaClause security_clause, IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets) {
|
||||
while (mdef.CustomCase == CustomOrderDefinition.CustomOneofCase.Composite)
|
||||
mdef = mdef.Composite.Definition;
|
||||
var sec_sets = algo_sets.Where(s => security_clause.is_subset_of(s.security_criteria));
|
||||
if (mdef.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) {
|
||||
if (!algo_sets.All(s => s.algo_type_set.dynamic_types.Contains(mdef.Dynamic.DynamicOrderType))) {
|
||||
assign_fallback_algo(mdef, security_clause);
|
||||
return true;
|
||||
}
|
||||
} else if (!sec_sets.All(s => s.algo_type_set.factory_types.Contains(mdef.CustomCase))) {
|
||||
assign_fallback_algo(mdef, security_clause);
|
||||
return true;
|
||||
}
|
||||
return OrderDataHelper.get_child_algo_data(mdef).Count(cad => _fit_to_type(cad.get_child(mdef), security_clause, algo_sets)) > 0;
|
||||
}
|
||||
|
||||
bool _fit_to_type(CustomOrderDefinition mdef, SecurityImmutable security, IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets) {
|
||||
while (mdef.CustomCase == CustomOrderDefinition.CustomOneofCase.Composite)
|
||||
mdef = mdef.Composite.Definition;
|
||||
var sec_sets = algo_sets.Where(s => s.security_criteria.includes(security));
|
||||
if (mdef.CustomCase == CustomOrderDefinition.CustomOneofCase.Dynamic) {
|
||||
if (!sec_sets.All(s => s.algo_type_set.dynamic_types.Contains(mdef.Dynamic.DynamicOrderType))) {
|
||||
assign_fallback_algo(mdef, security);
|
||||
return true;
|
||||
}
|
||||
} else if (!sec_sets.All(s => s.algo_type_set.factory_types.Contains(mdef.CustomCase))) {
|
||||
assign_fallback_algo(mdef, security);
|
||||
return true;
|
||||
}
|
||||
return OrderDataHelper.get_child_algo_data(mdef).Count(cad => _fit_to_type(cad.get_child(mdef), security, algo_sets)) > 0;
|
||||
}
|
||||
}
|
||||
|
||||
class AttachableAlgoProvider : AlgoProvider, IAttachableAlgoProvider {
|
||||
public AttachableAlgoProvider(IEnumerable<SecurityAlgoTypeSetImmutable> algo_sets, IAlgoStudioModel studio_model, DynamicOrderHelper dynamic_helper, ISecurityAuxiliaryDataModel security_auxiliary_model)
|
||||
: base(algo_sets, studio_model, dynamic_helper, security_auxiliary_model) { }
|
||||
|
||||
// arbitrarily assign LimitOrderDefinition (this is just a placeholder; the real child is the attach target algo).
|
||||
// Note: although 'None' might seem approrpriate, the server requires a valid definition (perhaps this will change in the future).
|
||||
protected override void assign_fallback_algo(CustomOrderDefinition mdef, SecurityCriteriaClause security_clause) =>
|
||||
mdef.Limit = new LimitOrderDefinition();
|
||||
|
||||
// arbitrarily assign LimitOrderDefinition (this is just a placeholder; the real child is the attach target algo).
|
||||
// Note: although 'None' might seem approrpriate, the server requires a valid definition (perhaps this will change in the future).
|
||||
protected override void assign_fallback_algo(CustomOrderDefinition mdef, SecurityImmutable security) =>
|
||||
mdef.Limit = new LimitOrderDefinition();
|
||||
}
|
||||
|
||||
static class AlgoProviderExtensions {
|
||||
// This stream filters out composite algos that are not subsets of the non-composite algo types in the table
|
||||
// (normally, such composites are 'auto-fit,' meaning the algo nodes that are not part of the set are replaced with ones that are).
|
||||
// For example, consider a composite algo the following structure: Offset -> GlbxIceberg.
|
||||
// If an update arrives with these noncomposite types: "Iceberg, Limit, Market," that composite algo is not a subset of the non-composite algo types,
|
||||
// because GlbxIceberg is not in the table, so it would only be added to the table if/when GlbxIceberg arrives.
|
||||
public static IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_complete_algos(this IAlgoProvider algo_provider) =>
|
||||
subscribe_complete_algos(algo_provider.subscribe_algos());
|
||||
|
||||
public static IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_complete_algos(IObservable<TableUpdate<AlgoData, AlgoKey>> source) =>
|
||||
Observable.Create<TableUpdate<AlgoData, AlgoKey>>(o => {
|
||||
var last_out = TableUpdate<AlgoData, AlgoKey>.mk_empty(AlgoData.key_fn);
|
||||
var incomplete_composites = ImmutableHashSet<AlgoData>.Empty;
|
||||
return source.Subscribe(table => {
|
||||
var bd = last_out.to_builder();
|
||||
foreach (var algo in incomplete_composites.Where(a => OrderDataHelper.enumerate_algo_structure(a.value).All(tup => _is_part_contained(tup, table.state)))) {
|
||||
incomplete_composites = incomplete_composites.Remove(algo);
|
||||
bd.add_or_update(algo);
|
||||
}
|
||||
foreach (var a in table.removed.Concat(table.changes.Old()))
|
||||
bd.remove(a.key);
|
||||
foreach (var a in table.added.Concat(table.changed)) {
|
||||
var structure = OrderDataHelper.enumerate_algo_structure(a.value);
|
||||
if (structure.All(t => _is_part_contained(t, table.state))) {
|
||||
bd.add_or_update(a);
|
||||
} else {
|
||||
incomplete_composites = incomplete_composites.Add(a);
|
||||
}
|
||||
}
|
||||
o.OnNext(last_out = bd.to_table());
|
||||
});
|
||||
});
|
||||
|
||||
static bool _is_part_contained((CustomOrderDefinition.CustomOneofCase type, string dyn, uint studio_id, uint spreader_sec) structure, IReadOnlyDictionary<AlgoKey, AlgoData> state) =>
|
||||
structure.type == CustomOrderDefinition.CustomOneofCase.Composite ||
|
||||
structure.type == CustomOrderDefinition.CustomOneofCase.Dynamic ?
|
||||
state.ContainsKey(AlgoKey.from_dynamic_type(structure.dyn)) :
|
||||
state.ContainsKey(AlgoKey.from_known_type(structure.type));
|
||||
}
|
||||
}
|
||||
@@ -162,7 +162,7 @@ namespace mbts.spark {
|
||||
strip_name_filter.load_state(filters.strip_name);
|
||||
mic_code_filter.load_state(filters.mic_code);
|
||||
}
|
||||
rows_view.set_sort_descriptions(s.sorting_criterion, columns);
|
||||
rows_view.set_sort_descriptions(s.sorting_criteria, columns);
|
||||
}
|
||||
}), DataGridFilterHelper.hook_filters(rows_view, _filters),
|
||||
settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager),
|
||||
|
||||
@@ -91,9 +91,9 @@ namespace bts.shell {
|
||||
}
|
||||
|
||||
|
||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion, enable_background_color: true);
|
||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criteria, enable_background_color: true);
|
||||
|
||||
public IReadOnlyList<SortingCriteria> sorting_criterion => _sorting_criteria ?? (_sorting_criteria = DefaultColumns.default_sorting_criterion.ToList());
|
||||
public IReadOnlyList<SortingCriteria> sorting_criteria => _sorting_criteria ?? (_sorting_criteria = DefaultColumns.default_sorting_criteria.ToList());
|
||||
|
||||
public static StartupData Default(SecurityCriteria security_criteria) =>
|
||||
new StartupData(security_criteria, new FilterStates(), null);
|
||||
@@ -131,7 +131,7 @@ namespace bts.shell {
|
||||
|
||||
|
||||
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criterion {
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criteria {
|
||||
get {
|
||||
yield return new SortingCriteria(security.id, true);
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace bts.shell.time_and_sales {
|
||||
[ProtoMember(1)]
|
||||
public readonly SecurityCriteria security_criteria;
|
||||
[ProtoMember(2)]
|
||||
List<SortingCriteria> _sorting_criterion;
|
||||
List<SortingCriteria> _sorting_criteria;
|
||||
[ProtoMember(3)]
|
||||
public FilterStates filters;
|
||||
[ProtoMember(4)]
|
||||
@@ -28,19 +28,19 @@ namespace bts.shell.time_and_sales {
|
||||
public TimeAndSalesSettings(SecurityCriteria security_criteria) :
|
||||
this(security_criteria, new FilterStates(), null, null) { }
|
||||
|
||||
public TimeAndSalesSettings(SecurityCriteria security_criteria, FilterStates filters, GridSettings grid = default, List<SortingCriteria> sorting_criterion = null) {
|
||||
public TimeAndSalesSettings(SecurityCriteria security_criteria, FilterStates filters, GridSettings grid = default, List<SortingCriteria> sorting_criteria = null) {
|
||||
this.security_criteria = security_criteria;
|
||||
this.filters = filters;
|
||||
this.grid = grid;
|
||||
_sorting_criterion = sorting_criterion;
|
||||
_sorting_criteria = sorting_criteria;
|
||||
}
|
||||
|
||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
|
||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criteria);
|
||||
|
||||
public List<SortingCriteria> sorting_criterion => _sorting_criterion ?? (_sorting_criterion = DefaultColumns.default_sorting_criterion.ToList());
|
||||
public List<SortingCriteria> sorting_criteria => _sorting_criteria ?? (_sorting_criteria = DefaultColumns.default_sorting_criteria.ToList());
|
||||
|
||||
public static TimeAndSalesSettings Default(SecurityCriteria security_criteria) =>
|
||||
new TimeAndSalesSettings(security_criteria, new FilterStates(), null, DefaultColumns.default_sorting_criterion.ToList());
|
||||
new TimeAndSalesSettings(security_criteria, new FilterStates(), null, DefaultColumns.default_sorting_criteria.ToList());
|
||||
|
||||
public TimeAndSalesSettings with(SecurityCriteria security_criteria) =>
|
||||
new TimeAndSalesSettings(security_criteria, filters, grid);
|
||||
@@ -53,7 +53,7 @@ namespace bts.shell.time_and_sales {
|
||||
public static GridColumnSettings aggressor => new GridColumnSettings(Columns.Aggressor.col_id(), DefaultColumnHeaders.Aggressor, width: DefaultColumnWidths.Aggressor);
|
||||
public static GridColumnSettings security_key => new GridColumnSettings(Columns.SecurityKey.col_id(), DefaultColumnHeaders.SecurityKey, is_visible: false, width: DefaultColumnWidths.SecurityKey);
|
||||
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criterion {
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criteria {
|
||||
get {
|
||||
yield return new SortingCriteria(time.id, false);
|
||||
}
|
||||
|
||||
@@ -159,7 +159,7 @@ namespace bts.shell.time_and_sales {
|
||||
})),
|
||||
_menu_display_vm.spark_cmd
|
||||
};
|
||||
_vm.load(_state.filters, _state.sorting_criterion, _state.grid);
|
||||
_vm.load(_state.filters, _state.sorting_criteria, _state.grid);
|
||||
_vm.request_show_ladder += show_ladder;
|
||||
var security_criteria_src = _bus.subscribe(update_securities_cmd.tag);
|
||||
var subs = new List<IDisposable> {
|
||||
|
||||
@@ -46,7 +46,7 @@ namespace bts.shell {
|
||||
|
||||
async void _show_synthetic_create(SecurityCriteria security_criteria) {
|
||||
var found_securities = await security_criteria.securities(_bus);
|
||||
var respect_clause_security_ordering_is_possible = security_criteria.clauses.Any(clause => clause.security_keys != null && clause.security_keys.Count > 0);
|
||||
var respect_clause_security_ordering_is_possible = security_criteria.clauses.Any(clause => clause.security_keys != null && clause.security_keys.Length > 0);
|
||||
if (!respect_clause_security_ordering_is_possible) {
|
||||
_show_synthetic_create(found_securities.Values.ToList());
|
||||
} else {
|
||||
|
||||
@@ -70,7 +70,7 @@ namespace bts.shell {
|
||||
grid ?? this.grid,
|
||||
menu_display ?? this.menu_display);
|
||||
|
||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
|
||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criteria);
|
||||
|
||||
static class DefaultColumns {
|
||||
public static GridColumnSettings name => new GridColumnSettings(col_id(Columns.Name), DefaultColumnHeaders.Name, width: DefaultColumnWidths.Security);
|
||||
@@ -80,7 +80,7 @@ namespace bts.shell {
|
||||
public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, is_visible: false, width: DefaultColumnWidths.SecurityKey);
|
||||
public static GridColumnSettings user => new GridColumnSettings(col_id(Columns.User), DefaultColumnHeaders.User, is_visible: false, width: DefaultColumnWidths.User);
|
||||
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criterion {
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criteria {
|
||||
get {
|
||||
yield return new SortingCriteria(name.id, true);
|
||||
}
|
||||
|
||||
@@ -85,9 +85,7 @@ namespace mbts.spark {
|
||||
icon = Icons.Synthetics;
|
||||
_has_working_orders = backing(nameof(has_working_orders), false);
|
||||
contract_picker_model = new ContractPickerModel(bus, false, null, new SecurityCriteria(new[] {
|
||||
new SecurityCriteriaClause() {
|
||||
exchanges = EnumHelper.get_values_except(Venue.Bts).ToArray()
|
||||
}
|
||||
new SecurityCriteriaClause(exchanges: EnumHelper.get_values_except(Venue.Bts).ToArray())
|
||||
}));
|
||||
contract_picker_model.cancel_action += _close_new_leg_popup;
|
||||
contract_picker_model.ok_action += () => {
|
||||
|
||||
@@ -9,6 +9,8 @@ namespace mbts.spark {
|
||||
// This is a core data type on the front end, so data validation is strict, as bad values may yield weird/difficult to track bugs.
|
||||
// Descriptive factory methods are favored over public constructors, as they are less likely to be misused.
|
||||
struct AlgoData : IEquatable<AlgoData> {
|
||||
public static readonly Func<AlgoData, AlgoKey> key_fn = a => a.key;
|
||||
|
||||
public readonly CustomOrderDefinitionImmutable value;
|
||||
public readonly string name;
|
||||
public readonly AlgoKey key;
|
||||
|
||||
@@ -128,6 +128,7 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
public bool is_persisted => mode == Mode.Persisted;
|
||||
public bool is_composite => _composite_key.HasValue || _unpersisted.HasValue;
|
||||
|
||||
public uint persisted => _composite_key.Value;
|
||||
public Guid unpersisted => _unpersisted.Value;
|
||||
@@ -199,6 +200,15 @@ namespace mbts.spark {
|
||||
}
|
||||
return EqualityComparer.phase_hash(hash, phase_mult);
|
||||
}
|
||||
public override string ToString() {
|
||||
switch (mode) {
|
||||
case Mode.Dynamic: return $"Dynamic: {dynamic_type}";
|
||||
case Mode.Factory: return $"Factory: {factory}";
|
||||
case Mode.Persisted: return $"Composite: {persisted}";
|
||||
case Mode.Unpersisted: return $"(Composite): {unpersisted}";
|
||||
default: return mode.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
public static bool operator ==(AlgoKey a, AlgoKey b) => a.Equals(b);
|
||||
public static bool operator !=(AlgoKey a, AlgoKey b) => !a.Equals(b);
|
||||
|
||||
@@ -12,20 +12,20 @@ namespace mbts.spark {
|
||||
[Export(typeof(IAlgoStudioModel))]
|
||||
class AlgoStudioFlatDefinitionModel : IAlgoStudioModel, IDisposable {
|
||||
readonly AlgoDefinitionService _service;
|
||||
readonly AdminModel _admin_model;
|
||||
readonly UserTuple _user;
|
||||
readonly ErrorReporter _error_reporter;
|
||||
IReadOnlyDictionary<AlgoKey, AlgoData> _algos = DictionaryHelper.empty<AlgoKey, AlgoData>();
|
||||
IDisposable _dispose;
|
||||
|
||||
[ImportingConstructor]
|
||||
public AlgoStudioFlatDefinitionModel(AlgoDefinitionService service, IAlgoDefinitionMetadataService metadata_service, AdminModel admin_model, ErrorReporter error_reporter) {
|
||||
public AlgoStudioFlatDefinitionModel(AlgoDefinitionService service, IAlgoDefinitionMetadataService metadata_service, UserTuple user, ErrorReporter error_reporter) {
|
||||
_service = service;
|
||||
this.metadata_service = metadata_service;
|
||||
_admin_model = admin_model;
|
||||
_user = user;
|
||||
_error_reporter = error_reporter;
|
||||
definitions =
|
||||
service.subscribei_algo_definitions()
|
||||
.Filter(r => r.Metadata.IsActive && _admin_model.user.can_access_user_data(r.Metadata.CreatorUserId))
|
||||
.Filter(r => r.Metadata.IsActive && _user.can_access_user_data(r.Metadata.CreatorUserId))
|
||||
.SelectKeyValue(_definition_data, d => d.key)
|
||||
.Table()
|
||||
.Cache();
|
||||
@@ -37,7 +37,7 @@ namespace mbts.spark {
|
||||
|
||||
public async Task<AlgoData?> save_definition(AlgoData definition_data) {
|
||||
var (value, success) = await _error_reporter.safe_execute(() => _service.save_algo_definition_async(
|
||||
_with_key(new AlgoDefinitionUpdateRequest { UserId = _admin_model.user.id, Algo = _api_definition(definition_data) }, definition_data.key)),
|
||||
_with_key(new AlgoDefinitionUpdateRequest { UserId = _user.id, Algo = _api_definition(definition_data) }, definition_data.key)),
|
||||
r => r.Success, r => r.ErrorMessage, "saving definition");
|
||||
if (success)
|
||||
return _definition_data(new AlgoDefinitionRecordImmutable(value.Record));
|
||||
@@ -93,4 +93,4 @@ namespace mbts.spark {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,8 @@ namespace mbts.spark {
|
||||
/// decouple the client-side key type from the server-side one, so both key types may evolve independently moving forward.
|
||||
/// </summary>
|
||||
struct AlgoDefinitionMetadata : IEquatable<AlgoDefinitionMetadata> {
|
||||
public static readonly Func<AlgoDefinitionMetadata, AlgoKey> key_fn = m => m.id;
|
||||
|
||||
public readonly AlgoKey id, default_template;
|
||||
readonly AlgoKey[] _favorite_templates;
|
||||
public readonly bool is_favorite, is_hidden;
|
||||
|
||||
@@ -35,34 +35,21 @@ namespace mbts.spark {
|
||||
Comparer<IAlgoVM>.Create(_CompareUtils.compare_names)
|
||||
}).to_comparer().to_safe();
|
||||
|
||||
public static void update_persisted_definitions(ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey> target, TableUpdate<AlgoData, AlgoKey> update, Func<AlgoData, AlgoDefinitionVM> factory) {
|
||||
foreach (var d in update.removed)
|
||||
target.Remove(d.key);
|
||||
foreach (var d in update.changed)
|
||||
public static void update_persisted_definitions(ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey> target, TableUpdate<AlgoData, AlgoKey> update, Func<AlgoData, AlgoDefinitionVM> factory) =>
|
||||
update_persisted_definitions(target, update.added, update.changed, update.removed.Select(AlgoData.key_fn), factory);
|
||||
|
||||
public static void update_persisted_definitions(ObservableKeyedCollection<AlgoDefinitionVM, AlgoKey> target, IEnumerable<AlgoData> added, IEnumerable<AlgoData> changed, IEnumerable<AlgoKey> removed, Func<AlgoData, AlgoDefinitionVM> factory) {
|
||||
foreach (var k in removed)
|
||||
target.Remove(k);
|
||||
foreach (var d in changed)
|
||||
target[d.key].load(d);
|
||||
foreach (var d in update.added) {
|
||||
foreach (var d in added) {
|
||||
if (target.TryGetValue(d.key, out AlgoDefinitionVM def)) {
|
||||
def.load(d);
|
||||
} else target.Add(factory(d));
|
||||
}
|
||||
}
|
||||
|
||||
public static void update_persisted_definition_wrappers(IDictionary<AlgoKey, IAlgoVM> target, TableUpdate<AlgoData, AlgoKey> update, Func<AlgoData, AlgoDefinitionVM> factory) {
|
||||
foreach (var d in update.removed)
|
||||
target.Remove(d.key);
|
||||
foreach (var d in update.changed) {
|
||||
var vm = target[d.key];
|
||||
if (vm is AlgoVMWrapper wrapper) {
|
||||
wrapper.value.load(d);
|
||||
} else vm.load_from(d.value);
|
||||
}
|
||||
foreach (var d in update.added) {
|
||||
if (target.TryGetValue(d.key, out IAlgoVM def)) {
|
||||
def.load_from(d.value);
|
||||
} else target.Add(d.key, new AlgoVMWrapper(factory(d)));
|
||||
}
|
||||
}
|
||||
|
||||
public static void commit_all(this IEnumerable<AlgoParamRowVM> algo_param_rows) =>
|
||||
algo_param_rows.Select(r => r.param).commit_all();
|
||||
|
||||
|
||||
@@ -42,21 +42,21 @@ namespace mbts.spark {
|
||||
readonly Property<string> _name, _abbreviation;
|
||||
readonly ObservableKeyedCollection<IAlgoVM, AlgoKey> _algo_roots = new ObservableKeyedCollection<IAlgoVM, AlgoKey>(vm => vm.id);
|
||||
readonly DeferrableActionWrapper _refresh_on_local_changes;
|
||||
readonly Property<AlgoFormats> _selected_format;
|
||||
readonly EnumMaskInt32<AlgoEditingPermissions> _permissions_mask = new EnumMaskInt32<AlgoEditingPermissions>();
|
||||
|
||||
int? _favorite_index;
|
||||
Brush _badge_fill;
|
||||
Snapshot? _committed;
|
||||
AlgoDefinitionMetadata _metadata;
|
||||
IDisposable _loaded_data_hook;
|
||||
|
||||
public static AlgoDefinitionVM create(OrdersModel model, AlgoData data, AlgoFormats init_format = AlgoFormats.Exchange, AlgoEditingPermissions editing_permissions = (AlgoEditingPermissions)int.MaxValue) =>
|
||||
new AlgoDefinitionVM(model, data, init_format, editing_permissions);
|
||||
public static AlgoDefinitionVM create(OrdersModel model, AlgoData data, AlgoEditingPermissions editing_permissions = (AlgoEditingPermissions)int.MaxValue) =>
|
||||
new AlgoDefinitionVM(model, data, editing_permissions);
|
||||
|
||||
public static AlgoDefinitionVM create_placeholder(OrdersModel model, CustomOrderDefinitionImmutable def, string name, AlgoFormats init_format) =>
|
||||
new AlgoDefinitionVM(model, AlgoData.create_unpersisted(def, name), init_format, (AlgoEditingPermissions)int.MaxValue);
|
||||
public static AlgoDefinitionVM create_placeholder(OrdersModel model, CustomOrderDefinitionImmutable def, string name) =>
|
||||
new AlgoDefinitionVM(model, AlgoData.create_unpersisted(def, name), (AlgoEditingPermissions)int.MaxValue);
|
||||
|
||||
AlgoDefinitionVM(OrdersModel model, AlgoData def_data, AlgoFormats init_format, AlgoEditingPermissions init_permissions) {
|
||||
AlgoDefinitionVM(OrdersModel model, AlgoData def_data, AlgoEditingPermissions init_permissions) {
|
||||
// init core data
|
||||
_model = model;
|
||||
_permissions_mask.mask = init_permissions;
|
||||
@@ -80,7 +80,6 @@ namespace mbts.spark {
|
||||
// init backing props
|
||||
_name = backing(nameof(name), def_data.name);
|
||||
_abbreviation = backing(nameof(abbreviation), string.Empty);
|
||||
_selected_format = backing(nameof(selected_format), init_format);
|
||||
_is_favorite = backing(nameof(is_favorite), () => _favorite_index.HasValue);
|
||||
_is_expanded = backing(nameof(is_expanded), true);
|
||||
_is_selected = backing(nameof(is_selected), true);
|
||||
@@ -133,17 +132,6 @@ namespace mbts.spark {
|
||||
break;
|
||||
}
|
||||
var permission_src = _permissions_mask.observe_result();
|
||||
resources.Add(_selected_format.observe_current(true).CombineLatest(permission_src, (fmt, perms) => (fmt, perms))
|
||||
.SubscribeEach(t => {
|
||||
if ((t.perms & AlgoEditingPermissions.AllowEditStructure) != 0) {
|
||||
using (_refresh_on_local_changes.defer_execution()) {
|
||||
var algo_data = model.factory.default_algos(t.fmt);
|
||||
var default_algo = AlgoKey.from_known_type(OrderDataHelper.get_default_algo(t.fmt));
|
||||
return this.load_algo_data_recursive(algo_data, default_algo);
|
||||
}
|
||||
}
|
||||
return Disposable.empty;
|
||||
}));
|
||||
resources.Add(permission_src.Subscribe(_ => RaisePropertyChanged(nameof(editing_permissions))));
|
||||
resources.Add(this.connect_data(permission_src));
|
||||
resources.Add(this.connect_data(Observable.Return(model)));
|
||||
@@ -202,9 +190,6 @@ namespace mbts.spark {
|
||||
public EnabledValueVM<Color> custom_badge_color { get; } = new EnabledValueVM<Color>();
|
||||
public ObservableCollection<ColorPaletteVM> custom_badge_color_palettes { get; } = new ObservableCollection<ColorPaletteVM>();
|
||||
public Brush badge_fill => _badge_fill;
|
||||
// format
|
||||
public AlgoFormats selected_format { get => _selected_format.Value; set => _selected_format.set(value); }
|
||||
public ObservableCollection<AlgoFormats> formats { get; } = new ObservableCollection<AlgoFormats> { AlgoFormats.Exchange, AlgoFormats.Spreader, AlgoFormats.Exchange | AlgoFormats.Spreader };
|
||||
// visual states
|
||||
public ObservableCollection<string> edit_pane_visual_states => _edit_pane_vs_model.states;
|
||||
public ObservableCollection<string> tree_view_visual_states => _tree_view_vs_model.states;
|
||||
@@ -270,17 +255,14 @@ namespace mbts.spark {
|
||||
void IObserver<(IReadOnlyDictionary<AlgoKey, AlgoData> algo_data, AlgoKey? default_algo)>.OnError(Exception error) { }
|
||||
#endregion
|
||||
|
||||
void _load_algo_data(IReadOnlyDictionary<AlgoKey, AlgoData> algo_data, AlgoKey? default_algo) {
|
||||
var orig_algo = algo_root?.id;
|
||||
_algo_roots.SyncWithDictionary(algo_data, d => OrderTypeVMFactory.create(d, is_expanded: true));
|
||||
if (!try_select(orig_algo) && !try_select(default_algo))
|
||||
algo_root = algo_roots.FirstOrDefault();
|
||||
//
|
||||
bool try_select(AlgoKey? algo_key) {
|
||||
if (algo_key.HasValue && _algo_roots.TryGetValue(algo_key.Value, out IAlgoVM match)) {
|
||||
void _load_algo_data(IReadOnlyDictionary<AlgoKey, AlgoData> data, AlgoKey? default_algo) {
|
||||
Disposable.dispose(ref _loaded_data_hook);
|
||||
_algo_roots.SyncWithDictionary(data, d => OrderTypeVMFactory.create(d, is_expanded: true));
|
||||
_loaded_data_hook = ObservableAutoWrapper.connect_item_hooks(algo_roots, vm =>
|
||||
ObservableAutoWrapper.connect_item_actions(vm.child_algo_selectors, s => s.load_algo_data(data, null)));
|
||||
if (algo_root == null || !_algo_roots.ContainsKey(algo_root.id)) {
|
||||
if (default_algo.HasValue && _algo_roots.TryGetValue(default_algo.Value, out IAlgoVM match))
|
||||
algo_root = match;
|
||||
return true;
|
||||
} else return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -346,7 +328,7 @@ namespace mbts.spark {
|
||||
|
||||
// pass a copy of the persisted state - rather than use local values - because if something goes wrong, it is better to be in sync with data fresh from the server/api.
|
||||
public AlgoDefinitionVM to_persisted(AlgoData def) =>
|
||||
new AlgoDefinitionVM(_model, def, selected_format, editing_permissions_mask);
|
||||
new AlgoDefinitionVM(_model, def, editing_permissions_mask);
|
||||
|
||||
public AlgoData create_algo_def() =>
|
||||
AlgoData.create(algo_root == null ? new CustomOrderDefinitionImmutable(new CustomOrderDefinition()) : algo_root.definition, name, key);
|
||||
@@ -368,7 +350,6 @@ namespace mbts.spark {
|
||||
|
||||
void _assign_from_data(Snapshot state) {
|
||||
_assign_from_data(state.data);
|
||||
_selected_format.set(state.format);
|
||||
_abbreviation.set(state.abbreviation);
|
||||
custom_badge_color.set_nullable(state.custom_badge_color);
|
||||
}
|
||||
@@ -429,41 +410,36 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
Snapshot _snapshot() =>
|
||||
new Snapshot(create_algo_def(), abbreviation, custom_badge_color.get_nullable(), selected_format);
|
||||
new Snapshot(create_algo_def(), abbreviation, custom_badge_color.get_nullable());
|
||||
|
||||
public struct Snapshot : IEquatable<Snapshot> {
|
||||
public readonly AlgoData data;
|
||||
public readonly string abbreviation;
|
||||
public readonly Color? custom_badge_color;
|
||||
public readonly AlgoFormats format;
|
||||
|
||||
public Snapshot(AlgoData data, string abbreviation, Color? custom_badge_color, AlgoFormats format) {
|
||||
public Snapshot(AlgoData data, string abbreviation, Color? custom_badge_color) {
|
||||
this.data = data;
|
||||
this.abbreviation = abbreviation;
|
||||
this.custom_badge_color = custom_badge_color;
|
||||
this.format = format;
|
||||
}
|
||||
|
||||
public bool Equals(Snapshot other) =>
|
||||
data == other.data &&
|
||||
abbreviation == other.abbreviation &&
|
||||
custom_badge_color == other.custom_badge_color &&
|
||||
format == other.format;
|
||||
custom_badge_color == other.custom_badge_color;
|
||||
|
||||
public override bool Equals(object obj) => EqualityComparer.equals_obj(this, obj);
|
||||
public override int GetHashCode() =>
|
||||
EqualityComparer.aggregate_hash(
|
||||
data.GetHashCode(),
|
||||
abbreviation?.GetHashCode() ?? 0,
|
||||
custom_badge_color?.GetHashCode() ?? 0,
|
||||
(int)format);
|
||||
custom_badge_color?.GetHashCode() ?? 0);
|
||||
#if DEBUG
|
||||
public override string ToString() {
|
||||
var sb = new System.Text.StringBuilder();
|
||||
sb.Append($"name: {data.name}; ");
|
||||
sb.Append($"abbrev.: {abbreviation}; ");
|
||||
sb.Append($"badge: {custom_badge_color} ");
|
||||
sb.Append($"fmt: {format} ");
|
||||
sb.Append($"def: {data.value}");
|
||||
return sb.ToString();
|
||||
}
|
||||
@@ -477,7 +453,6 @@ namespace mbts.spark {
|
||||
public bool Equals(Snapshot x, Snapshot y) =>
|
||||
x.abbreviation == y.abbreviation &&
|
||||
x.custom_badge_color == y.custom_badge_color &&
|
||||
x.format == y.format &&
|
||||
x.data.key == y.data.key &&
|
||||
x.data.name == y.data.name &&
|
||||
x.data.value.Equals(y.data.value);
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
using bts;
|
||||
using bts.api;
|
||||
using bts.api.core;
|
||||
using bts.api.orderman;
|
||||
using bts.collections;
|
||||
using bts.utils;
|
||||
using mbts.collections;
|
||||
using mbts.spark.utilities;
|
||||
using mbts.ui;
|
||||
using mbts.ui.shell;
|
||||
using mbts.ui.utility;
|
||||
@@ -37,7 +41,6 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
class AlgoStudioVM : DisposableViewModelBase {
|
||||
static readonly AlgoFormats _studio_formats = AlgoFormats.Exchange;
|
||||
readonly OrdersModel _model;
|
||||
readonly Property<AlgoDefinitionVM> _selected_definition;
|
||||
readonly Property<IAlgoVM> _editable_content;
|
||||
@@ -70,12 +73,24 @@ namespace mbts.spark {
|
||||
_revert_cmd_tooltip = backing(nameof(revert_cmd_tooltip), get_revert_tooltip);
|
||||
//
|
||||
_dispose = new CompositeDisposable(
|
||||
_model.algo_model.definitions.Subscribe(_definitions_update_buffer),
|
||||
_definitions_update_buffer.OnDispatcher().Subscribe(u => {
|
||||
var orig_selected_def = selected_definition;
|
||||
AlgoCollectionHelper.update_persisted_definitions(_definitions, u, d => AlgoDefinitionVM.create(model, d, _studio_formats));
|
||||
_model.subscribe_complete_algos().OnDispatcher().Subscribe(_definitions_update_buffer),
|
||||
_definitions_update_buffer.OnDispatcher()
|
||||
.SubscribeEach(u => {
|
||||
u.FilterIncremental(a => a.key.is_composite, out var added, out var changes, out var removed);
|
||||
AlgoCollectionHelper.update_persisted_definitions(
|
||||
_definitions, added, changes.New(), removed.Select(AlgoData.key_fn), algo => AlgoDefinitionVM.create(_model, algo));
|
||||
if (selected_definition == null)
|
||||
selected_definition = definitions.FirstOrDefault();
|
||||
// Load the algo building blocks (i.e., factory and dynamic algos):
|
||||
// - Composite algos cannot reference other composite algos - that would create awkward dependency issues as composite algos can be modified/deleted.
|
||||
// - Spreader algos are filtered out as well, because that don't actually mean anything to the algo structure.
|
||||
// Synthetic securities in our system are defined by a set of contract legs, and a [single]strategy.
|
||||
// Note: synthetic strategy templates, however, could be introduced at a later date (no reason why 1 synthetic security couldn't have several ExecutionStrategies).
|
||||
var algo_building_blocks = new FilteredDictionary<AlgoKey, AlgoData>(
|
||||
u.state,
|
||||
a => a.key.mode == AlgoKey.Mode.Dynamic || (a.key.mode == AlgoKey.Mode.Factory && a.key.factory != CustomOrderDefinition.CustomOneofCase.Spreader));
|
||||
return ObservableAutoWrapper.connect_item_actions(_definitions.AsCollection(),
|
||||
d => ((IAlgoSelector)d).load_algo_data(algo_building_blocks, null));
|
||||
}),
|
||||
_model.algo_model.metadata_service.subscribe_metadata().OnDispatcher().Subscribe(meta => {
|
||||
_persisted_meta = meta;
|
||||
@@ -125,7 +140,7 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
void add_definition_common(CustomOrderDefinitionImmutable def, string name) {
|
||||
var new_def = AlgoDefinitionVM.create_placeholder(_model, def, name, _studio_formats);
|
||||
var new_def = AlgoDefinitionVM.create_placeholder(_model, def, name);
|
||||
_definitions.Add(new_def);
|
||||
selected_definition = new_def;
|
||||
request_view_focus_name?.Invoke(new_def);
|
||||
|
||||
@@ -1,214 +0,0 @@
|
||||
using bts.api;
|
||||
using bts.api.orderman;
|
||||
using bts.collections;
|
||||
using bts.spark;
|
||||
using mbts.spark.utilities;
|
||||
using mbts.ui;
|
||||
using mbts.ui.controls;
|
||||
using mbts.ui.shell;
|
||||
using mbts.utils;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Collections.Specialized;
|
||||
using System.ComponentModel;
|
||||
using System.Reactive.Disposables;
|
||||
using System.Reactive.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Input;
|
||||
|
||||
namespace mbts.spark {
|
||||
class AlgoVMWrapper : DisposableViewModelBase, IAlgoVM,
|
||||
IObserver<SecurityMD?>,
|
||||
IObserver<SecurityImmutable?>,
|
||||
IObserver<OrdersModel>,
|
||||
IObserver<AlgoEditingPermissions> {
|
||||
static readonly HashSet<string>
|
||||
_algo_root_echo_props = new HashSet<string> {
|
||||
nameof(is_expanded),
|
||||
nameof(editing_permissions),
|
||||
nameof(definition),
|
||||
nameof(display_name)
|
||||
};
|
||||
static readonly IReadOnlyDictionary<string, string>
|
||||
_value_echo_props = new Dictionary<string, string> {
|
||||
{ nameof(AlgoDefinitionVM.name), nameof(display_name) },
|
||||
{ nameof(AlgoDefinitionVM.abbreviation), nameof(abbreviation) },
|
||||
{ nameof(AlgoDefinitionVM.badge_fill), nameof(meta) }
|
||||
};
|
||||
readonly ObservableAggregateCollection<IAlgoSelector> _child_algo_selectors = new ObservableAggregateCollection<IAlgoSelector>();
|
||||
readonly ObservableAggregateCollection<IAlgoParamVM> _algo_params = new ObservableAggregateCollection<IAlgoParamVM>();
|
||||
readonly DisposableContainer _value_hooks = new DisposableContainer();
|
||||
Action _definition_changed = () => { };
|
||||
_ObservedData? _data_cache;
|
||||
AlgoDefinitionVM _value;
|
||||
|
||||
public AlgoVMWrapper(AlgoDefinitionVM algo_definition_vm) {
|
||||
value = algo_definition_vm;
|
||||
_dispose = new CompositeDisposable(_value_hooks) {
|
||||
_child_algo_selectors.clear_collections,
|
||||
_algo_params.clear_collections,
|
||||
() => _value?.Dispose()
|
||||
};
|
||||
}
|
||||
|
||||
public event Action definition_changed { add => _definition_changed += value; remove => _definition_changed -= value; }
|
||||
|
||||
public AlgoDefinitionVM value {
|
||||
get => _value;
|
||||
set {
|
||||
if (_value != value) {
|
||||
_value?.Dispose();
|
||||
_value = value;
|
||||
_value_hooks.replace(_set_hooks(value));
|
||||
RaisePropertyChanged(nameof(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
public AlgoKey id => _value.key;
|
||||
public CustomOrderDefinition.CustomOneofCase order_type => _algo_root?.order_type ?? CustomOrderDefinition.CustomOneofCase.None;
|
||||
public OrderMetadata meta {
|
||||
get {
|
||||
if (_value != null) {
|
||||
if (_value.custom_badge_color.enabled)
|
||||
return new OrderMetadata { Color = value.custom_badge_color.value.rgb_color(), KeyBinding = value.abbreviation.if_null_or_empty(value.name) };
|
||||
else if (_value.algo_root != null)
|
||||
return _value.algo_root.meta;
|
||||
}
|
||||
return OrderDataHelper.get_metadata(order_type);
|
||||
}
|
||||
}
|
||||
public AlgoEditingPermissions editing_permissions => _value?.editing_permissions ?? AlgoEditingPermissions.None;
|
||||
public bool can_expand => _algo_root?.can_expand ?? false;
|
||||
public bool is_expanded {
|
||||
get => _value.algo_root?.is_expanded ?? false;
|
||||
set {
|
||||
if (_value != null)
|
||||
_value.is_expanded = value;
|
||||
}
|
||||
}
|
||||
public string display_name => _value?.name ?? string.Empty;
|
||||
public string abbreviation => _value?.abbreviation;
|
||||
public AlgoDisplayGroup group => _value?.group ?? AlgoDisplayGroup.BTS;
|
||||
public CustomOrderDefinitionImmutable definition => _algo_root?.definition ?? new CustomOrderDefinitionImmutable(new CustomOrderDefinition());
|
||||
public ObservableCollection<IAlgoSelector> child_algo_selectors => _child_algo_selectors;
|
||||
[EditorBrowsable(EditorBrowsableState.Never)]
|
||||
public ObservableCollection<IAlgoSelector> child_algo_selectors_view {
|
||||
get {
|
||||
_value?.algo_root?.ensure_init();
|
||||
return _child_algo_selectors;
|
||||
}
|
||||
}
|
||||
public IReadOnlyObservableCollection<IAlgoParamVM> algo_params => _algo_params;
|
||||
[EditorBrowsable(EditorBrowsableState.Never)]
|
||||
public dynamic children_vm => _algo_root?.children_vm;
|
||||
|
||||
IAlgoVM _algo_root => _value?.algo_root;
|
||||
|
||||
public void assign_to(CustomOrderDefinition value) => _algo_root?.assign_to(value);
|
||||
public bool key_match(KeyEventArgs e) => _algo_root?.key_match(e) ?? false;
|
||||
public void load_from(CustomOrderDefinitionImmutable value) => _algo_root?.load_from(value);
|
||||
public void load_many(IEnumerable<CustomOrderDefinitionImmutable> values) => _algo_root?.load_many(values);
|
||||
void IAlgoVM.ensure_init() => _value?.algo_root?.ensure_init();
|
||||
|
||||
IDisposable _set_hooks(AlgoDefinitionVM vm) {
|
||||
var algo_root_subs = new DisposableContainer();
|
||||
vm.PropertyChanged += on_value_prop_changed;
|
||||
return new CompositeDisposable(
|
||||
vm.observe_algo_root().Subscribe(r => {
|
||||
algo_root_subs.replace(null);
|
||||
_child_algo_selectors.clear_collections();
|
||||
_algo_params.clear_collections();
|
||||
if (r != null) {
|
||||
if (_data_cache.HasValue) {
|
||||
_data_cache.Value.forward_to(r);
|
||||
}
|
||||
_child_algo_selectors.add_collection(r.child_algo_selectors);
|
||||
_algo_params.add_collection(r.algo_params);
|
||||
((INotifyPropertyChanged)r).PropertyChanged += on_algo_root_prop_changed;
|
||||
algo_root_subs.replace(new CompositeDisposable(
|
||||
r.subscribe_definition().Subscribe(_ => _definition_changed?.Invoke())) {
|
||||
() => ((INotifyPropertyChanged)r).PropertyChanged -= on_algo_root_prop_changed
|
||||
});
|
||||
}
|
||||
RaisePropertyChanged(nameof(group));
|
||||
}),
|
||||
algo_root_subs) {
|
||||
() => vm.PropertyChanged -= on_value_prop_changed
|
||||
};
|
||||
void on_algo_root_prop_changed(object sender, PropertyChangedEventArgs e) {
|
||||
if (_algo_root_echo_props.Contains(e.PropertyName))
|
||||
RaisePropertyChanged(e.PropertyName);
|
||||
}
|
||||
void on_value_prop_changed(object sender, PropertyChangedEventArgs e) {
|
||||
if (_value_echo_props.TryGetValue(e.PropertyName, out string wrapper_prop))
|
||||
RaisePropertyChanged(wrapper_prop);
|
||||
}
|
||||
}
|
||||
|
||||
// permissions
|
||||
void IObserver<AlgoEditingPermissions>.OnNext(AlgoEditingPermissions value) {
|
||||
_data_cache = _data_cache?.with(value) ?? new _ObservedData(value, default, default, default);
|
||||
(_algo_root as IObserver<AlgoEditingPermissions>)?.OnNext(value);
|
||||
}
|
||||
void IObserver<AlgoEditingPermissions>.OnError(Exception error) { }
|
||||
void IObserver<AlgoEditingPermissions>.OnCompleted() { }
|
||||
// model
|
||||
void IObserver<OrdersModel>.OnNext(OrdersModel value) {
|
||||
_data_cache = _data_cache?.with(value) ?? new _ObservedData(default, value, default, default);
|
||||
(_algo_root as IObserver<OrdersModel>)?.OnNext(value);
|
||||
}
|
||||
void IObserver<OrdersModel>.OnError(Exception error) { }
|
||||
void IObserver<OrdersModel>.OnCompleted() { }
|
||||
// security
|
||||
void IObserver<SecurityImmutable?>.OnNext(SecurityImmutable? value) {
|
||||
_data_cache = _data_cache?.with(value) ?? new _ObservedData(default, default, value, default);
|
||||
(_algo_root as IObserver<SecurityImmutable?>)?.OnNext(value);
|
||||
}
|
||||
void IObserver<SecurityImmutable?>.OnError(Exception error) { }
|
||||
void IObserver<SecurityImmutable?>.OnCompleted() { }
|
||||
// security md
|
||||
void IObserver<SecurityMD?>.OnNext(SecurityMD? value) {
|
||||
_data_cache = _data_cache?.with(value) ?? new _ObservedData(default, default, default, value);
|
||||
(_algo_root as IObserver<SecurityMD?>)?.OnNext(value);
|
||||
}
|
||||
void IObserver<SecurityMD?>.OnError(Exception error) { }
|
||||
void IObserver<SecurityMD?>.OnCompleted() { }
|
||||
|
||||
struct _ObservedData {
|
||||
public readonly AlgoEditingPermissions permissions;
|
||||
public readonly OrdersModel model;
|
||||
public readonly SecurityImmutable? security;
|
||||
public readonly SecurityMD? security_md;
|
||||
|
||||
public _ObservedData(AlgoEditingPermissions permissions, OrdersModel model, SecurityImmutable? security, SecurityMD? security_md) {
|
||||
this.permissions = permissions;
|
||||
this.model = model;
|
||||
this.security = security;
|
||||
this.security_md = security_md;
|
||||
}
|
||||
|
||||
public void forward_to(IAlgoVM recipient) {
|
||||
(recipient as IObserver<AlgoEditingPermissions>)?.OnNext(permissions);
|
||||
if (model != null)
|
||||
(recipient as IObserver<OrdersModel>)?.OnNext(model);
|
||||
if (security_md.HasValue)
|
||||
(recipient as IObserver<SecurityMD?>)?.OnNext(security_md);
|
||||
if (security.HasValue)
|
||||
(recipient as IObserver<SecurityImmutable?>)?.OnNext(security);
|
||||
}
|
||||
|
||||
public _ObservedData with(AlgoEditingPermissions? permissions) =>
|
||||
new _ObservedData(permissions ?? this.permissions, model, security, security_md);
|
||||
|
||||
public _ObservedData with(OrdersModel model) =>
|
||||
new _ObservedData(permissions, model, security, security_md);
|
||||
|
||||
public _ObservedData with(SecurityImmutable? security) =>
|
||||
new _ObservedData(permissions, model, security, security_md);
|
||||
|
||||
public _ObservedData with(SecurityMD? security_md) =>
|
||||
new _ObservedData(permissions, model, security, security_md);
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -302,7 +302,7 @@
|
||||
<!--Double-->
|
||||
<usp:AlgoParamTemplateSelector.DoubleTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock Text="{Binding param.value, Converter={StaticResource DoubleTextConverter}}"/>
|
||||
<TextBlock Text="{Binding param.display_value, Converter={StaticResource DoubleTextConverter}}"/>
|
||||
</DataTemplate>
|
||||
</usp:AlgoParamTemplateSelector.DoubleTemplate>
|
||||
<!--Enum-->
|
||||
@@ -406,7 +406,7 @@
|
||||
<!--Double-->
|
||||
<usp:AlgoParamTemplateSelector.DoubleTemplate>
|
||||
<DataTemplate>
|
||||
<c:TickUpDownDouble x:Name="tick_up_down" Focusable="False" HorizontalAlignment="Stretch" Value="{Binding param.value, UpdateSourceTrigger=PropertyChanged}" ArrowKeyTickModifiers="Ctrl">
|
||||
<c:TickUpDownDouble x:Name="tick_up_down" Focusable="False" HorizontalAlignment="Stretch" Value="{Binding param.display_value, UpdateSourceTrigger=PropertyChanged}" ArrowKeyTickModifiers="Ctrl">
|
||||
<c:TickUpDownDouble.CommandBindings>
|
||||
<CommandBinding Command="{x:Static u:NavigationHelper.MoveFocusCommand}" Executed="{x:Static u:NavigationHelper.KeyboardMoveFocusExecuted}"/>
|
||||
</c:TickUpDownDouble.CommandBindings>
|
||||
|
||||
+1
-26
@@ -39,31 +39,6 @@ namespace mbts.spark {
|
||||
}
|
||||
}
|
||||
|
||||
static IDisposable _wrap_rows(AlgoDefinitionVM algo_def, ObservableAggregateCollection<AlgoParamRowVM> rows, bool include_algo_type_rows) {
|
||||
AlgoParamRowVM root = null;
|
||||
ObservableAggregateCollection<AlgoParamRowVM> algo_params;
|
||||
if (include_algo_type_rows) {
|
||||
// while normal params live and die with the selected algo-type (when the algo-type changes, they are removed, and replaced with params for the new algo type),
|
||||
// the algo-type row is constant (it is the row with the algo-type dropdown, which the user may use to select different algos).
|
||||
algo_params = new ObservableAggregateCollection<AlgoParamRowVM>();
|
||||
rows.add_collection(new ObservableAppendCollection<AlgoParamRowVM>(algo_params, root = new AlgoSelectorParamRowVM(new AlgoVMWrapper(algo_def), algo_def, null)).AsReadOnly());
|
||||
} else {
|
||||
algo_params = rows;
|
||||
}
|
||||
return algo_def.observe_algo_root().SubscribeEach(a => {
|
||||
algo_params.clear_collections();
|
||||
if (a == null)
|
||||
return Disposable.empty;
|
||||
var child_rows = new ObservableAggregateCollection<AlgoParamRowVM>();
|
||||
/// Note: the order of operations here matters
|
||||
/// <see cref="_wrap_rows(IAlgoVM, AlgoParamRowVM, ObservableAggregateCollection{AlgoParamRowVM}, bool)" /> has the potential to trigger a lot of CollectionChanged events (depending on how deep the algo-tree is).
|
||||
/// There is no need to burden the aggregate 'rows' with echoing all of these events, if the child-row collection is finished changing when it is added to the aggregate.
|
||||
var hook = _wrap_rows(a, root, child_rows, include_algo_type_rows);
|
||||
algo_params.add_collection(child_rows.AsReadOnly());
|
||||
return hook;
|
||||
});
|
||||
}
|
||||
|
||||
static IDisposable _wrap_rows(IAlgoVM algo_root, AlgoParamRowVM parent, ObservableAggregateCollection<AlgoParamRowVM> all_rows, bool include_algo_type_rows) {
|
||||
var wrapped_params = new ObservableAutoWrapper<AlgoParamRowVM, IAlgoParamVM>(algo_root.algo_params, pvm => new AlgoParamRowVM(algo_root, pvm, parent));
|
||||
var selector_params = new ObservableCollection<AlgoParamRowVM>();
|
||||
@@ -85,4 +60,4 @@ namespace mbts.spark {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -106,7 +106,7 @@
|
||||
</GroupBox.Header>
|
||||
<ContentControl
|
||||
Grid.IsSharedSizeScope="True"
|
||||
Content="{Binding algo_root, Converter={x:Static usp:AlgoContentTemplateSelector.DataContextConverter}}"
|
||||
Content="{Binding algo_root}"
|
||||
ContentTemplateSelector="{StaticResource AlgoTemplateSelector}"
|
||||
Margin="{StaticResource Margin.TP1}"
|
||||
Visibility="{Binding algo_root.can_expand, Converter={StaticResource BooleanToVisibilityConverter}}"
|
||||
|
||||
@@ -154,7 +154,7 @@ namespace mbts.spark {
|
||||
TimeTextTuple.FromDateTime(DateTime.Today),
|
||||
TimeTextTuple.FromDateTime(DateTime.Today.AddDays(1)))
|
||||
},
|
||||
settings.sorting_criterion);
|
||||
settings.sorting_criteria);
|
||||
// resources/subscriptions
|
||||
_dispose = new CompositeDisposable(
|
||||
ObservableAutoWrapper.connect(col_tups, columns, ct => ct.col),
|
||||
@@ -209,8 +209,8 @@ namespace mbts.spark {
|
||||
public FillsFilterStates get_filters() =>
|
||||
_rows_manager.get_filters();
|
||||
|
||||
public IEnumerable<SortingCriteria> get_sorting_criterion() =>
|
||||
_rows_manager.get_sorting_criterion();
|
||||
public IEnumerable<SortingCriteria> get_sorting_criteria() =>
|
||||
_rows_manager.get_sorting_criteria();
|
||||
|
||||
public void on_sorting(object sender, DIYGridSortingEventArgs e) =>
|
||||
_rows_manager.on_sorting(e);
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace mbts.spark {
|
||||
public override UIElement Content => _view;
|
||||
public override IEnumerable<SparkCommand> Commands => _commands;
|
||||
|
||||
public override FillsSettings SaveState => _state = new FillsSettings(_state.orders, _vm.get_sorting_criterion().ToList(), _vm.get_filters(), _vm.get_grid_save_state()) {
|
||||
public override FillsSettings SaveState => _state = new FillsSettings(_state.orders, _vm.get_sorting_criteria().ToList(), _vm.get_filters(), _vm.get_grid_save_state()) {
|
||||
menu_display = _menu_display_vm.safe_create()
|
||||
};
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ namespace bts.shell {
|
||||
readonly IBus _bus;
|
||||
readonly OrdersModel _orders_model;
|
||||
readonly UserSettingsHub _settings_hub;
|
||||
/// Fills 'sorting-criterion' settings were compromised a while back (mid-late 2018).
|
||||
/// Fills 'sorting-criteria' settings were compromised a while back (mid-late 2018).
|
||||
/// The issue was that, when a column was sorted, its 'sort member path' was assigned to the SortingCriteria.col_name,
|
||||
/// rather than the <see cref="Columns"/> enum/id string.
|
||||
/// This dictionary serves as a reverse-lookup so the sort member path can be converted to the enum/id string.
|
||||
@@ -58,7 +58,7 @@ namespace bts.shell {
|
||||
_bus.post(SparkTags.ShowWindow, await load(state));
|
||||
|
||||
IShellWindow _create(FillsSettings state) {
|
||||
GridSettingsHelper.normalize_sorting_criterion(state.sorting_criterion, _sort_member_to_id);
|
||||
GridSettingsHelper.normalize_sorting_criteria(state.sorting_criteria, _sort_member_to_id);
|
||||
var settings_manager = new WindowSettingsManager<GridSettings>(_settings_hub,
|
||||
state.grid,
|
||||
get: us => us.fills_grid,
|
||||
|
||||
@@ -34,9 +34,9 @@ namespace bts.shell.fills {
|
||||
this.grid = grid;
|
||||
}
|
||||
|
||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
|
||||
public static GridSettings MiniGridSettings => GridSettings.Default.with(DefaultColumns.Mini.all, DefaultColumns.Mini.sorting_criterion);
|
||||
public IReadOnlyList<SortingCriteria> sorting_criterion => _sorting_criteria ?? (_sorting_criteria = DefaultColumns.default_sorting_criterion.ToList());
|
||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criteria);
|
||||
public static GridSettings MiniGridSettings => GridSettings.Default.with(DefaultColumns.Mini.all, DefaultColumns.Mini.sorting_criteria);
|
||||
public IReadOnlyList<SortingCriteria> sorting_criteria => _sorting_criteria ?? (_sorting_criteria = DefaultColumns.default_sorting_criteria.ToList());
|
||||
public static FillsSettings Default() =>
|
||||
new FillsSettings(null, null, new FillsFilterStates(), null);
|
||||
|
||||
@@ -57,7 +57,7 @@ namespace bts.shell.fills {
|
||||
public static GridColumnSettings fill_key => new GridColumnSettings(col_id(Columns.FillKey), DefaultColumnHeaders.FillKey, width: DefaultColumnWidths.FillKey);
|
||||
public static GridColumnSettings order_key => new GridColumnSettings(col_id(Columns.OrderKey), DefaultColumnHeaders.OrderKey, width: DefaultColumnWidths.OrderKey);
|
||||
public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, is_visible: false, width: DefaultColumnWidths.SecurityKey);
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criterion {
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criteria {
|
||||
get {
|
||||
yield return new SortingCriteria(fill_time.id, false);
|
||||
}
|
||||
@@ -96,7 +96,7 @@ namespace bts.shell.fills {
|
||||
};
|
||||
|
||||
public static IEnumerable<GridColumnSettings> all => DefaultColumns.all.Select(_convert);
|
||||
public static IEnumerable<SortingCriteria> sorting_criterion => default_sorting_criterion.Where(c => _try_get_data(c.col_name, out (bool is_visible, double? _) d) && d.is_visible);
|
||||
public static IEnumerable<SortingCriteria> sorting_criteria => default_sorting_criteria.Where(c => _try_get_data(c.col_name, out (bool is_visible, double? _) d) && d.is_visible);
|
||||
|
||||
static bool _try_get_data(string id_str, out (bool is_visible, double? width_override) data) {
|
||||
if (Enum.TryParse(id_str, out Columns k) && _mini_cols_data.TryGetValue(k, out data))
|
||||
|
||||
@@ -635,8 +635,8 @@ namespace mbts.spark {
|
||||
if (s.mini_ob.value == null)
|
||||
s.mini_ob = new LadderMiniOrderBookSettings(bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general);
|
||||
#pragma warning disable CS0612 // Type or member is obsolete
|
||||
if (s.mini_ob.value.sorting_criterion.Count == 0)
|
||||
s.mini_ob = new LadderMiniOrderBookSettings(s.mini_ob.value.with(sorting_criterion: bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general.sorting_criterion));
|
||||
if (s.mini_ob.value.sorting_criteria.Count == 0)
|
||||
s.mini_ob = new LadderMiniOrderBookSettings(s.mini_ob.value.with(sorting_criteria: bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general.sorting_criteria));
|
||||
#pragma warning restore CS0612 // Type or member is obsolete
|
||||
s.row_height = LadderRender.measure_row_height(s);
|
||||
return s;
|
||||
|
||||
@@ -7,6 +7,7 @@ using bts.proto;
|
||||
using bts.shell.orderbook;
|
||||
using bts.utils;
|
||||
using mbts.collections;
|
||||
using mbts.spark.utilities;
|
||||
using mbts.ui;
|
||||
using mbts.ui.controls;
|
||||
using mbts.ui.controls.color_picker;
|
||||
@@ -115,7 +116,16 @@ namespace mbts.spark {
|
||||
foreach (var c in _observable_components)
|
||||
c.PropertyChanged += on_prop_changed;
|
||||
favorite_algos_vm.items.CollectionChanged += on_favorite_algo_items_CollectionChanged;
|
||||
_algo_definitions.AddRange(_model.factory.default_algos(security).Values.Select(algo_factory));
|
||||
_algo_definitions.AddRange(_model.get_permitted_algos(security).factory_types
|
||||
.Select(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable)
|
||||
.Select(AlgoData.from_custom_def)
|
||||
.Select(algo_factory));
|
||||
_algo_definitions.AddRange(_model.get_permitted_algos(security).dynamic_types
|
||||
.Select(dyn_type => new CustomOrderDefinitionImmutable(new CustomOrderDefinition {
|
||||
Dynamic = _model.dynamic_helper.create_def(dyn_type)
|
||||
}))
|
||||
.Select(AlgoData.from_custom_def)
|
||||
.Select(algo_factory));
|
||||
_dispose = new CompositeDisposable(
|
||||
_model.factory.subscribe_accounts().OnDispatcher().Subscribe(acc_map => {
|
||||
_accounts.SyncWithDictionary(MappedDictionary.create(acc_map, account_factory));
|
||||
@@ -144,7 +154,7 @@ namespace mbts.spark {
|
||||
c.PropertyChanged -= on_prop_changed;
|
||||
}
|
||||
AccountTuple? account_factory(uint key, string name) => new AccountTuple(key, name);
|
||||
AlgoDefinitionVM algo_factory(AlgoData data) => AlgoDefinitionVM.create(_model, data, is_synthetic ? AlgoFormats.Spreader : AlgoFormats.Exchange);
|
||||
AlgoDefinitionVM algo_factory(AlgoData data) => AlgoDefinitionVM.create(_model, data);
|
||||
}
|
||||
|
||||
public event Action result_changed;
|
||||
@@ -391,7 +401,7 @@ namespace mbts.spark {
|
||||
clone = SparkUtils.clone_proto(_current);
|
||||
#pragma warning disable CS0612 // Type or member is obsolete
|
||||
clone.mini_ob = new LadderMiniOrderBookSettings(_current.mini_ob.value != null ?
|
||||
mini_ob.create().with(sorting_criterion: _current.mini_ob.value.sorting_criterion) :
|
||||
mini_ob.create().with(sorting_criteria: _current.mini_ob.value.sorting_criteria) :
|
||||
mini_ob.create());
|
||||
#pragma warning restore CS0612 // Type or member is obsolete
|
||||
}
|
||||
|
||||
@@ -398,7 +398,8 @@ namespace mbts.spark {
|
||||
public uint last_column_width { get => _last_column_width.Value; set => _last_column_width.set(value); }
|
||||
public uint piq_column_width { get => _piq_column_width.Value; set => _piq_column_width.set(value); }
|
||||
public uint volume_column_width { get => _volume_column_width.Value; set => _volume_column_width.set(value); }
|
||||
public uint alternate_order_size_from_settings => current_settings.alternate_order_size;
|
||||
public uint actual_alternate_order_size =>
|
||||
(current_settings?.alternate_order_size ?? 0) * Math.Max(1, display_quantity_divisor);
|
||||
public bool show_warn_on_cross_from_settings => current_settings.show_warn_on_cross;
|
||||
public bool enforce_max_clip_from_settings => current_settings.enforce_max_clip;
|
||||
public uint max_clip_from_settings => current_settings.max_clip;
|
||||
@@ -489,11 +490,11 @@ namespace mbts.spark {
|
||||
public Task send_order_async((double price, Side? side, MouseButton button) args) {
|
||||
if (order_properties_vm != null && args.button != MouseButton.Middle) {
|
||||
var size_from_alternate = args.button == MouseButton.Right;
|
||||
if (!DoubleHelper.IsNaNOrInfinity(args.price) && args.side.HasValue && !HasErrors && !order_properties_vm.HasErrors && (!size_from_alternate || current_settings.alternate_order_size > 0)) {
|
||||
if (!DoubleHelper.IsNaNOrInfinity(args.price) && args.side.HasValue && !HasErrors && !order_properties_vm.HasErrors && (!size_from_alternate || actual_alternate_order_size > 0)) {
|
||||
if (!size_from_alternate && (!size_calculator.value.HasValue || size_calculator.value.Value == 0)) {
|
||||
size_calculator.flash_error();
|
||||
} else {
|
||||
uint size = size_from_alternate ? current_settings.alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0);
|
||||
uint size = size_from_alternate ? actual_alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0);
|
||||
// enforce max clip
|
||||
if (enforce_max_clip_from_settings && size > max_clip_from_settings) {
|
||||
size = max_clip_from_settings;
|
||||
@@ -530,7 +531,7 @@ namespace mbts.spark {
|
||||
if (fav_algo != null) {
|
||||
if (_favorite_algo_map.TryGetValue(fav_algo.key, out var d)) {
|
||||
if (!d.flags.HasFlag(LadderFavoriteAlgoFlags.Sticky) && !order_properties_vm.try_pop_selected_algo_definition()) {
|
||||
var key = new AlgoKey(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.ContractCase)));
|
||||
var key = new AlgoKey(OrderDataHelper.get_default_algo(security.ContractCase));
|
||||
if (order_properties_vm.try_get_algo_definition(key, out var r)) {
|
||||
order_properties_vm.selected_algo_definition = r;
|
||||
}
|
||||
|
||||
@@ -353,7 +353,9 @@ namespace mbts.spark {
|
||||
return;
|
||||
}
|
||||
} else if (_vm != null) {
|
||||
uint size = e.ChangedButton == MouseButton.Right ? _vm.alternate_order_size_from_settings : _vm.size_calculator.value ?? 0;
|
||||
uint size = e.ChangedButton == MouseButton.Right ?
|
||||
_vm.actual_alternate_order_size :
|
||||
_vm.size_calculator.value ?? 0;
|
||||
|
||||
// does the size violate the local max clip
|
||||
if (_vm.enforce_max_clip_from_settings && size > _vm.max_clip_from_settings) {
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace bts.shell.manual_fills {
|
||||
readonly Property<bool> _is_dirty;
|
||||
readonly Property<EditableItemState> _editable_item_state;
|
||||
readonly DelegateProperty<bool> _is_valid;
|
||||
readonly DisplayQuantityMultiplier _size = new DisplayQuantityMultiplier();
|
||||
readonly DisplayQuantityMultiplier<uint> _size = DisplayQuantityMultiplier.create_uint();
|
||||
readonly Func<SecurityImmutable?, uint> _get_display_qty_divisor;
|
||||
SecurityImmutable? _security;
|
||||
AccountTuple? _account;
|
||||
|
||||
@@ -8,16 +8,16 @@ namespace bts.shell.manual_fills {
|
||||
[ProtoContract]
|
||||
class ManualFillsSettings {
|
||||
[ProtoMember(1)]
|
||||
readonly SortingCriteria[] _sorting_criterion;
|
||||
readonly SortingCriteria[] _sorting_criteria;
|
||||
|
||||
public static ManualFillsSettings Default =>
|
||||
new ManualFillsSettings(new[] { new SortingCriteria(nameof(mbts.ui.spark.ManualFillsView.Columns.Security), true) });
|
||||
|
||||
public ManualFillsSettings() { }
|
||||
|
||||
public ManualFillsSettings(IEnumerable<SortingCriteria> sorting_criterion) =>
|
||||
_sorting_criterion = sorting_criterion.ToArray();
|
||||
public ManualFillsSettings(IEnumerable<SortingCriteria> sorting_criteria) =>
|
||||
_sorting_criteria = sorting_criteria.ToArray();
|
||||
|
||||
public IReadOnlyList<SortingCriteria> sorting_criterion => _sorting_criterion ?? Array.Empty<SortingCriteria>();
|
||||
public IReadOnlyList<SortingCriteria> sorting_criteria => _sorting_criteria ?? Array.Empty<SortingCriteria>();
|
||||
}
|
||||
}
|
||||
@@ -44,10 +44,10 @@ namespace bts.shell {
|
||||
var vm = ManualFillsVM.create(_bus, _orders_model);
|
||||
var view = new ManualFillsView { DataContext = vm };
|
||||
view.data_grid.Sorting += on_sorting;
|
||||
IReadOnlyList<SortingCriteria> last_sorting_criterion = Array.Empty<SortingCriteria>();
|
||||
IReadOnlyList<SortingCriteria> last_sorting_criteria = Array.Empty<SortingCriteria>();
|
||||
using (apply_sort()) {
|
||||
var col_sort_tuples =
|
||||
from sc in settings.sorting_criterion
|
||||
from sc in settings.sorting_criteria
|
||||
join col in view.data_grid.Columns on sc.col_name equals _col_id(col)
|
||||
select (col, sc);
|
||||
foreach (var (col, sc) in col_sort_tuples) {
|
||||
@@ -65,8 +65,8 @@ namespace bts.shell {
|
||||
new SparkCommandCommand("Delete Selected", Icons.Trash, vm.remove_selected_fills_cmd)
|
||||
};
|
||||
return (view, cmds, get_settings, Disposable.Create(
|
||||
vm.rows_view.subscribe_sorting_criterion(sm => view.data_grid.Columns.TryGetFirst(dc => dc.SortMemberPath == sm, out DataGridColumn match) ? _col_id(match) : null)
|
||||
.Subscribe(sc => last_sorting_criterion = sc),
|
||||
vm.rows_view.subscribe_sorting_criteria(sm => view.data_grid.Columns.TryGetFirst(dc => dc.SortMemberPath == sm, out DataGridColumn match) ? _col_id(match) : null)
|
||||
.Subscribe(sc => last_sorting_criteria = sc),
|
||||
vm));
|
||||
//
|
||||
void on_sorting(object sender, DataGridSortingEventArgs e) {
|
||||
@@ -102,7 +102,7 @@ namespace bts.shell {
|
||||
});
|
||||
|
||||
ManualFillsSettings get_settings() =>
|
||||
new ManualFillsSettings(last_sorting_criterion);
|
||||
new ManualFillsSettings(last_sorting_criteria);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
class OrderBookSortingData : IEquatable<OrderBookSortingData> {
|
||||
public readonly IReadOnlyList<SortingCriteria> sorting_criterion;
|
||||
public readonly IReadOnlyList<SortingCriteria> sorting_criteria;
|
||||
public readonly IComparer<OrderBookRowVM> comparer;
|
||||
public readonly string desc;
|
||||
|
||||
@@ -52,13 +52,13 @@ namespace mbts.spark {
|
||||
comp_builder.add(Comparer<OrderBookRowVM>.Create((l, r) => l.order_key.CompareTo(r.order_key)));
|
||||
}
|
||||
comparer = comp_builder.to_comparer();
|
||||
sorting_criterion = column_sorting_hierarchy.Select(col => new SortingCriteria(col.id, col.SortDirection.GetValueOrDefault() == ListSortDirection.Ascending)).ToArray();
|
||||
desc = string.Join(", ", sorting_criterion);
|
||||
sorting_criteria = column_sorting_hierarchy.Select(col => new SortingCriteria(col.id, col.SortDirection.GetValueOrDefault() == ListSortDirection.Ascending)).ToArray();
|
||||
desc = string.Join(", ", sorting_criteria);
|
||||
}
|
||||
|
||||
public bool Equals(OrderBookSortingData other) => other != null && EqualityComparer.safe_sequence_equals(sorting_criterion, other.sorting_criterion);
|
||||
public bool Equals(OrderBookSortingData other) => other != null && EqualityComparer.safe_sequence_equals(sorting_criteria, other.sorting_criteria);
|
||||
public override bool Equals(object obj) => base.Equals(obj);
|
||||
public override int GetHashCode() => EqualityComparer.aggregate_hash(sorting_criterion);
|
||||
public override int GetHashCode() => EqualityComparer.aggregate_hash(sorting_criteria);
|
||||
public override string ToString() => desc;
|
||||
}
|
||||
|
||||
@@ -393,7 +393,7 @@ namespace mbts.spark {
|
||||
};
|
||||
|
||||
public (FilterStates filters, IReadOnlyList<SortingCriteria> sorting) create() =>
|
||||
(create_filter_states(), get_sorting_data().sorting_criterion);
|
||||
(create_filter_states(), get_sorting_data().sorting_criteria);
|
||||
|
||||
public void load_from((FilterStates filters, IReadOnlyList<SortingCriteria> sorting) state) {
|
||||
if (state.filters is FilterStates fs) {
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace mbts.spark {
|
||||
int _depth_level;
|
||||
SecurityImmutable? _security => order_tuple.order.security;
|
||||
// for mini-ob
|
||||
DisplayQuantityMultiplier _prospective_qty_translator_backing;
|
||||
DisplayQuantityMultiplier<uint> _prospective_qty_translator_backing;
|
||||
uint _display_qty_divisor_backing;
|
||||
bool _display_qty_divisor_dirty = true;
|
||||
double _prospective_price;
|
||||
@@ -239,10 +239,9 @@ namespace mbts.spark {
|
||||
IDisplayTranslator<uint> _prospective_qty_translator {
|
||||
get {
|
||||
if (_prospective_qty_translator_backing == null) {
|
||||
_prospective_qty_translator_backing = new DisplayQuantityMultiplier {
|
||||
conversion_data = new QuantityConversionData(_display_qty_divisor, QuantityConversionData.OpType.DivideActual),
|
||||
actual_value = quantity
|
||||
};
|
||||
_prospective_qty_translator_backing = DisplayQuantityMultiplier.create_uint();
|
||||
_prospective_qty_translator_backing.conversion_data = new QuantityConversionData(_display_qty_divisor, QuantityConversionData.OpType.DivideActual);
|
||||
_prospective_qty_translator_backing.actual_value = quantity;
|
||||
_prospective_qty_translator.value_changed += () =>
|
||||
RaisePropertyChanged(nameof(is_qty_dirty));
|
||||
} else {
|
||||
|
||||
@@ -86,7 +86,7 @@ namespace mbts.spark {
|
||||
_model = model;
|
||||
_selected_params_mon = new OrderParamsAggregator(model.dynamic_helper, _selection_change_throttle, k => _cached_orders.TryGetValue(k, out var o) ? o.order : (OrderSecurityAlgo?)null);
|
||||
ladder_vm = new LadderVMContainer(bus, model);
|
||||
order_mod_vm = new OrderParamsVM(this, AlgoFormats.Exchange, AlgoEditingPermissions.AllowEditValues);
|
||||
order_mod_vm = new OrderParamsVM(this, AlgoEditingPermissions.AllowEditValues);
|
||||
order_mod_vm.algo_vm.editing_permissions_mask = AlgoEditingPermissions.None;
|
||||
order_mod_vm.algo_vm.algo_root = null;
|
||||
_show_order_params = backing(nameof(show_order_params), () => (_right_panel.visible_components & OrderBookRightPanelSettings.Components.Params) != 0);
|
||||
@@ -99,7 +99,7 @@ namespace mbts.spark {
|
||||
};
|
||||
_can_attach_selected_orders = backing(nameof(can_attach_selected_orders), () => _attachable_selected_orders.Count == selected_rows.Count && selected_rows.Count > 0);
|
||||
_can_detach_selected_orders = backing(nameof(can_detach_selected_orders), () => _detachable_selected_orders.Count == selected_rows.Count && selected_rows.Count > 0);
|
||||
attach_vm = new OrderParamsVM(this, AlgoFormats.Attachable, AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowEditValues);
|
||||
attach_vm = new OrderParamsVM(this, AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowEditValues);
|
||||
_settings_manager = settings_manager;
|
||||
_columns = new OrderBookColumnCollection(bus, model, model.on_order_securities.Select(x => (x.added.Values, x.removed.Values)));
|
||||
// we use an ObservableAppendCollection b/c the mini-ob needs a cancel column at the front
|
||||
@@ -244,7 +244,22 @@ namespace mbts.spark {
|
||||
}),
|
||||
grid_settings_manager,
|
||||
order_mod_vm.algo_vm.connect_data(Observable.Return(model)),
|
||||
order_mod_vm.algo_vm.connect_data(_selected_params_mon.subscribe_spreader_security()),
|
||||
order_mod_vm.algo_vm.connect_data(
|
||||
/// This is not the same security source used to populate <see cref="OrderParamsVM.security_md"/>.
|
||||
/// The latter is always synced with the root of the selected row(s),
|
||||
/// while this source is synced with that row with one exception:
|
||||
/// If the root row's algo has a spreader algo (possibly nested),
|
||||
/// the synthetic security is taken instead of the root security.
|
||||
/// This has the affect of passing the synthetic security to the spreader algo viewmodel,
|
||||
/// which then uses the security to populate the synthetic params ui.
|
||||
/// TODO (maybe): clean this design up; the different security sources make it precarious.
|
||||
/// One idea is to pass a special data type to the algo vm (which contains the spreader
|
||||
/// security and execution strategy), which is only observed by the spreader algo vm.
|
||||
_selected_params_mon.subscribe_security().StartWith((SecurityImmutable?)null).CombineLatest(
|
||||
_selected_params_mon.subscribe_spreader_security().StartWith((SecurityImmutable?)null),
|
||||
(root_sec, spreader_sec) => (root_sec, spreader_sec))
|
||||
.Select(tup => tup.spreader_sec ?? tup.root_sec)
|
||||
.OnDispatcher()),
|
||||
order_mod_vm,
|
||||
attach_vm,
|
||||
_show_fills.observe_current(true)
|
||||
@@ -329,32 +344,32 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
void on_begin_attaching() {
|
||||
Disposable.replace(ref attach_vm_hooks,
|
||||
Disposable.Create(
|
||||
connect_common_selected_params(attach_vm),
|
||||
attach_vm.algo_vm.observe_algo_root().Subscribe(algo_root => {
|
||||
bool show_price, show_size;
|
||||
if (algo_root == null) {
|
||||
show_price = false;
|
||||
show_size = false;
|
||||
} else {
|
||||
show_price = AttachConf.show_price(algo_root.order_type);
|
||||
show_size = AttachConf.show_size(algo_root.order_type);
|
||||
}
|
||||
attach_vm.price_permissions = bool_to_perm(show_price);
|
||||
attach_vm.size_permissions = bool_to_perm(show_size);
|
||||
AlgoParamPermissions bool_to_perm(bool b) =>
|
||||
b ? AlgoParamPermissions.ReadWrite : AlgoParamPermissions.None;
|
||||
}),
|
||||
// custom templates (created by user)
|
||||
_model.algo_model.definitions.OnDispatcher().Subscribe(u =>
|
||||
AlgoCollectionHelper.update_persisted_definition_wrappers(attach_vm.algo_vm.algo_roots_index, u, mk_algo_def_vm))));
|
||||
// vm factory
|
||||
AlgoDefinitionVM mk_algo_def_vm(AlgoData fd) {
|
||||
var vm = AlgoDefinitionVM.create(_model, fd, OrderDataHelper.get_algo_format(_selected_params_mon.security?.ContractCase), AlgoEditingPermissions.AllowEditValues);
|
||||
vm.selected_format = OrderDataHelper.get_algo_format(_selected_params_mon.security?.ContractCase);
|
||||
return vm;
|
||||
}
|
||||
Disposable.dispose(ref attach_vm_hooks);
|
||||
attach_vm_hooks = Disposable.Create(
|
||||
_selected_security_mon.SubscribeThrottled(_selection_change_throttle).to_security_md(bus).OnDispatcher().SubscribeEach(newval => {
|
||||
attach_vm.security_md = newval;
|
||||
if (newval.HasValue) {
|
||||
return _model.subscribe_algos(newval.Value.security, true)
|
||||
.OnDispatcher()
|
||||
.Subscribe(t => ((IAlgoSelector)attach_vm.algo_vm).load_algo_data(t.state, null));
|
||||
}
|
||||
return null;
|
||||
}),
|
||||
connect_common_selected_params(attach_vm),
|
||||
attach_vm.algo_vm.observe_algo_root().Subscribe(algo_root => {
|
||||
bool show_price, show_size;
|
||||
if (algo_root == null) {
|
||||
show_price = false;
|
||||
show_size = false;
|
||||
} else {
|
||||
show_price = AttachConf.show_price(algo_root.order_type);
|
||||
show_size = AttachConf.show_size(algo_root.order_type);
|
||||
}
|
||||
attach_vm.price_permissions = bool_to_perm(show_price);
|
||||
attach_vm.size_permissions = bool_to_perm(show_size);
|
||||
AlgoParamPermissions bool_to_perm(bool b) =>
|
||||
b ? AlgoParamPermissions.ReadWrite : AlgoParamPermissions.None;
|
||||
}));
|
||||
}
|
||||
void on_end_attaching() => Disposable.dispose(ref attach_vm_hooks);
|
||||
|
||||
@@ -365,11 +380,11 @@ namespace mbts.spark {
|
||||
modify_selected_orders_async_cmd.RaiseCanExecuteChanged();
|
||||
revert_selected_orders_cmd.RaiseCanExecuteChanged();
|
||||
}),
|
||||
_selected_params_mon.subscribe_security().to_security_md(bus).OnDispatcher().Subscribe(newval => order_mod_vm.security_md = newval),
|
||||
connect_common_selected_params(order_mod_vm));
|
||||
|
||||
IDisposable connect_common_selected_params(OrderParamsVM vm) =>
|
||||
Disposable.Create(
|
||||
_selected_params_mon.subscribe_security().OnDispatcher().to_security_md(bus).OnDispatcher().Subscribe(newval => vm.security_md = newval),
|
||||
_selected_params_mon.subscribe_price().OnDispatcher().Subscribe(vm.on_common_price),
|
||||
_selected_params_mon.subscribe_size().OnDispatcher().Subscribe(vm.on_common_size),
|
||||
_selected_params_mon.subscribe_account().OnDispatcher().Subscribe(newval => vm.selected_account = newval));
|
||||
@@ -591,7 +606,7 @@ namespace mbts.spark {
|
||||
_columns.filter_changed -= _on_filter_changed;
|
||||
grid_settings_manager.algo_tree_display_mode_changed -= _on_filter_changed;
|
||||
#pragma warning disable CS0612 // Type or member is obsolete
|
||||
_columns.load_from((state.filters, (state.orderbook_grid?.general ?? OrderBookStartupData.DefaultGrid.general).sorting_criterion));
|
||||
_columns.load_from((state.filters, (state.orderbook_grid?.general ?? OrderBookStartupData.DefaultGrid.general).sorting_criteria));
|
||||
#pragma warning restore CS0612 // Type or member is obsolete
|
||||
// resume column filter updates
|
||||
_columns.filter_changed += _on_filter_changed;
|
||||
@@ -724,7 +739,7 @@ namespace mbts.spark {
|
||||
static OrderBookFillsGridSettings _get_fills_settings(FillsVM fills_vm) =>
|
||||
fills_vm == null ? OrderBookStartupData.DefaultFillsGrid :
|
||||
new OrderBookFillsGridSettings {
|
||||
sorting_criterion = fills_vm.get_sorting_criterion().ToList(),
|
||||
sorting_criteria = fills_vm.get_sorting_criteria().ToList(),
|
||||
filters = fills_vm.get_filters(),
|
||||
general = fills_vm.grid_settings_manager.create()
|
||||
};
|
||||
@@ -807,12 +822,11 @@ namespace mbts.spark {
|
||||
_size_permissions = AlgoParamPermissions.ReadOnly | AlgoParamPermissions.Write;
|
||||
SecurityMD? _security_md;
|
||||
|
||||
public OrderParamsVM(OrderBookVM owner, AlgoFormats init_format, AlgoEditingPermissions init_permissions) {
|
||||
public OrderParamsVM(OrderBookVM owner, AlgoEditingPermissions init_permissions) {
|
||||
_owner = owner;
|
||||
algo_vm = AlgoDefinitionVM.create(
|
||||
owner._model,
|
||||
AlgoData.create_unpersisted(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(CustomOrderDefinition.CustomOneofCase.Iceberg), CustomOrderDefinition.CustomOneofCase.Iceberg.display_name()),
|
||||
init_format: init_format,
|
||||
editing_permissions: init_permissions);
|
||||
_accounts = backing(
|
||||
nameof(selected_account),
|
||||
@@ -879,6 +893,7 @@ namespace mbts.spark {
|
||||
public ReadOnlyObservableCollection<AccountTuple> accounts => _accounts.items;
|
||||
public AccountTuple? selected_account { get => _accounts.selected_item; set => _accounts.selected_item = value; }
|
||||
public SecurityImmutable? security => _owner._selected_params_mon.security;
|
||||
/// <see cref="security_md"/> should be synced with the root of the selected row(s),
|
||||
public SecurityMD? security_md {
|
||||
get => _security_md;
|
||||
set {
|
||||
|
||||
@@ -12,9 +12,9 @@ namespace bts.shell.orderbook {
|
||||
[ProtoMember(2)]
|
||||
public FillsFilterStates filters { get; set; }
|
||||
[ProtoMember(3)]
|
||||
public List<SortingCriteria> sorting_criterion { get; set; }
|
||||
public List<SortingCriteria> sorting_criteria { get; set; }
|
||||
|
||||
public FillsSettings to_startup_data() =>
|
||||
new FillsSettings(null, sorting_criterion, filters, general);
|
||||
new FillsSettings(null, sorting_criteria, filters, general);
|
||||
}
|
||||
}
|
||||
@@ -82,9 +82,9 @@ namespace bts.shell.orderbook {
|
||||
algo_tree_display_mode = gs.algo_tree_display_mode;
|
||||
}
|
||||
|
||||
public OrderBookGridSettings create(IEnumerable<SortingCriteria> sorting_criterion) {
|
||||
public OrderBookGridSettings create(IEnumerable<SortingCriteria> sorting_criteria) {
|
||||
var gs = core_manager.create();
|
||||
gs.general = gs.general.with(sorting_criterion: sorting_criterion);
|
||||
gs.general = gs.general.with(sorting_criteria: sorting_criteria);
|
||||
gs.algo_tree_display_mode = _algo_tree_display_mode;
|
||||
return gs;
|
||||
}
|
||||
|
||||
@@ -133,15 +133,15 @@ namespace bts.shell.orderbook {
|
||||
get {
|
||||
var default_fills = FillsSettings.Default();
|
||||
var rv = new OrderBookFillsGridSettings {
|
||||
sorting_criterion = default_fills.sorting_criterion.ToList(),
|
||||
sorting_criteria = default_fills.sorting_criteria.ToList(),
|
||||
filters = default_fills.filters,
|
||||
general = FillsSettings.MiniGridSettings
|
||||
};
|
||||
return rv;
|
||||
}
|
||||
}
|
||||
static GridSettings _default_general_grid => GridSettings.Default.with(DefaultColumns.standard, DefaultColumns.sorting_criterion);
|
||||
public static OrderBookGridSettings default_mini_grid => new OrderBookGridSettings(GridSettings.Default.with(DefaultColumns.mini, DefaultColumns.sorting_criterion)) {
|
||||
static GridSettings _default_general_grid => GridSettings.Default.with(DefaultColumns.standard, DefaultColumns.sorting_criteria);
|
||||
public static OrderBookGridSettings default_mini_grid => new OrderBookGridSettings(GridSettings.Default.with(DefaultColumns.mini, DefaultColumns.sorting_criteria)) {
|
||||
algo_tree_display_mode = AlgoTreeDisplayMode.RootAndLeafNodes
|
||||
};
|
||||
|
||||
@@ -179,7 +179,7 @@ namespace bts.shell.orderbook {
|
||||
public static GridColumnSettings edit_price => new GridColumnSettings(Columns.EditablePrice.ToString(), DIYGrid.DefaultColumnHeaders.Price, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.EditablePrice);
|
||||
public static GridColumnSettings commit => new GridColumnSettings(Columns.Commit.ToString(), width: DIYGrid.DefaultColumnWidths.MiniOrderBook.Commit);
|
||||
|
||||
public static IEnumerable<SortingCriteria> sorting_criterion {
|
||||
public static IEnumerable<SortingCriteria> sorting_criteria {
|
||||
get {
|
||||
yield return new SortingCriteria(time_created.id, false);
|
||||
}
|
||||
|
||||
@@ -64,9 +64,9 @@ namespace bts.shell {
|
||||
this.grid = grid;
|
||||
}
|
||||
|
||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
|
||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criteria);
|
||||
|
||||
public IReadOnlyList<SortingCriteria> sorting_criterion => _sort_criteria ?? (_sort_criteria = DefaultColumns.default_sorting_criterion.ToList());
|
||||
public IReadOnlyList<SortingCriteria> sorting_criteria => _sort_criteria ?? (_sort_criteria = DefaultColumns.default_sorting_criteria.ToList());
|
||||
public static PAndLStartupData Default() =>
|
||||
new PAndLStartupData(null, new FilterStates(), pnl_calc_type.midpoint);
|
||||
|
||||
@@ -100,7 +100,7 @@ namespace bts.shell {
|
||||
public static GridColumnSettings pnl_price => new GridColumnSettings(col_id(Columns.PNLPrice), DefaultColumnHeaders.PnLPrice, width: DefaultColumnWidths.PnL_Generic, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
|
||||
public static GridColumnSettings has_day_trades => new GridColumnSettings(col_id(Columns.TradedToday), "Traded Today", width: 100, horizontal_alignment: System.Windows.HorizontalAlignment.Center);
|
||||
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criterion {
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criteria {
|
||||
get {
|
||||
yield return new SortingCriteria(account.id, true);
|
||||
yield return new SortingCriteria(exchange.id, true);
|
||||
|
||||
@@ -637,7 +637,7 @@ namespace bts.shell.pnl {
|
||||
public static (double default_cpp, double? override_cpp) pnl_cpp_tuple(this PNLUnitImmutable pnl_unit, SecurityImmutable security) {
|
||||
// TODO: actual impl
|
||||
double calced_pnl = PNLICEHelper.get_cpp(pnl_unit,security);
|
||||
return (calced_pnl, /*pnl_unit.HasCppOverride ? pnl_unit.CppOverride.Value : */(double?)null);
|
||||
return (calced_pnl, pnl_unit.HasCppOverride ? pnl_unit.CppOverride.Value : (double?)null);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -59,8 +59,6 @@ static class PNLICEHelper{
|
||||
|
||||
public static double get_cpp (PNLUnitImmutable pnl,
|
||||
SecurityImmutable sec){
|
||||
if(sec.Symbol == "HHD")
|
||||
Console.WriteLine("yes!");
|
||||
if (sec.HasGlbx)
|
||||
return pnl.CashValue;
|
||||
else if (sec.HasIce){
|
||||
|
||||
@@ -85,14 +85,14 @@ namespace bts.shell {
|
||||
Func<PNLSaveState> get_save_state = () => {
|
||||
var cols = cached_columns.ToArray(c => c.create());
|
||||
var filters = vm.get_filters_states();
|
||||
var sorting_criterion = vm.sorting_hierarchy.Select(tup => new SortingCriteria(tup.key.ToString(), tup.direction == ListSortDirection.Ascending)).ToArray();
|
||||
var sorting_criteria = vm.sorting_hierarchy.Select(tup => new SortingCriteria(tup.key.ToString(), tup.direction == ListSortDirection.Ascending)).ToArray();
|
||||
var calc_type = vm.calculation_type;
|
||||
var state = settings_manager.instance_settings;
|
||||
if (state == null) {
|
||||
// don't use defaults if the user manipulated the window state outside of the settings dialog (e.g., resized column(s) via drag, or changed sort/filter)
|
||||
var defaults = settings_manager.default_settings;
|
||||
if (calc_type == defaults.calculation_type &&
|
||||
defaults.sorting_criterion.SequenceEqual(sorting_criterion) &&
|
||||
defaults.sorting_criteria.SequenceEqual(sorting_criteria) &&
|
||||
defaults.grid.columns.SequenceEqual(cols) && defaults.filters.safe_equals(filters)) {
|
||||
// the user's current state still matches the defaults (i.e., no outside manipulation was performed); return null so this window will use the latest default settings when restored
|
||||
return new PNLSaveState { use_defaults = true, settings = null };
|
||||
@@ -101,7 +101,7 @@ namespace bts.shell {
|
||||
}
|
||||
// assign latest values, as they may have be modified outside of the settings dialog (in which case the settings manager would be out of date)
|
||||
state = state.with(
|
||||
sorting_criterion,
|
||||
sorting_criteria,
|
||||
vm.anchors,
|
||||
filters,
|
||||
state.grid.with(columns: cols, background: vm.grid_background_color.rgb_color()),
|
||||
|
||||
@@ -80,7 +80,7 @@ namespace bts.shell.pnl {
|
||||
};
|
||||
|
||||
[ProtoMember(1)]
|
||||
SortingCriteria[] _sorting_criterion;
|
||||
SortingCriteria[] _sorting_criteria;
|
||||
[ProtoMember(5)]
|
||||
Columns[] _anchors;
|
||||
[ProtoMember(7)]
|
||||
@@ -106,7 +106,7 @@ namespace bts.shell.pnl {
|
||||
|
||||
public static PNLSettings Default =>
|
||||
new PNLSettings {
|
||||
_sorting_criterion = new[] {
|
||||
_sorting_criteria = new[] {
|
||||
new SortingCriteria(nameof(Columns.Account), true),
|
||||
new SortingCriteria(nameof(Columns.Security), true)
|
||||
},
|
||||
@@ -154,7 +154,7 @@ namespace bts.shell.pnl {
|
||||
public static GridSettings DefaultGridSettings =>
|
||||
GridSettings.Default.with(
|
||||
DefaultColumns.all,
|
||||
DefaultColumns.default_sorting_criterion,
|
||||
DefaultColumns.default_sorting_criteria,
|
||||
enable_background_color: true);
|
||||
|
||||
public static fills.FillsSettings DefaultAuxiliaryFills {
|
||||
@@ -289,8 +289,8 @@ namespace bts.shell.pnl {
|
||||
public PNLCellAppearance header_defaults => header_cell_appearance.to_appearance().merge(grid_defaults);
|
||||
public IReadOnlyList<PNLAnimationTriggerData> header_row_animations => _header_row_animations ?? (_header_row_animations = default_header_row_animations.ToArray());
|
||||
//
|
||||
public IReadOnlyList<SortingCriteria> sorting_criterion =>
|
||||
_sorting_criterion ?? (_sorting_criterion = DefaultColumns.default_sorting_criterion.ToArray());
|
||||
public IReadOnlyList<SortingCriteria> sorting_criteria =>
|
||||
_sorting_criteria ?? (_sorting_criteria = DefaultColumns.default_sorting_criteria.ToArray());
|
||||
|
||||
PNLCellAppearanceProto _grid_cell_appearance => _grid_cell_appearance_backing ?? (
|
||||
_grid_cell_appearance_backing = new PNLCellAppearanceProto {
|
||||
@@ -305,7 +305,7 @@ namespace bts.shell.pnl {
|
||||
});
|
||||
|
||||
public PNLSettings with(
|
||||
IEnumerable<SortingCriteria> sorting_criterion = null,
|
||||
IEnumerable<SortingCriteria> sorting_criteria = null,
|
||||
IEnumerable<Columns> anchors = null,
|
||||
FilterStates filters = null,
|
||||
GridSettings grid = null,
|
||||
@@ -323,7 +323,7 @@ namespace bts.shell.pnl {
|
||||
header_row_display = header_row_display ?? this.header_row_display,
|
||||
// row operators (anchors, sorting, filters)
|
||||
_anchors = (anchors ?? _anchors.empty_if_null()).ToArray(),
|
||||
_sorting_criterion = (sorting_criterion ?? _sorting_criterion.empty_if_null()).ToArray(),
|
||||
_sorting_criteria = (sorting_criteria ?? _sorting_criteria.empty_if_null()).ToArray(),
|
||||
filters = filters ?? this.filters,
|
||||
// cell appearance (group/header)
|
||||
_group_background_colors = _group_background_colors?.ToList(),
|
||||
@@ -349,7 +349,7 @@ namespace bts.shell.pnl {
|
||||
data_formatting.safe_equals(other.data_formatting) &&
|
||||
// row operators (anchors, sorting, filters)
|
||||
anchors.SequenceEqual(other.anchors) &&
|
||||
sorting_criterion.SequenceEqual(other.sorting_criterion) &&
|
||||
sorting_criteria.SequenceEqual(other.sorting_criteria) &&
|
||||
filters.safe_equals(other.filters) &&
|
||||
// cell appearance (group/header)
|
||||
group_background_colors.SequenceEqual(other.group_background_colors) &&
|
||||
@@ -431,7 +431,7 @@ namespace bts.shell.pnl {
|
||||
public static GridColumnSettings settlement_price => new GridColumnSettings(nameof(Columns.SettlementPrice), DefaultColumnHeaders.Settlement, false, width: DefaultColumnWidths.Settlement, horizontal_alignment: HorizontalAlignment.Right);
|
||||
public static GridColumnSettings pnl_price => new GridColumnSettings(nameof(Columns.PNLPrice), DefaultColumnHeaders.PnLPrice, width: DefaultColumnWidths.Price, horizontal_alignment: HorizontalAlignment.Right);
|
||||
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criterion {
|
||||
public static IEnumerable<SortingCriteria> default_sorting_criteria {
|
||||
get {
|
||||
yield return new SortingCriteria(account.id, true);
|
||||
yield return new SortingCriteria(security.id, true);
|
||||
|
||||
@@ -118,7 +118,15 @@ namespace bts.shell.pnl {
|
||||
).FilterWithRaw(filter_src, PNLRowData.key_fn, null)
|
||||
.OnDispatcher()
|
||||
.Subscribe(_update),
|
||||
_symbols_source(pnl_source).OnDispatcher().Subscribe(symbol_filter_items_observer),
|
||||
// Note: the symbol filter items don't really need to be an IObservable
|
||||
// (the symbol items used to be extracted from the IObservable pnl_source).
|
||||
// It is only an IObservable now due to legacy; the filter was designed to observe incremental updates.
|
||||
// This is can be easily changed if need be.
|
||||
Observable.Return(
|
||||
TableUpdate<string, string>.mk_empty(sym => sym).with_added(
|
||||
SecurityHelper.get_all_display_symbols()))
|
||||
.OnDispatcher()
|
||||
.Subscribe(symbol_filter_items_observer),
|
||||
Disposable.Create(() => {
|
||||
foreach (var f in _all_filters)
|
||||
f.filter_changed -= _refresh_filter.execute;
|
||||
@@ -369,7 +377,7 @@ namespace bts.shell.pnl {
|
||||
}
|
||||
anchors.sync_with(settings.anchors);
|
||||
header_row_display = settings.header_row_display;
|
||||
sorting_hierarchy = DIYGridSortHelper.convert_sorting_criterion<ColumnKeys>(settings.sorting_criterion).ToList();
|
||||
sorting_hierarchy = DIYGridSortHelper.convert_sorting_criteria<ColumnKeys>(settings.sorting_criteria).ToList();
|
||||
// group background colors
|
||||
_group_background_converter = new AlternationConverter();
|
||||
_group_background_converter.Values.AddRange(settings.group_background_colors.Select(c => c.argb_color()));
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using bts;
|
||||
using bts.api;
|
||||
using bts.api.core;
|
||||
using bts.api.orderman;
|
||||
using bts.collections;
|
||||
using bts.spark;
|
||||
@@ -26,11 +27,13 @@ namespace mbts.spark.utilities {
|
||||
public readonly Func<CustomOrderDefinition, CustomOrderDefinition> get_child;
|
||||
public readonly Action<CustomOrderDefinition, CustomOrderDefinition> assign_child;
|
||||
|
||||
public ChildAlgoData(string name, Func<IMessage, CustomOrderDefinition> get_child_from_impl,
|
||||
Action<IMessage, CustomOrderDefinition> assign_child_to_impl,
|
||||
Func<CustomOrderDefinition, CustomOrderDefinition> get_child,
|
||||
Action<CustomOrderDefinition, CustomOrderDefinition> assign_child)
|
||||
{
|
||||
public ChildAlgoData(
|
||||
string name,
|
||||
Func<IMessage, CustomOrderDefinition> get_child_from_impl,
|
||||
Action<IMessage, CustomOrderDefinition> assign_child_to_impl,
|
||||
Func<CustomOrderDefinition, CustomOrderDefinition> get_child,
|
||||
Action<CustomOrderDefinition, CustomOrderDefinition> assign_child) {
|
||||
//
|
||||
this.name = name;
|
||||
this.get_child = get_child;
|
||||
this.assign_child = assign_child;
|
||||
@@ -46,13 +49,19 @@ namespace mbts.spark.utilities {
|
||||
static readonly OrderMetadata _default_order_metadata = new OrderMetadata { KeyBinding = "", Color = BTSColors.Orders.default_order };
|
||||
readonly AdminModel _admin_model;
|
||||
readonly DynamicOrderHelper _dynamic_helper;
|
||||
readonly IAlgoProvider _security_algo_provider;
|
||||
readonly IReadOnlyDictionary<OneOf<CustomOrderDefinition.CustomOneofCase, string>, string> _algo_abbreviation_index;
|
||||
readonly IReadOnlyDictionary<string, DynamicOrderDescriptor> _dynamic_descriptors;
|
||||
IDisposable _dispose;
|
||||
|
||||
[ImportingConstructor]
|
||||
public OrderFactory(AdminModel admin_model, DynamicOrderHelper dynamic_helper) {
|
||||
public OrderFactory(OrderService service, AdminModel admin_model, DynamicOrderHelper dynamic_helper, IAlgoProvider security_algo_provider) {
|
||||
_admin_model = admin_model;
|
||||
_dynamic_helper = dynamic_helper;
|
||||
_dynamic_descriptors = service.get_registered_dynamic_order_types(new VoidMessage())
|
||||
.DynamicOrderDesc
|
||||
.ToDictionary(d => d.DynamicOrderType);
|
||||
_security_algo_provider = security_algo_provider;
|
||||
var algo_name_index = new HashSet<OneOf<CustomOrderDefinition.CustomOneofCase, string>>(OneOf<CustomOrderDefinition.CustomOneofCase, string>.ValueEqualityComparer);
|
||||
// add standard types
|
||||
algo_name_index.AddRange(
|
||||
@@ -86,66 +95,13 @@ namespace mbts.spark.utilities {
|
||||
public IEnumerable<CustomOrderDefinition.CustomOneofCase> default_order_types() =>
|
||||
OrderDataHelper.exchange_order_types;
|
||||
|
||||
public IEnumerable<CustomOrderDefinition.CustomOneofCase> default_order_types(SecurityImmutable? security) =>
|
||||
security.HasValue ? default_order_types(security.Value) : OrderDataHelper.exchange_order_types;
|
||||
|
||||
public IEnumerable<CustomOrderDefinition.CustomOneofCase> default_order_types(SecurityImmutable security) {
|
||||
switch (security.ContractCase) {
|
||||
case Security.ContractOneofCase.Synthetic: return OrderDataHelper.spreader_order_types;
|
||||
default: return OrderDataHelper.exchange_order_types;
|
||||
}
|
||||
}
|
||||
|
||||
public IEnumerable<CustomOrderDefinition.CustomOneofCase> default_order_types(SecurityImmutable? security, bool is_child = false) =>
|
||||
security.HasValue ? default_order_types(security.Value, is_child) : default_order_types();
|
||||
|
||||
public IEnumerable<TimeInForce> default_time_in_forces() =>
|
||||
EnumHelper.get_values_except(TimeInForce.Undefined);
|
||||
|
||||
public IEnumerable<TimeInForce> default_time_in_forces(SecurityImmutable security, bool is_child = false) =>
|
||||
default_time_in_forces();
|
||||
|
||||
public IEnumerable<TimeInForce> default_time_in_forces(SecurityImmutable security, CustomOrderDefinition.CustomOneofCase order_type, bool is_child = false) {
|
||||
var tifs = default_time_in_forces(security, is_child);
|
||||
var tifs = EnumHelper.get_values_except(TimeInForce.Undefined);
|
||||
if (order_type != CustomOrderDefinition.CustomOneofCase.Limit) {
|
||||
tifs = tifs.Except(new[] { TimeInForce.Ioc });
|
||||
}
|
||||
return tifs;
|
||||
}
|
||||
|
||||
public IEnumerable<TimeInForce> default_time_in_forces(SecurityImmutable? security, bool is_child = false) =>
|
||||
security.HasValue ? default_time_in_forces(security.Value, is_child) : default_time_in_forces();
|
||||
|
||||
public LadderSettings default_ladder_settings(SecurityImmutable security) {
|
||||
var settings = LadderSettings.Default;
|
||||
if (security.ContractCase == Security.ContractOneofCase.Synthetic)
|
||||
settings.default_order_type = CustomOrderDefinition.CustomOneofCase.Spreader;
|
||||
return settings;
|
||||
}
|
||||
|
||||
public Dictionary<AlgoKey, AlgoData> default_algos() =>
|
||||
default_algos((SecurityImmutable?)null);
|
||||
|
||||
public Dictionary<AlgoKey, AlgoData> default_algos(SecurityImmutable? security) =>
|
||||
default_algos(default_order_types(security));
|
||||
|
||||
public Dictionary<AlgoKey, AlgoData> default_algos(AlgoFormats algo_format) =>
|
||||
default_algos(OrderDataHelper.get_format_algo_types(algo_format));
|
||||
|
||||
public Dictionary<AlgoKey, AlgoData> default_algos(IEnumerable<CustomOrderDefinition.CustomOneofCase> types) {
|
||||
var def_map = new Dictionary<AlgoKey, AlgoData>();
|
||||
foreach (var ot in types.Except(new[] { CustomOrderDefinition.CustomOneofCase.Dynamic, CustomOrderDefinition.CustomOneofCase.Composite })) {
|
||||
var data = AlgoData.from_custom_def(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable(ot));
|
||||
def_map[data.key] = data;
|
||||
}
|
||||
var dynamic_defs = new List<CustomOrderDefinitionImmutable>();
|
||||
_dynamic_helper.add_dynamic_order_defs(dynamic_defs, custom_order);
|
||||
foreach (var dd in dynamic_defs) {
|
||||
var data = AlgoData.from_custom_def(dd);
|
||||
def_map[data.key] = data;
|
||||
}
|
||||
return def_map;
|
||||
}
|
||||
#endregion
|
||||
|
||||
public OrderDefinitionImmutable order(SecurityImmutable security) =>
|
||||
@@ -156,7 +112,7 @@ namespace mbts.spark.utilities {
|
||||
SecurityKey = security.Id,
|
||||
Side = Side.Buy,
|
||||
TimeInForce = TimeInForce.Day,
|
||||
CustomDef = custom_order(),
|
||||
CustomDef = OrderDataHelper.Defaults.CustomOrderDefinition(),
|
||||
CtiCode = CTICode.CtiCode1,
|
||||
CustomerOrFirm = CustomerOrFirm.Firm,
|
||||
// this will be the tag 50 on CME orders
|
||||
@@ -173,9 +129,6 @@ namespace mbts.spark.utilities {
|
||||
return rv;
|
||||
}
|
||||
|
||||
public string abbreviate_algo(CustomOrderDefinitionImmutable defi) =>
|
||||
abbreviate_algo(_simple_algo_id(defi));
|
||||
|
||||
public string abbreviate_algo(OneOf<CustomOrderDefinition.CustomOneofCase, string> id) {
|
||||
if (id == null)
|
||||
throw new ArgumentNullException(nameof(id));
|
||||
@@ -187,26 +140,6 @@ namespace mbts.spark.utilities {
|
||||
}
|
||||
|
||||
// mutable definitions
|
||||
public CustomOrderDefinition custom_order() => OrderDataHelper.Defaults.CustomOrderDefinition();
|
||||
public MarketOrderDefinition market_order() => OrderDataHelper.Defaults.MarketOrderDefinition();
|
||||
public LimitOrderDefinition limit_order() => OrderDataHelper.Defaults.LimitOrderDefinition();
|
||||
public StopOrderDefinition stop_order() => OrderDataHelper.Defaults.StopOrderDefinition();
|
||||
public StopLimitOrderDefinition stop_limit_order() => OrderDataHelper.Defaults.StopLimitOrderDefinition();
|
||||
public GLBXIcebergOrderDefinition glbx_iceberg_order() => OrderDataHelper.Defaults.GLBXIcebergOrderDefinition();
|
||||
public IcebergOrderDefinition iceberg_order() => OrderDataHelper.Defaults.IcebergOrderDefinition();
|
||||
public TimeBoxOrderDefinition time_box_order() => OrderDataHelper.Defaults.TimeBoxOrderDefinition();
|
||||
public TickOrderDefinition tick_order() => OrderDataHelper.Defaults.TickOrderDefinition();
|
||||
public LeanOrderDefinition lean_order() => OrderDataHelper.Defaults.LeanOrderDefinition();
|
||||
public JoinOrderDefinition join_order() => OrderDataHelper.Defaults.JoinOrderDefinition();
|
||||
public TopOrderDefinition top_order() => OrderDataHelper.Defaults.TopOrderDefinition();
|
||||
public CoverOrderDefinition cover_order() => OrderDataHelper.Defaults.CoverOrderDefinition();
|
||||
public OCOOrderDefinition oco_order() => OrderDataHelper.Defaults.OCOOrderDefinition();
|
||||
public PricerOrderDefinition pricer_order() => OrderDataHelper.Defaults.PricerOrderDefinition();
|
||||
public OffsetOrderDefinition offset_order() => OrderDataHelper.Defaults.OffsetOrderDefinition();
|
||||
public TriggerOrderDefinition trigger_order() => OrderDataHelper.Defaults.TriggerOrderDefinition();
|
||||
public DynamicOrderDefinition dynamic_order() => OrderDataHelper.Defaults.DynamicOrderDefinition();
|
||||
public SpreaderOrderDefinition spreader_order() => OrderDataHelper.Defaults.SpreaderOrderDefinition();
|
||||
public SplitterOrderDefinition splitter_order() => OrderDataHelper.Defaults.SplitterOrderDefinition();
|
||||
public SpreaderOrderDefinition spreader_order(SecurityImmutable security, ExecutionStrategyImmutable strategy) =>
|
||||
new SpreaderOrderDefinition {
|
||||
Security = security.CloneToMutable(),
|
||||
@@ -214,40 +147,8 @@ namespace mbts.spark.utilities {
|
||||
};
|
||||
|
||||
// immutable definitions
|
||||
public CustomOrderDefinitionImmutable custom_orderi(CustomOrderDefinition.CustomOneofCase order_type) => new CustomOrderDefinitionImmutable(custom_order(order_type));
|
||||
public SpreaderOrderDefinitionImmutable spreader_orderi(SecurityImmutable security, ExecutionStrategyImmutable strategy) => new SpreaderOrderDefinitionImmutable(spreader_order(security, strategy));
|
||||
|
||||
public CustomOrderDefinition custom_order(CustomOrderDefinition.CustomOneofCase order_type) {
|
||||
var rv = new CustomOrderDefinition();
|
||||
switch (order_type) {
|
||||
case CustomOrderDefinition.CustomOneofCase.Market: rv.Market = market_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Limit: rv.Limit = limit_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Stop: rv.Stop = stop_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.StopLimit: rv.StopLimit = stop_limit_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.GlbxIceberg: rv.GlbxIceberg = glbx_iceberg_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Iceberg: rv.Iceberg = iceberg_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.TimeBox: rv.TimeBox = time_box_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Tick: rv.Tick = tick_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Lean: rv.Lean = lean_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Join: rv.Join = join_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Top: rv.Top = top_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Cover: rv.Cover = cover_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Oco: rv.Oco = oco_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Pricer: rv.Pricer = pricer_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Offset: rv.Offset = offset_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Trigger: rv.Trigger = trigger_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Spreader: rv.Spreader = spreader_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Splitter: rv.Splitter = splitter_order(); break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Dynamic: rv.Dynamic = dynamic_order(); break;
|
||||
//case CustomOrderDefinition.CustomOneofCase.QueueHolder: rv.QueueHolder = queue_holder_order(); break;
|
||||
default:
|
||||
OrderTypeVMFactory.GenericOrderFactory.setup_generic_custom_order(rv, order_type);
|
||||
break;
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
public OrderMetadata get_metadata(IMessage order_type_def) => get_metadata(OrderDataHelper.get_order_type(order_type_def));
|
||||
public OrderMetadata get_metadata(OrderRecordImmutable order) => get_metadata(order.Def.CustomDef.CustomCase);
|
||||
public OrderMetadata get_metadata(CustomOrderDefinition.CustomOneofCase order_type) {
|
||||
switch (order_type) {
|
||||
@@ -278,14 +179,6 @@ namespace mbts.spark.utilities {
|
||||
|
||||
public void Dispose() =>
|
||||
Disposable.dispose(ref _dispose);
|
||||
|
||||
static OneOf<CustomOrderDefinition.CustomOneofCase, string> _simple_algo_id(CustomOrderDefinitionImmutable defi) {
|
||||
switch (defi.CustomCase) {
|
||||
case CustomOrderDefinition.CustomOneofCase.Dynamic:
|
||||
return new OneOf<CustomOrderDefinition.CustomOneofCase, string>(defi.Dynamic.DynamicOrderType);
|
||||
default: return new OneOf<CustomOrderDefinition.CustomOneofCase, string>(defi.CustomCase);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static class OrderDataHelper {
|
||||
@@ -301,8 +194,6 @@ namespace mbts.spark.utilities {
|
||||
}
|
||||
}
|
||||
|
||||
public static OneofDescriptor oneof_descriptor => _oneof_desc;
|
||||
|
||||
const double _price_error_margin = 0.0000001;
|
||||
const decimal _price_error_margin_decimal = 0.0000001m;
|
||||
|
||||
@@ -320,10 +211,10 @@ namespace mbts.spark.utilities {
|
||||
});
|
||||
|
||||
public static readonly IComparer<decimal> PriceComparerDecimal = Comparer<decimal>.Create((a, b) => {
|
||||
decimal diff = a - b;
|
||||
if (diff <= _price_error_margin_decimal && diff >= -_price_error_margin_decimal)
|
||||
return 0;
|
||||
return diff > 0 ? 1 : -1;
|
||||
decimal diff = a - b;
|
||||
if (diff <= _price_error_margin_decimal && diff >= -_price_error_margin_decimal)
|
||||
return 0;
|
||||
return diff > 0 ? 1 : -1;
|
||||
});
|
||||
|
||||
const string _primary_child_field = "child";
|
||||
@@ -378,7 +269,7 @@ namespace mbts.spark.utilities {
|
||||
switch (cd.CustomCase) {
|
||||
case CustomOrderDefinition.CustomOneofCase.Composite: studio = cd.Composite.AlgoTemplateKey; break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Dynamic: dyn = cd.Dynamic.DynamicOrderType; break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Spreader: spreader_sec = cd.Spreader.Security.Id; break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Spreader: spreader_sec = cd.Spreader.Security?.Id ?? 0; break;
|
||||
}
|
||||
yield return (cd.CustomCase, dyn, studio, spreader_sec);
|
||||
}
|
||||
@@ -466,22 +357,6 @@ namespace mbts.spark.utilities {
|
||||
child_data.TryGetFirst(out best_match) ? best_match : (ChildAlgoData?)null;
|
||||
}
|
||||
|
||||
public static CustomOrderDefinition create_algo(CustomOrderDefinition.CustomOneofCase algo_type) {
|
||||
var algo = new CustomOrderDefinition();
|
||||
if (_algo_type_case_descriptor_data.TryGetValue(algo_type, out AlgoTypeCaseDescriptorData desc))
|
||||
desc.type_case_descriptor.Accessor.SetValue(algo, ProtoHelper.mutable_factory(ProtoHelper.get_field_type(desc.type_case_descriptor)));
|
||||
return algo;
|
||||
}
|
||||
|
||||
public static bool append_algo_node(CustomOrderDefinition target, CustomOrderDefinition.CustomOneofCase algo_type) {
|
||||
if (_algo_type_case_descriptor_data.TryGetValue(algo_type, out var desc)) {
|
||||
var node = ProtoHelper.mutable_factory(ProtoHelper.get_field_type(desc.type_case_descriptor));
|
||||
desc.type_case_descriptor.Accessor.SetValue(target, node);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static IReadOnlyList<ChildAlgoData> get_child_algo_data(CustomOrderDefinition.CustomOneofCase algo_type) =>
|
||||
_algo_type_case_descriptor_data.TryGetValue(algo_type, out AlgoTypeCaseDescriptorData d) ? d.child_algo_data : Array.Empty<ChildAlgoData>();
|
||||
#endregion
|
||||
@@ -535,122 +410,10 @@ namespace mbts.spark.utilities {
|
||||
}
|
||||
}
|
||||
|
||||
public static AlgoFormats get_algo_format(Security.ContractOneofCase? security_type) =>
|
||||
security_type.HasValue ? get_algo_format(security_type.Value) : AlgoFormats.Exchange;
|
||||
|
||||
public static AlgoFormats get_algo_format(Security.ContractOneofCase security_type) =>
|
||||
security_type == Security.ContractOneofCase.Synthetic ? AlgoFormats.Spreader : AlgoFormats.Exchange;
|
||||
|
||||
public static HashSet<CustomOrderDefinition.CustomOneofCase> get_format_algo_types(AlgoFormats f) {
|
||||
var rv = new HashSet<CustomOrderDefinition.CustomOneofCase>();
|
||||
if ((f & AlgoFormats.Exchange) == AlgoFormats.Exchange) {
|
||||
rv.AddRange(exchange_order_types);
|
||||
if ((f & AlgoFormats.Spreader) == AlgoFormats.Spreader) {
|
||||
rv.IntersectWith(spreader_order_types);
|
||||
}
|
||||
} else if ((f & AlgoFormats.Spreader) == AlgoFormats.Spreader) {
|
||||
rv.AddRange(spreader_order_types);
|
||||
}
|
||||
if ((f & AlgoFormats.Attachable) == AlgoFormats.Attachable)
|
||||
rv.AddRange(attachable_order_types);
|
||||
if ((f & AlgoFormats.DefaultPlaceholder) == AlgoFormats.DefaultPlaceholder)
|
||||
rv.Add(CustomOrderDefinition.CustomOneofCase.None);
|
||||
return rv;
|
||||
}
|
||||
|
||||
public static CustomOrderDefinition.CustomOneofCase get_default_algo(AlgoFormats f) {
|
||||
switch (f) {
|
||||
case AlgoFormats.Exchange: return CustomOrderDefinition.CustomOneofCase.Limit;
|
||||
case AlgoFormats.Spreader: return CustomOrderDefinition.CustomOneofCase.Spreader;
|
||||
default: return CustomOrderDefinition.CustomOneofCase.None;
|
||||
}
|
||||
}
|
||||
|
||||
public static IReadOnlyDictionary<AlgoKey, AlgoData> get_format_algo_data(AlgoFormats f) {
|
||||
var algo_types = get_format_algo_types(f);
|
||||
var algo_dict = algo_types.Select(at => AlgoData.from_custom_def(Defaults.CustomOrderDefinitionImmutable(at))).ToDictionaryCrushed(a => a.key);
|
||||
return algo_dict;
|
||||
}
|
||||
|
||||
public static HashSet<CustomOrderDefinition.CustomOneofCase> get_algo_types_present(CustomOrderDefinitionImmutable def) {
|
||||
return new HashSet<CustomOrderDefinition.CustomOneofCase>(impl(def.CloneToMutable()));
|
||||
// hide mutable-def implementation
|
||||
IEnumerable<CustomOrderDefinition.CustomOneofCase> impl(CustomOrderDefinition mdef) {
|
||||
yield return mdef.CustomCase;
|
||||
foreach (var sd in get_child_algo_data(mdef)) {
|
||||
var child = sd.get_child(mdef);
|
||||
if (child != null) {
|
||||
yield return child.CustomCase;
|
||||
foreach (var t in impl(child))
|
||||
yield return t;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static CustomOrderDefinitionImmutable? fit_to_type(CustomOrderDefinitionImmutable defi, Security.ContractOneofCase security_type, bool fit_all_to_spreader = false) {
|
||||
var mdef = defi.CloneToMutable();
|
||||
public static CustomOrderDefinition.CustomOneofCase get_default_algo(Security.ContractOneofCase security_type) {
|
||||
switch (security_type) {
|
||||
case Security.ContractOneofCase.Synthetic:
|
||||
mdef = spreader_impl(mdef);
|
||||
break;
|
||||
default:
|
||||
mdef = outright_impl(mdef);
|
||||
break;
|
||||
}
|
||||
if (mdef == null)
|
||||
return null;
|
||||
return new CustomOrderDefinitionImmutable(mdef);
|
||||
// local methods
|
||||
CustomOrderDefinition spreader_impl(CustomOrderDefinition def) {
|
||||
if (def == null) {
|
||||
def = new CustomOrderDefinition { Spreader = new SpreaderOrderDefinition() };
|
||||
} else {
|
||||
switch (def.CustomCase) {
|
||||
case CustomOrderDefinition.CustomOneofCase.Limit:
|
||||
case CustomOrderDefinition.CustomOneofCase.None:
|
||||
def = new CustomOrderDefinition { Spreader = new SpreaderOrderDefinition() };
|
||||
break;
|
||||
case CustomOrderDefinition.CustomOneofCase.Stop:
|
||||
case CustomOrderDefinition.CustomOneofCase.StopLimit:
|
||||
case CustomOrderDefinition.CustomOneofCase.Market:
|
||||
case CustomOrderDefinition.CustomOneofCase.GlbxIceberg:
|
||||
def = fit_all_to_spreader ? new CustomOrderDefinition { Spreader = new SpreaderOrderDefinition() } : null;
|
||||
break;
|
||||
default:
|
||||
var desc_data = _algo_type_case_descriptor_data[def.CustomCase];
|
||||
foreach (var cad in desc_data.child_algo_data) {
|
||||
var child = spreader_impl(cad.get_child(def));
|
||||
if (child == null)
|
||||
return null;
|
||||
var type_def = (IMessage)desc_data.type_case_descriptor.Accessor.GetValue(def);
|
||||
cad.assign_child_to_impl(type_def, child);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return def;
|
||||
}
|
||||
CustomOrderDefinition outright_impl(CustomOrderDefinition def) {
|
||||
if (def == null) {
|
||||
def = new CustomOrderDefinition { Limit = new LimitOrderDefinition() };
|
||||
} else {
|
||||
switch (def.CustomCase) {
|
||||
case CustomOrderDefinition.CustomOneofCase.Spreader:
|
||||
case CustomOrderDefinition.CustomOneofCase.None:
|
||||
def = new CustomOrderDefinition { Limit = new LimitOrderDefinition() };
|
||||
break;
|
||||
default:
|
||||
foreach (var cad in get_child_algo_data(def)) {
|
||||
var child = outright_impl(cad.get_child(def));
|
||||
if (child == null)
|
||||
return null;
|
||||
cad.assign_child(def, child);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return def;
|
||||
case Security.ContractOneofCase.Synthetic: return CustomOrderDefinition.CustomOneofCase.Spreader;
|
||||
default: return CustomOrderDefinition.CustomOneofCase.Limit;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -678,7 +441,7 @@ namespace mbts.spark.utilities {
|
||||
CustomOrderDefinition.CustomOneofCase.Iceberg,
|
||||
CustomOrderDefinition.CustomOneofCase.Lean,
|
||||
CustomOrderDefinition.CustomOneofCase.Join,
|
||||
CustomOrderDefinition.CustomOneofCase.Cover,
|
||||
CustomOrderDefinition.CustomOneofCase.Cover,
|
||||
CustomOrderDefinition.CustomOneofCase.Top,
|
||||
CustomOrderDefinition.CustomOneofCase.Splitter,
|
||||
CustomOrderDefinition.CustomOneofCase.Scratch,
|
||||
@@ -764,12 +527,6 @@ namespace mbts.spark.utilities {
|
||||
|
||||
public static bool equals(CustomOrderDefinitionImmutable a, CustomOrderDefinitionImmutable b) => custom_order_defi_comparer.Equals(a, b);
|
||||
|
||||
public static bool structure_equals(CustomOrderDefinitionImmutable a, CustomOrderDefinitionImmutable b) {
|
||||
return impl(a.CloneToMutable(), b.CloneToMutable());
|
||||
bool impl(CustomOrderDefinition ma, CustomOrderDefinition mb) =>
|
||||
ma.CustomCase == mb.CustomCase && get_child_algo_data(ma).All(cad => impl(cad.get_child(ma), cad.get_child(mb)));
|
||||
}
|
||||
|
||||
public static bool iceberg_equals(IcebergOrderDefinitionImmutable a, IcebergOrderDefinitionImmutable b) =>
|
||||
a.ShowQuantity.Equals(b.ShowQuantity) && a.HasChild ? b.HasChild && equals(a.Child, b.Child) : !b.HasChild;
|
||||
|
||||
@@ -1031,7 +788,6 @@ namespace mbts.spark.utilities {
|
||||
}
|
||||
};
|
||||
|
||||
public static OrderDefinitionImmutable OrderDefinitionImmutable { get; } = new OrderDefinitionImmutable(OrderDefinition);
|
||||
public static OrderRecordImmutable OrderRecordImmutable { get; } = new OrderRecordImmutable(OrderRecord);
|
||||
|
||||
public static CustomOrderDefinition CustomOrderDefinition() => new CustomOrderDefinition { Limit = LimitOrderDefinition() };
|
||||
@@ -1084,9 +840,6 @@ namespace mbts.spark.utilities {
|
||||
public static TriggerOrderDefinition TriggerOrderDefinition() => new TriggerOrderDefinition { Child = CustomOrderDefinition(), TriggerCondition = new TriggerCondition(), TriggerAction = new TriggerAction(), };
|
||||
public static DynamicOrderDefinition DynamicOrderDefinition() => new DynamicOrderDefinition();
|
||||
public static SpreaderOrderDefinition SpreaderOrderDefinition() => new SpreaderOrderDefinition { ExecutionStrategy = new ExecutionStrategy() };
|
||||
|
||||
public static SplitterOrderDefinition SplitterOrderDefinition() => new SplitterOrderDefinition();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -82,13 +82,8 @@ namespace mbts.spark {
|
||||
CustomSort = AlgoCollectionHelper.algo_definition_vm_comparer.to_non_generic(),
|
||||
IsLiveSorting = true
|
||||
};
|
||||
algo_definitions_view.Filter = d => {
|
||||
if (d.key.mode == AlgoKey.Mode.Persisted && _algo_metadata.TryGetValue(d.key, out AlgoDefinitionMetadata meta) && meta.is_hidden)
|
||||
return false;
|
||||
var sec_fmt = OrderDataHelper.get_algo_format(security.ContractCase);
|
||||
return (d.selected_format & sec_fmt) == sec_fmt;
|
||||
};
|
||||
_algo_definitions_view.LiveFilteringProperties.Add(nameof(AlgoDefinitionVM.selected_format));
|
||||
algo_definitions_view.Filter = d =>
|
||||
!(d.key.mode == AlgoKey.Mode.Persisted && _algo_metadata.TryGetValue(d.key, out AlgoDefinitionMetadata meta) && meta.is_hidden);
|
||||
_algo_definitions_view.LiveSortingProperties.Add(nameof(AlgoDefinitionVM.group));
|
||||
_algo_definitions_view.LiveSortingProperties.Add(nameof(AlgoDefinitionVM.name));
|
||||
algo_definitions_view.GroupDescriptions.Add(new PropertyGroupDescription(nameof(AlgoDefinitionVM.group)));
|
||||
@@ -167,33 +162,27 @@ namespace mbts.spark {
|
||||
undo_definition_observer,
|
||||
redo_definition_observer,
|
||||
revert_definition_observer),
|
||||
security_md_source.Select(smd => model.factory.default_algos(smd.security)).Table(s => s.key).Subscribe(factory_defs => {
|
||||
using (_selected_algo_definition.begin_update())
|
||||
AlgoCollectionHelper.update_persisted_definitions(_algo_definitions, factory_defs, fd => {
|
||||
var vm = AlgoDefinitionVM.create(_model, fd, init_format: OrderDataHelper.get_algo_format(security.ContractCase), editing_permissions: AlgoEditingPermissions.AllowEditValues);
|
||||
vm.selected_format = OrderDataHelper.get_algo_format(security.ContractCase);
|
||||
return vm;
|
||||
});
|
||||
}),
|
||||
model.algo_model.definitions.Subscribe(_definitions_buffer),
|
||||
_definitions_buffer.OnDispatcher().Subscribe(u => {
|
||||
AlgoCollectionHelper.update_persisted_definitions(_algo_definitions, u, def_data => {
|
||||
var def_vm = AlgoDefinitionVM.create(model, def_data, OrderDataHelper.get_algo_format(security.ContractCase), AlgoEditingPermissions.AllowEditValues);
|
||||
def_vm.selected_format = OrderDataHelper.get_algo_format(security.ContractCase);
|
||||
def_vm.favorite_index = _get_favorite_algo_index(def_vm.key);
|
||||
return def_vm;
|
||||
});
|
||||
security_source.SelectManyInSeries(model.subscribe_algo_meta_tuples)
|
||||
.OnDispatcher()
|
||||
.Subscribe(table => {
|
||||
using (_selected_algo_definition.begin_update()) {
|
||||
foreach (var (algo, meta) in table.removed)
|
||||
_algo_definitions.Remove(algo.key);
|
||||
foreach (var (algo, meta) in table.changed) {
|
||||
var vm = _algo_definitions[algo.key];
|
||||
vm.load(algo);
|
||||
vm.favorite_index = _get_favorite_algo_index(vm.key);
|
||||
}
|
||||
foreach (var (algo, meta) in table.added) {
|
||||
var vm = AlgoDefinitionVM.create(_model, algo, AlgoEditingPermissions.AllowEditValues);
|
||||
vm.favorite_index = _get_favorite_algo_index(vm.key);
|
||||
_algo_definitions.Add(vm);
|
||||
}
|
||||
}
|
||||
}),
|
||||
model.algo_model.metadata_service.subscribe_metadata().OnDispatcher().Subscribe(_on_template_metadata),
|
||||
ObservableAutoWrapper.connect_item_hooks(algo_definitions, vm =>
|
||||
Disposable.Create(
|
||||
vm.connect_data(nullable_security_md_source),
|
||||
security_source.Subscribe(s => {
|
||||
var fmt = OrderDataHelper.get_algo_format(s.ContractCase);
|
||||
foreach (var d in algo_definitions)
|
||||
d.selected_format = fmt;
|
||||
}),
|
||||
vm),
|
||||
Disposable.Create(vm.connect_data(nullable_security_md_source), vm),
|
||||
true)) {
|
||||
() => Disposable.dispose(ref _algo_param_rows_hook)
|
||||
};
|
||||
@@ -325,13 +314,11 @@ namespace mbts.spark {
|
||||
public bool open_algo_popup_on_select { get => _open_algo_popup_on_select; set => Set(ref _open_algo_popup_on_select, value); }
|
||||
// commands
|
||||
public ICommand save_definition_cmd { get; }
|
||||
public ICommand save_template_cmd { get; }
|
||||
public ICommand revert_definition_cmd { get; }
|
||||
public ICommand set_default_algo_params_cmd { get; }
|
||||
public ICommand revert_algo_params_cmd { get; }
|
||||
public ICommand undo_definition_cmd { get; }
|
||||
public ICommand redo_definition_cmd { get; }
|
||||
public ICommand remove_template_cmd { get; }
|
||||
public ICommand toggle_is_favorite_cmd { get; }
|
||||
|
||||
public IObservable<AccountTuple?> observe_account(bool start_immediately = false) =>
|
||||
@@ -396,4 +383,4 @@ namespace mbts.spark {
|
||||
algo_definitions_view.Refresh();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,9 +4,7 @@ using mbts.ui;
|
||||
using System;
|
||||
using System.Collections.Specialized;
|
||||
using System.Reactive.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using AlgoDef = bts.api.orderman.CustomOrderDefinition;
|
||||
using AlgoDefi = bts.api.orderman.CustomOrderDefinitionImmutable;
|
||||
using CompositeDef = bts.api.orderman.CompositeOrderDefinition;
|
||||
using CompositeDefi = bts.api.orderman.CompositeOrderDefinitionImmutable;
|
||||
|
||||
@@ -21,6 +19,7 @@ namespace mbts.spark {
|
||||
: base(id, display_name, editing_permissions) { }
|
||||
|
||||
public override string abbreviation => _studio_meta?.abbreviation ?? base.abbreviation;
|
||||
public override AlgoDisplayGroup group => AlgoDisplayGroup.Studio;
|
||||
public override OrderMetadata meta {
|
||||
get {
|
||||
var m = new OrderMetadata { KeyBinding = string.Empty, NoProps = false };
|
||||
@@ -66,4 +65,4 @@ namespace mbts.spark {
|
||||
protected override void validate() => base.validate();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,6 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.ComponentModel;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Input;
|
||||
using AlgoDef = bts.api.orderman.CustomOrderDefinition;
|
||||
using AlgoDefi = bts.api.orderman.CustomOrderDefinitionImmutable;
|
||||
@@ -19,7 +18,6 @@ namespace mbts.spark {
|
||||
static readonly AlgoDefi _empty = new AlgoDefi(new AlgoDef());
|
||||
readonly ObservableAggregateCollection<IAlgoParamVM> _algo_params = new ObservableAggregateCollection<IAlgoParamVM>();
|
||||
readonly VersionContainer<AlgoDefi> _definition;
|
||||
AlgoFormats _format;
|
||||
AlgoEditingPermissions _editing_permissions;
|
||||
SecurityMD? _security_md;
|
||||
OrdersModel _model;
|
||||
@@ -84,10 +82,8 @@ namespace mbts.spark {
|
||||
void IObserver<SecurityMD?>.OnNext(SecurityMD? security_md) {
|
||||
var orig_group = group;
|
||||
_security_md = security_md;
|
||||
if (security_md.HasValue)
|
||||
_format = OrderDataHelper.get_algo_format(security_md.Value.security.ContractCase);
|
||||
var orig_def = definition;
|
||||
var fmt_type = OrderDataHelper.get_default_algo(_format);
|
||||
var fmt_type = OrderDataHelper.get_default_algo(security_md.HasValue ? security_md.Value.security.ContractCase : bts.api.Security.ContractOneofCase.None);
|
||||
switch (fmt_type) {
|
||||
case AlgoType.None: _clear_impl(); break;
|
||||
default:
|
||||
|
||||
@@ -2,7 +2,6 @@ using bts.api;
|
||||
using bts.api.orderman;
|
||||
using bts.utils;
|
||||
using Google.Protobuf.Reflection;
|
||||
using mbts.utils;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.Composition;
|
||||
@@ -15,13 +14,15 @@ namespace mbts.spark {
|
||||
static readonly IReadOnlyDictionary<DynamicOrderParam.ValueOneofCase, (FieldDescriptor field_descriptor, Type field_type)> _descriptor_case_index =
|
||||
ProtoHelper.get_oneof_descriptor_index<DynamicOrderParam, DynamicOrderParam.ValueOneofCase>(nameof(DynamicOrderParam.ValueCase));
|
||||
|
||||
readonly RegisteredDynamicOrderTypes _dynamic_types;
|
||||
readonly Dictionary<string, DynamicOrderDescriptor> _dyn_types = new Dictionary<string, DynamicOrderDescriptor>(StringComparer.CurrentCultureIgnoreCase);
|
||||
|
||||
[ImportingConstructor]
|
||||
DynamicOrderHelper(OrderService order_service) =>
|
||||
_dynamic_types = order_service.get_registered_dynamic_order_types(new VoidMessage());
|
||||
DynamicOrderHelper(OrderService order_service) {
|
||||
foreach (var dt in order_service.get_registered_dynamic_order_types(new VoidMessage()).DynamicOrderDesc)
|
||||
_dyn_types[dt.DynamicOrderType] = dt;
|
||||
}
|
||||
|
||||
public IEnumerable<string> dynamic_types => _dynamic_types.DynamicOrderDesc.Select(d => d.DynamicOrderType);
|
||||
public IEnumerable<string> dynamic_types => _dyn_types.Keys;
|
||||
|
||||
public static string fmt_param(DynamicOrderParam dyn_param) {
|
||||
if (dyn_param == null)
|
||||
@@ -50,7 +51,7 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
public void add_dynamic_order_defs(List<CustomOrderDefinitionImmutable> defs, Func<CustomOrderDefinition.CustomOneofCase, CustomOrderDefinition> factory) {
|
||||
foreach (var d in _dynamic_types.DynamicOrderDesc) {
|
||||
foreach (var d in _dyn_types.Values) {
|
||||
var dorder = factory(CustomOrderDefinition.CustomOneofCase.Dynamic);
|
||||
dorder.Dynamic.DynamicOrderType = d.DynamicOrderType;
|
||||
var ddef = dorder.Dynamic;
|
||||
@@ -60,8 +61,20 @@ namespace mbts.spark {
|
||||
}
|
||||
}
|
||||
|
||||
public bool try_parse(string str, out string dynamic_type) {
|
||||
if (_dyn_types.TryGetValue(str, out var desc)) {
|
||||
dynamic_type = desc.DynamicOrderType;
|
||||
return true;
|
||||
}
|
||||
dynamic_type = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
internal DynamicOrderDescriptor get_descriptor(string dynamic_type) =>
|
||||
_dynamic_types.DynamicOrderDesc.FirstOrDefault(d => d.DynamicOrderType == dynamic_type) ?? new DynamicOrderDescriptor();
|
||||
_dyn_types.TryGetValue(dynamic_type, out var desc) ? desc : new DynamicOrderDescriptor();
|
||||
|
||||
internal CustomOrderDefinitionImmutable create_custom_defi(string dynamic_type) =>
|
||||
new CustomOrderDefinitionImmutable(new CustomOrderDefinition { Dynamic = create_def(dynamic_type) });
|
||||
|
||||
internal DynamicOrderDefinition create_def(string dynamic_type) {
|
||||
var desc = get_descriptor(dynamic_type);
|
||||
|
||||
@@ -122,12 +122,6 @@ namespace mbts.spark {
|
||||
public static Color safe_get_badge_color(this IAlgoVM vm) =>
|
||||
vm == null ? default : vm.meta.Color.rgb_color();
|
||||
|
||||
public static IDisposable load_algo_data_recursive(this IAlgoSelector selector, IReadOnlyDictionary<AlgoKey, AlgoData> algo_data, AlgoKey? default_algo) {
|
||||
selector.load_algo_data(algo_data, default_algo);
|
||||
return ObservableAutoWrapper.connect_item_hooks(selector.algos, vm =>
|
||||
ObservableAutoWrapper.connect_item_hooks(vm.child_algo_selectors, s => load_algo_data_recursive(s, algo_data, default_algo)));
|
||||
}
|
||||
|
||||
public static IEnumerable<IAlgoParamVM> enumerate_all_params(this IAlgoVM vm) =>
|
||||
vm == null ? Enumerable.Empty<IAlgoParamVM>() : vm.algo_params.Concat(vm.child_algo_selectors.SelectMany(s => enumerate_all_params(s.selected_algo)));
|
||||
|
||||
|
||||
@@ -1,16 +1,82 @@
|
||||
using bts.api.orderman;
|
||||
using mbts.ui;
|
||||
using System;
|
||||
using System.Reactive;
|
||||
using System.Reactive.Linq;
|
||||
|
||||
namespace mbts.spark {
|
||||
static partial class OrderTypeVMFactory {
|
||||
class IcebergOrderVM : OrderTypeVMBase<IcebergOrderDefinition, IcebergOrderDefinitionImmutable> {
|
||||
readonly Property<double> _show_quantity;
|
||||
readonly DisplayQuantityMultiplier<double> _display_qty_translator = DisplayQuantityMultiplier.create_double();
|
||||
new IDisposable _dispose;
|
||||
|
||||
public IcebergOrderVM(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions)
|
||||
: base(key, display_name, editing_permissions) {
|
||||
_show_quantity = add_property(nameof(show_quantity), IcebergOrderDefinition.ShowQuantityFieldNumber, double.NaN, double.NaN);
|
||||
_show_quantity = add_property(
|
||||
"show_quantity",
|
||||
IcebergOrderDefinition.ShowQuantityFieldNumber,
|
||||
double.NaN,
|
||||
double.NaN,
|
||||
to_display_value: v => _qty_conversion.to_display(v),
|
||||
from_display_value: v => _qty_conversion.from_display(v),
|
||||
refresh_display_value:
|
||||
Observable.Create<Unit>(o => {
|
||||
_request_refresh_display += refresh;
|
||||
return Disposable.Create(() => _request_refresh_display -= refresh);
|
||||
void refresh() =>
|
||||
o.OnNext(Unit.Default);
|
||||
}));
|
||||
_show_quantity.Changed += on_show_quantity_changed;
|
||||
_dispose = Disposable.Create(
|
||||
_display_qty_translator.connect_owner(this, nameof(display_show_quantity)),
|
||||
_display_qty_translator.subscribe_actual_value().Subscribe(v => _show_quantity.Value = v),
|
||||
Disposable.Create(() => _show_quantity.Changed -= on_show_quantity_changed));
|
||||
|
||||
void on_show_quantity_changed(double oldval, double newval) =>
|
||||
_display_qty_translator.actual_value = newval;
|
||||
}
|
||||
|
||||
public double show_quantity { get => _show_quantity.Value; set => _show_quantity.set(value); }
|
||||
event Action _request_refresh_display;
|
||||
|
||||
public double display_show_quantity {
|
||||
get => _display_qty_translator.display_value;
|
||||
set => _display_qty_translator.display_value = value;
|
||||
}
|
||||
|
||||
QuantityConversionData _qty_conversion {
|
||||
get => _display_qty_translator.conversion_data;
|
||||
set {
|
||||
if (_display_qty_translator.conversion_data != value) {
|
||||
_display_qty_translator.conversion_data = value;
|
||||
_request_refresh_display?.Invoke();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void on_model_internal() =>
|
||||
_refresh_display();
|
||||
|
||||
protected override void on_security_internal() =>
|
||||
_refresh_display();
|
||||
|
||||
void _refresh_display() {
|
||||
if (model == null) {
|
||||
_qty_conversion = default;
|
||||
} else {
|
||||
var divisor = model.security_auxiliary_model.get_display_quantity_divisor(security);
|
||||
if (divisor == 1 || divisor == 0) {
|
||||
_qty_conversion = default;
|
||||
} else {
|
||||
_qty_conversion = new QuantityConversionData(divisor, QuantityConversionData.OpType.DivideActual);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void Dispose(bool disposing) {
|
||||
Disposable.dispose(ref _dispose);
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,7 @@ using System.Collections.Specialized;
|
||||
using System.ComponentModel;
|
||||
using System.Dynamic;
|
||||
using System.Linq;
|
||||
using System.Reactive;
|
||||
using System.Reactive.Disposables;
|
||||
using System.Reactive.Linq;
|
||||
using System.Runtime.CompilerServices;
|
||||
@@ -61,7 +62,9 @@ namespace mbts.spark {
|
||||
public static IAlgoVM composite(AlgoKey key, string display_name, AlgoEditingPermissions editing_permissions) => new CompositeAlgoVM(key, display_name, editing_permissions);
|
||||
|
||||
public static IAlgoVM create(AlgoData def_data, AlgoEditingPermissions editing_permissions = default_editing_permissions, bool is_expanded = false) {
|
||||
var vm = create(def_data.key, def_data.name, def_data.value.CustomCase, editing_permissions, is_expanded);
|
||||
var vm = def_data.key.is_persisted ?
|
||||
new CompositeAlgoVM(def_data.key, def_data.name, editing_permissions) :
|
||||
create(def_data.key, def_data.name, def_data.value.CustomCase, editing_permissions, is_expanded);
|
||||
vm.load_from(def_data.value);
|
||||
return vm;
|
||||
}
|
||||
@@ -79,7 +82,7 @@ namespace mbts.spark {
|
||||
case AlgoType.Join: vm = join(key, name, editing_permissions); break;
|
||||
case AlgoType.Top: vm = top(key, name, editing_permissions); break;
|
||||
case AlgoType.Cover: vm = cover(key, name, editing_permissions); break;
|
||||
case AlgoType.Oco : return oco(key, name, editing_permissions);
|
||||
case AlgoType.Oco: return oco(key, name, editing_permissions);
|
||||
case AlgoType.Pricer: return pricer(key, name, editing_permissions);
|
||||
case AlgoType.Offset: vm = offset(key, name, editing_permissions); break;
|
||||
case AlgoType.Trigger: vm = trigger(key, name, editing_permissions); break;
|
||||
@@ -87,13 +90,10 @@ namespace mbts.spark {
|
||||
case AlgoType.Iceberg: vm = iceberg(key, name, editing_permissions); break;
|
||||
case AlgoType.Spreader: vm = spreader(key, name, editing_permissions); break;
|
||||
case AlgoType.Dynamic: vm = dynamic(key, name, name, editing_permissions); break;
|
||||
case AlgoType.Splitter: vm = splitter(key,name,editing_permissions); break;
|
||||
case AlgoType.Splitter: vm = splitter(key, name, editing_permissions); break;
|
||||
case AlgoType.Composite: vm = composite(key, name, editing_permissions); break;
|
||||
case AlgoType.None: vm = new DefaultAlgoVM(); break;
|
||||
default: vm = generic(key, name, algo_type, editing_permissions); break;
|
||||
//default:
|
||||
// Log.Ui.debug_fatal($"Failed to create {typeof(IAlgoVM)}: unknown algo type '{algo_type}.'");
|
||||
// return new DefaultAlgoVM();
|
||||
}
|
||||
vm.is_expanded = is_expanded && vm.can_expand;
|
||||
return vm;
|
||||
@@ -269,12 +269,7 @@ namespace mbts.spark {
|
||||
|
||||
void selector_load_impl(AlgoSelectorData sd) {
|
||||
var inner_def = sd.get_order(value);
|
||||
if (inner_def.HasValue) {
|
||||
if (security.HasValue) {
|
||||
inner_def = OrderDataHelper.fit_to_type(inner_def.Value, security.Value.ContractCase);
|
||||
if (!inner_def.HasValue)
|
||||
return;
|
||||
}
|
||||
if (inner_def.HasValue && inner_def.Value.CustomCase != AlgoType.None) {
|
||||
var ival = inner_def.Value;
|
||||
var vm = sd.selector.algos.GetOrAdd(
|
||||
AlgoKey.from_custom_def(ival),
|
||||
@@ -317,18 +312,12 @@ namespace mbts.spark {
|
||||
}
|
||||
AlgoKey key;
|
||||
if (security.HasValue) {
|
||||
init = OrderDataHelper.fit_to_type(init.Value, security.Value.ContractCase);
|
||||
if (!init.HasValue)
|
||||
return;
|
||||
key = AlgoKey.from_custom_def(init.Value);
|
||||
child_list.Add(init.Value);
|
||||
for (int i = 1; i < algos.Count; i++) {
|
||||
var child = sd.get_from_impl(algos[i]);
|
||||
if (!child.HasValue || key != AlgoKey.from_custom_def(child.Value))
|
||||
return;
|
||||
child = OrderDataHelper.fit_to_type(child.Value, security.Value.ContractCase);
|
||||
if (!child.HasValue)
|
||||
return;
|
||||
child_list.Add(child.Value);
|
||||
}
|
||||
} else {
|
||||
@@ -372,7 +361,6 @@ namespace mbts.spark {
|
||||
}),
|
||||
c.assign_child);
|
||||
}
|
||||
_populate_selectors();
|
||||
}
|
||||
// local methods
|
||||
IDisposable reset() {
|
||||
@@ -415,9 +403,19 @@ namespace mbts.spark {
|
||||
#endregion
|
||||
|
||||
#region Auto-Properties (non-child-algo params)
|
||||
protected Property<T> add_property<T>(string prop_name, int target_field_number, T init_value = default, T non_uniform_value = default, bool validate_on_changed = false, AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite) {
|
||||
protected Property<T> add_property<T>(
|
||||
string prop_name,
|
||||
int target_field_number,
|
||||
T init_value = default,
|
||||
T non_uniform_value = default,
|
||||
bool validate_on_changed = false,
|
||||
AlgoParamPermissions permissions = AlgoParamPermissions.ReadWrite,
|
||||
Func<T, T> to_display_value = null,
|
||||
Func<T, T> from_display_value = null,
|
||||
IObservable<Unit> refresh_display_value = null) {
|
||||
//
|
||||
var prop = backing(prop_name, init_value);
|
||||
_on_property_added(prop_name, target_field_number, prop, prop.set, non_uniform_value, validate_on_changed, permissions);
|
||||
_on_property_added(prop_name, target_field_number, prop, prop.set, non_uniform_value, validate_on_changed, permissions, to_display_value, from_display_value, refresh_display_value);
|
||||
return prop;
|
||||
}
|
||||
|
||||
@@ -592,17 +590,25 @@ namespace mbts.spark {
|
||||
}
|
||||
}
|
||||
|
||||
void _on_property_added<T>(string prop_name, int target_field_number, IProperty<T> prop, Action<T> assign_to_prop, T non_uniform_value, bool validate_on_changed, AlgoParamPermissions permissions) {
|
||||
void _on_property_added<T>(string prop_name, int target_field_number, IProperty<T> prop, Action<T> assign_to_prop, T non_uniform_value, bool validate_on_changed, AlgoParamPermissions permissions, Func<T, T> to_display_value = null, Func<T, T> from_display_value = null, IObservable<Unit> refresh_display_value = null) {
|
||||
var field_desc = new TMutable().Descriptor.FindFieldByNumber(target_field_number);
|
||||
var param = new AlgoParamVM<T>(prop_name, DisplayNameHelper.snake_to_title_case(prop_name), prop.Value) { permissions = permissions };
|
||||
var param = new AlgoParamVM<T>(prop_name, DisplayNameHelper.snake_to_title_case(prop_name), prop.Value, EqualityComparer<T>.Default, null, to_display_value, from_display_value) {
|
||||
permissions = permissions
|
||||
};
|
||||
_algo_params.Add(param);
|
||||
var prop_hook = _link_props(param, prop, assign_to_prop, non_uniform_value, validate_on_changed);
|
||||
if (refresh_display_value != null) {
|
||||
prop_hook = Disposable.Create(
|
||||
refresh_display_value.Subscribe(_ => param.refresh_display_value()),
|
||||
prop_hook);
|
||||
}
|
||||
_auto_props.Add(new AutoProp(prop_name, mval => {
|
||||
if (mval != null && param.has_value)
|
||||
field_desc.Accessor.SetValue(mval, prop.Value);
|
||||
},
|
||||
mval => assign_to_prop_and_commit(mval == null ? default : ConvertUtils.try_convert<T>(field_desc.Accessor.GetValue(mval))),
|
||||
mvals => assign_to_prop_and_commit(mvals.Select(v => ConvertUtils.try_convert<T>(field_desc.Accessor.GetValue(v))).Distinct().SafeSingleOrDefault(non_uniform_value)),
|
||||
_link_props(param, prop, assign_to_prop, non_uniform_value, validate_on_changed)));
|
||||
prop_hook));
|
||||
void assign_to_prop_and_commit(T value) {
|
||||
assign_to_prop(value);
|
||||
param.mark_committed();
|
||||
@@ -814,8 +820,6 @@ namespace mbts.spark {
|
||||
return Disposable.Create(() => {
|
||||
if (security != old_sec) {
|
||||
on_security_internal();
|
||||
if (_editing_permissions.HasFlag(AlgoEditingPermissions.AllowEditStructure))
|
||||
_populate_selectors();
|
||||
_security_changed?.Invoke(security);
|
||||
}
|
||||
if (security_md != old_sec_md)
|
||||
@@ -823,21 +827,6 @@ namespace mbts.spark {
|
||||
});
|
||||
}
|
||||
|
||||
IDisposable _selector_data_hooks;
|
||||
void _populate_selectors() {
|
||||
if (model != null && security.HasValue) {
|
||||
var algo_data = model.factory.default_algos(security.Value);
|
||||
var default_algo = AlgoKey.from_known_type(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.Value.ContractCase)));
|
||||
foreach (var sd in _child_algo_selectors)
|
||||
sd.load_algo_data_recursive(algo_data, default_algo);
|
||||
Disposable.dispose(ref _selector_data_hooks);
|
||||
_selector_data_hooks = ObservableAutoWrapper.connect_item_hooks(child_algo_selectors, s => {
|
||||
s.load_algo_data_recursive(algo_data, default_algo);
|
||||
return Disposable.empty;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
class AutoProp : IDisposable {
|
||||
public readonly string name;
|
||||
public readonly Action<TMutable> assign, load;
|
||||
@@ -924,6 +913,7 @@ namespace mbts.spark {
|
||||
AlgoParamPermissions _permissions = AlgoParamPermissions.ReadWrite;
|
||||
IReadOnlyDictionary<AlgoKey, AlgoData> _pending_data;
|
||||
AlgoKey? _pending_default;
|
||||
IDisposable _loaded_data_hook;
|
||||
|
||||
public AlgoSelector(string id, string display_name) {
|
||||
this.id = id;
|
||||
@@ -1020,8 +1010,11 @@ namespace mbts.spark {
|
||||
|
||||
void _sync_formats() {
|
||||
if (initialized && _pending_data != null) {
|
||||
var fmt_algos = _pending_data;
|
||||
algos.SyncWithDictionary(fmt_algos, d => create(d, is_expanded: true));
|
||||
Disposable.dispose(ref _loaded_data_hook);
|
||||
var data = _pending_data;
|
||||
algos.SyncWithDictionary(data, d => create(d, is_expanded: true));
|
||||
_loaded_data_hook = ObservableAutoWrapper.connect_item_hooks(algos, vm =>
|
||||
ObservableAutoWrapper.connect_item_actions(vm.child_algo_selectors, s => s.load_algo_data(data, null)));
|
||||
if (_algo == null || !algos.ContainsKey(_algo.id)) {
|
||||
if (_pending_default.HasValue && algos.TryGetValue(_pending_default.Value, out IAlgoVM match))
|
||||
selected_algo = match;
|
||||
|
||||
@@ -138,7 +138,7 @@ namespace mbts.spark {
|
||||
new DialogSkirtItem("Save Strategy", commit);
|
||||
|
||||
void _ensure_init() {
|
||||
if (_vm == null && _model != null && _template.HasValue && _template.Value.HasSecurity) {
|
||||
if (_vm == null && _model != null && _template.HasValue && _template.Value.HasSecurity && _template.Value.HasExecutionStrategy) {
|
||||
Log.isnull(_save_strategy_item);
|
||||
Log.isnull(_vm_strategy_sub);
|
||||
var tmp = _template.Value;
|
||||
|
||||
@@ -32,6 +32,7 @@ namespace mbts.spark {
|
||||
public readonly ISecurityAuxiliaryDataModel security_auxiliary_model;
|
||||
|
||||
readonly IBus _bus;
|
||||
readonly IAlgoProvider _algo_provider, _attachable_algo_provider;
|
||||
readonly OrderFactory _factory;
|
||||
readonly OrderService _service;
|
||||
readonly PositionService _position_service;
|
||||
@@ -57,6 +58,8 @@ namespace mbts.spark {
|
||||
IAlgoStudioModel algo_model,
|
||||
ISecurityAuxiliaryDataModel security_auxiliary_model,
|
||||
MarketDataAuxiliaryModel md_auxiliary_model,
|
||||
IAlgoProvider algo_provider,
|
||||
IAttachableAlgoProvider attachable_algo_provider,
|
||||
SecurityStore sstore,
|
||||
ErrorReporter error) {
|
||||
//
|
||||
@@ -67,6 +70,8 @@ namespace mbts.spark {
|
||||
_mbo_service = mbo_service;
|
||||
_spreader = spreader;
|
||||
_error = error;
|
||||
_algo_provider = algo_provider;
|
||||
_attachable_algo_provider = attachable_algo_provider;
|
||||
_dynamic_helper = dynamic_helper;
|
||||
this.admin_model = admin_model;
|
||||
this.algo_model = algo_model;
|
||||
@@ -314,6 +319,9 @@ namespace mbts.spark {
|
||||
public MBOService mbo_service => _mbo_service;
|
||||
public IAlgoStudioModel algo_model { get; }
|
||||
|
||||
public AlgoTypeSetImmutable get_permitted_algos(SecurityImmutable security) =>
|
||||
_algo_provider.get_permitted_algos(security);
|
||||
|
||||
public IObservable<TableUpdate<OrderSecurity, uint>> on_security_working_orders_with_piq(uint security) =>
|
||||
_security_working_orders_with_piq_demuxer.subscribe(security);
|
||||
|
||||
@@ -322,6 +330,15 @@ namespace mbts.spark {
|
||||
|
||||
public IObservable<TableUpdate<(SecurityImmutable?, PositionUnitImmutable), int>> on_security_positions(uint security) =>
|
||||
_security_positions_demuxer.subscribe(security);
|
||||
|
||||
public IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos(bool attachable_only = false) =>
|
||||
(attachable_only ? _attachable_algo_provider : _algo_provider).subscribe_algos();
|
||||
|
||||
public IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_algos(SecurityImmutable security, bool attachable_only = false) =>
|
||||
(attachable_only ? _attachable_algo_provider : _algo_provider).subscribe_algos(security);
|
||||
|
||||
public IObservable<TableUpdate<AlgoData, AlgoKey>> subscribe_complete_algos(bool attachable_only = false) =>
|
||||
(attachable_only ? _attachable_algo_provider : _algo_provider).subscribe_complete_algos();
|
||||
#endregion
|
||||
|
||||
#region Input
|
||||
@@ -634,14 +651,10 @@ namespace mbts.spark {
|
||||
}).Select(r => r.last_update);
|
||||
|
||||
public static IObservable<TableUpdate<(AlgoData algo, AlgoDefinitionMetadata? meta), AlgoKey>> subscribe_all_algos(this OrdersModel orders_model) =>
|
||||
orders_model.studio_algos_with_meta.MergeTable(Observable.Return(
|
||||
new TableUpdate<(AlgoData algo, AlgoDefinitionMetadata? meta), AlgoKey>(
|
||||
ImmutableDictionary<AlgoKey, (AlgoData algo, AlgoDefinitionMetadata? meta)>.Empty.AddRange(orders_model.factory.default_algos(OrderDataHelper.all_order_types).Select(kv => new KeyValuePair<AlgoKey, (AlgoData algo, AlgoDefinitionMetadata? meta)>(kv.Key, (kv.Value, null)))),
|
||||
Array.Empty<(AlgoData, AlgoDefinitionMetadata?)>(),
|
||||
Array.Empty<Change<(AlgoData, AlgoDefinitionMetadata?)>>(),
|
||||
Array.Empty<(AlgoData, AlgoDefinitionMetadata?)>(),
|
||||
d => d.algo.key
|
||||
).as_snapshot()));
|
||||
_subscribe_algo_meta_tuples(orders_model, orders_model.subscribe_algos());
|
||||
|
||||
public static IObservable<TableUpdate<(AlgoData algo, AlgoDefinitionMetadata? meta), AlgoKey>> subscribe_algo_meta_tuples(this OrdersModel orders_model, SecurityImmutable security) =>
|
||||
_subscribe_algo_meta_tuples(orders_model, orders_model.subscribe_algos(security));
|
||||
|
||||
public static async Task<OrderRecordImmutable?> order_from_key(this OrdersModel orders_model, uint order_key) {
|
||||
(var tu, var success) = await orders_model.on_orders.FirstAsyncTask(t => t.state.ContainsKey(order_key), TimeSpan.FromSeconds(3));
|
||||
@@ -684,6 +697,15 @@ namespace mbts.spark {
|
||||
return false;
|
||||
}
|
||||
|
||||
static IObservable<TableUpdate<(AlgoData algo, AlgoDefinitionMetadata? meta), AlgoKey>> _subscribe_algo_meta_tuples(OrdersModel orders_model, IObservable<TableUpdate<AlgoData, AlgoKey>> algos) =>
|
||||
algos.LeftJoin(
|
||||
orders_model.algo_model.metadata_service.subscribe_metadata().Table(AlgoDefinitionMetadata.key_fn),
|
||||
AlgoData.key_fn,
|
||||
AlgoDefinitionMetadata.key_fn,
|
||||
(algo, key, meta) => (algo, (AlgoDefinitionMetadata?)meta),
|
||||
(algo, key) => (algo, (AlgoDefinitionMetadata?)null),
|
||||
tup => tup.algo.key);
|
||||
|
||||
class RootOrderData {
|
||||
public readonly SetMap<uint, uint> parent_to_children = new SetMap<uint, uint>();
|
||||
public TableUpdateTransform<OrderRecordImmutable, uint> last_update { get; set; } = new TableUpdateTransform<OrderRecordImmutable, uint>();
|
||||
|
||||
@@ -44,17 +44,17 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
static class TradesSource {
|
||||
public static IEnumerable<Product> aggregate_security_criteria(IEnumerable<SecurityImmutable> securities, IEnumerable<SecurityCriteria> security_criterion) =>
|
||||
securities.Where(s => security_criterion.Any(sc => ContractPickerModel.security_in_criteria(sc, s)))
|
||||
public static IEnumerable<Product> aggregate_security_criteria(IEnumerable<SecurityImmutable> securities, IEnumerable<SecurityCriteria> security_criteria) =>
|
||||
securities.Where(s => security_criteria.Any(sc => ContractPickerModel.security_in_criteria(sc, s)))
|
||||
.Select(Product.from_security)
|
||||
.Distinct();
|
||||
|
||||
public static IObservable<IReadOnlyList<TradeInfo>> create(MDConsumer consumer, IObservable<IReadOnlyDictionary<uint, SecurityImmutable>> security_map, IObservable<IEnumerable<SecurityCriteria>> security_criterion, TimeSpan poll_interval) =>
|
||||
security_criterion.CombineLatest(security_map, (criterion, map) => (criterion, map))
|
||||
public static IObservable<IReadOnlyList<TradeInfo>> create(MDConsumer consumer, IObservable<IReadOnlyDictionary<uint, SecurityImmutable>> security_map, IObservable<IEnumerable<SecurityCriteria>> security_criteria, TimeSpan poll_interval) =>
|
||||
security_criteria.CombineLatest(security_map, (criterion, map) => (criterion, map))
|
||||
.Scan((channels: ImmutableDictionary<Product, ChannelConsumer>.Empty, active: new List<ChannelConsumer>(0)), (channel_data, data) => {
|
||||
var (criterion, map) = data;
|
||||
var (criteria, map) = data;
|
||||
var (channels, active) = channel_data;
|
||||
var products = aggregate_security_criteria(map.Values, criterion);
|
||||
var products = aggregate_security_criteria(map.Values, criteria);
|
||||
active = new List<ChannelConsumer>();
|
||||
foreach (var p in products) {
|
||||
if (!channels.TryGetValue(p, out var c)) {
|
||||
|
||||
@@ -68,8 +68,8 @@ namespace mbts.ui.controls {
|
||||
.to_comparer();
|
||||
}
|
||||
|
||||
public static IEnumerable<(TKey key, ListSortDirection direction)> convert_sorting_criterion<TKey>(IEnumerable<SortingCriteria> sorting_criterion) where TKey : struct {
|
||||
foreach (var sc in sorting_criterion) {
|
||||
public static IEnumerable<(TKey key, ListSortDirection direction)> convert_sorting_criteria<TKey>(IEnumerable<SortingCriteria> sorting_criteria) where TKey : struct {
|
||||
foreach (var sc in sorting_criteria) {
|
||||
if (Enum.TryParse(sc.col_name, false, out TKey key))
|
||||
yield return (key, sc.direction());
|
||||
}
|
||||
|
||||
@@ -76,9 +76,9 @@ namespace mbts.ui.settings {
|
||||
// columns
|
||||
[ProtoMember(6)]
|
||||
List<GridColumnSettings> _columns;
|
||||
// sorting criterion
|
||||
// sorting criteria
|
||||
[ProtoMember(7)]
|
||||
List<SortingCriteria> _sorting_criterion;
|
||||
List<SortingCriteria> _sorting_criteria;
|
||||
// background
|
||||
[ProtoMember(8)]
|
||||
[DefaultValue(_default_background)]
|
||||
@@ -103,7 +103,7 @@ namespace mbts.ui.settings {
|
||||
uint font_color = _default_font_color,
|
||||
ColorOpacityProto? selection_highlight = null,
|
||||
IEnumerable<GridColumnSettings> columns = null,
|
||||
IEnumerable<SortingCriteria> sorting_criterion = null,
|
||||
IEnumerable<SortingCriteria> sorting_criteria = null,
|
||||
uint background = _default_background,
|
||||
bool enable_background_color = _default_enable_background_color) {
|
||||
//
|
||||
@@ -113,7 +113,7 @@ namespace mbts.ui.settings {
|
||||
_font_weight = (ushort)font_weight.ToOpenTypeWeight();
|
||||
_selection_highlight = selection_highlight ?? new ColorOpacityProto(0, 1);
|
||||
_columns = new List<GridColumnSettings>(columns.empty_if_null());
|
||||
_sorting_criterion = new List<SortingCriteria>(sorting_criterion.empty_if_null());
|
||||
_sorting_criteria = new List<SortingCriteria>(sorting_criteria.empty_if_null());
|
||||
_background = background;
|
||||
_enable_background_color = enable_background_color;
|
||||
}
|
||||
@@ -127,15 +127,15 @@ namespace mbts.ui.settings {
|
||||
public uint background_color => _background;
|
||||
public bool enable_background_color => _enable_background_color;
|
||||
public IReadOnlyList<GridColumnSettings> columns => _columns ?? (_columns = new List<GridColumnSettings>(0));
|
||||
[Obsolete] // TODO: remove sorting_criterion from GridSettings entirely. This should be part of IShellWindow's StartupData, since it is an instance-specific setting, and prob not part of the shared defaults
|
||||
public IReadOnlyList<SortingCriteria> sorting_criterion => _sorting_criterion ?? (_sorting_criterion = new List<SortingCriteria>(0));
|
||||
[Obsolete] // TODO: remove sorting_criteria from GridSettings entirely. This should be part of IShellWindow's StartupData, since it is an instance-specific setting, and prob not part of the shared defaults
|
||||
public IReadOnlyList<SortingCriteria> sorting_criteria => _sorting_criteria ?? (_sorting_criteria = new List<SortingCriteria>(0));
|
||||
|
||||
public static GridSettings get_default() =>
|
||||
new GridSettings(_default_font_family, _default_font_size, FontWeights.Normal, _default_font_color, new ColorOpacityProto(Colors.MediumSlateBlue, 0.4));
|
||||
|
||||
public GridSettings with(
|
||||
IEnumerable<GridColumnSettings> columns = null,
|
||||
IEnumerable<SortingCriteria> sorting_criterion = null,
|
||||
IEnumerable<SortingCriteria> sorting_criteria = null,
|
||||
string font_family = null,
|
||||
double font_size = double.NaN,
|
||||
uint? background = null,
|
||||
@@ -147,7 +147,7 @@ namespace mbts.ui.settings {
|
||||
_font_color,
|
||||
_selection_highlight,
|
||||
columns ?? _columns,
|
||||
sorting_criterion ?? _sorting_criterion,
|
||||
sorting_criteria ?? _sorting_criteria,
|
||||
background ?? _background,
|
||||
enable_background_color ?? _enable_background_color);
|
||||
|
||||
@@ -164,7 +164,7 @@ namespace mbts.ui.settings {
|
||||
_enable_background_color == other._enable_background_color &&
|
||||
EqualityComparer.safe_sequence_equals(columns, other.columns) &&
|
||||
#pragma warning disable CS0612 // Type or member is obsolete
|
||||
EqualityComparer.safe_sequence_equals(sorting_criterion, other.sorting_criterion);
|
||||
EqualityComparer.safe_sequence_equals(sorting_criteria, other.sorting_criteria);
|
||||
#pragma warning restore CS0612 // Type or member is obsolete
|
||||
|
||||
public override bool Equals(object obj) =>
|
||||
@@ -181,7 +181,7 @@ namespace mbts.ui.settings {
|
||||
_enable_background_color.GetHashCode(),
|
||||
EqualityComparer.safe_aggregate_hash(columns),
|
||||
#pragma warning disable CS0612 // Type or member is obsolete
|
||||
EqualityComparer.safe_aggregate_hash(sorting_criterion));
|
||||
EqualityComparer.safe_aggregate_hash(sorting_criteria));
|
||||
#pragma warning restore CS0612 // Type or member is obsolete
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -54,14 +54,14 @@ namespace mbts.ui.settings {
|
||||
public static string fmt_col_id<TColKey>(TColKey key) where TColKey : struct =>
|
||||
key.ToString();
|
||||
|
||||
public static void normalize_sorting_criterion<TColKey>(IEnumerable<SortingCriteria> sorting_criterion, IReadOnlyDictionary<string, TColKey> sort_member_to_id) where TColKey : struct =>
|
||||
normalize_sorting_criterion(sorting_criterion, new Func<string, TColKey?>[] {
|
||||
public static void normalize_sorting_criteria<TColKey>(IEnumerable<SortingCriteria> sorting_criteria, IReadOnlyDictionary<string, TColKey> sort_member_to_id) where TColKey : struct =>
|
||||
normalize_sorting_criteria(sorting_criteria, new Func<string, TColKey?>[] {
|
||||
parse_col_id<TColKey>,
|
||||
col_name => sort_member_to_id.TryGetValue(col_name, out var k) ? k : (TColKey?)null
|
||||
});
|
||||
|
||||
public static void normalize_sorting_criterion<TColKey>(IEnumerable<SortingCriteria> sorting_criterion, IEnumerable<Func<string, TColKey?>> conversion_dels) where TColKey : struct {
|
||||
foreach (var sc in sorting_criterion) {
|
||||
public static void normalize_sorting_criteria<TColKey>(IEnumerable<SortingCriteria> sorting_criteria, IEnumerable<Func<string, TColKey?>> conversion_dels) where TColKey : struct {
|
||||
foreach (var sc in sorting_criteria) {
|
||||
sc.col_name = conversion_dels
|
||||
.Select(del => del(sc.col_name))
|
||||
.FirstOrDefault(k => k.HasValue)?.ToString() ?? sc.col_name;
|
||||
|
||||
@@ -114,7 +114,7 @@ namespace mbts.ui.controls {
|
||||
public Func<T, bool> filter { get; private set; }
|
||||
|
||||
public TFiltersState get_filters() => _filters.create();
|
||||
public IEnumerable<SortingCriteria> get_sorting_criterion() => _sorting.create();
|
||||
public IEnumerable<SortingCriteria> get_sorting_criteria() => _sorting.create();
|
||||
|
||||
public void on_sorting(DIYGridSortingEventArgs e) => _sorting.on_sorting(e);
|
||||
public void on_settings(TFiltersState filters, IEnumerable<SortingCriteria> sorting) {
|
||||
|
||||
@@ -54,13 +54,13 @@ namespace mbts.ui.controls {
|
||||
).to_comparer();
|
||||
}
|
||||
|
||||
public void load_from(IEnumerable<SortingCriteria> sorting_criterion) {
|
||||
public void load_from(IEnumerable<SortingCriteria> sorting_criteria) {
|
||||
var sort_member_to_id = _map
|
||||
.Where(kv => !string.IsNullOrEmpty(kv.Value.col.sort_member_path))
|
||||
.Distinct()
|
||||
.ToDictionary(kv => kv.Value.col.sort_member_path, kv => kv.Key);
|
||||
GridSettingsHelper.normalize_sorting_criterion(sorting_criterion, sort_member_to_id);
|
||||
_on_settings(sorting_criterion
|
||||
GridSettingsHelper.normalize_sorting_criteria(sorting_criteria, sort_member_to_id);
|
||||
_on_settings(sorting_criteria
|
||||
.Select(sc => (GridSettingsHelper.parse_col_id<TColKey>(sc.col_name), sc.is_ascending ? ListSortDirection.Ascending : ListSortDirection.Descending))
|
||||
.Where(t => t.Item1.HasValue)
|
||||
.Select(t => (t.Item1.Value, t.Item2)));
|
||||
|
||||
@@ -947,7 +947,7 @@
|
||||
<TextBlock HorizontalAlignment="Left" VerticalAlignment="Center">Show Quantity</TextBlock>
|
||||
<c:HelpButton Margin="{StaticResource Margin.LP1}" ToolTip="Maximum size to show on exchange, this is the BTS provided iceberg"/>
|
||||
</StackPanel>
|
||||
<c:TickUpDownDouble x:Name="PART_ShowQuantity_TickUpDownDouble" Grid.Column="2" HorizontalAlignment="Stretch" Value="{Binding show_quantity}"/>
|
||||
<c:TickUpDownDouble x:Name="PART_ShowQuantity_TickUpDownDouble" Grid.Column="2" HorizontalAlignment="Stretch" Value="{Binding display_show_quantity}"/>
|
||||
<uag:AlgoPickerNodeView
|
||||
x:Name="PART_Child_AlgoPickerNodeView"
|
||||
Grid.Row="2"
|
||||
|
||||
@@ -15,8 +15,7 @@ namespace mbts.ui.spark {
|
||||
AlgoDropDownStyleKeyConverter = ValueConverter.create(obj => {
|
||||
if (obj is AlgoDefinitionVM) return DefinitionDropDownStyleKey;
|
||||
return null;
|
||||
}),
|
||||
DataContextConverter = ValueConverter.create(obj => obj is AlgoVMWrapper w ? w.value.algo_root : obj);
|
||||
});
|
||||
|
||||
public static IMultiValueConverter TriggerTimeoutStateConverter =
|
||||
ValueConverter.create<bool, AlgoEditingPermissions, string>((is_timeout_enabled, editing_permissions) =>
|
||||
|
||||
@@ -372,11 +372,11 @@ namespace mbts.ui {
|
||||
on sd.PropertyName equals col.path
|
||||
select new SortingCriteria(col.id, sd.Direction == ListSortDirection.Ascending);
|
||||
|
||||
public static IEnumerable<SortDescription> get_sort_descriptions(this IEnumerable<SortingCriteria> sorting_criterion, IEnumerable<DataGridColumn> columns) =>
|
||||
get_sort_descriptions(sorting_criterion, columns.Select(c => (controls.DataGridEx.GetCellKey(c)?.ToString(), c.SortMemberPath)));
|
||||
public static IEnumerable<SortDescription> get_sort_descriptions(this IEnumerable<SortingCriteria> sorting_criteria, IEnumerable<DataGridColumn> columns) =>
|
||||
get_sort_descriptions(sorting_criteria, columns.Select(c => (controls.DataGridEx.GetCellKey(c)?.ToString(), c.SortMemberPath)));
|
||||
|
||||
public static IEnumerable<SortDescription> get_sort_descriptions(this IEnumerable<SortingCriteria> sorting_criterion, IEnumerable<(string id, string path)> columns) =>
|
||||
from sc in sorting_criterion
|
||||
public static IEnumerable<SortDescription> get_sort_descriptions(this IEnumerable<SortingCriteria> sorting_criteria, IEnumerable<(string id, string path)> columns) =>
|
||||
from sc in sorting_criteria
|
||||
join col in columns
|
||||
on sc.col_name equals col.id
|
||||
select new SortDescription(col.path, sc.direction());
|
||||
@@ -384,9 +384,9 @@ namespace mbts.ui {
|
||||
/// <summary>
|
||||
/// Converts each <see cref="SortingCriteria"/> into a <see cref="SortDescription"/> and assigns the result to <paramref name="collection_view"/>.SortDescriptions.
|
||||
/// </summary>
|
||||
public static void set_sort_descriptions(this ICollectionView collection_view, IEnumerable<SortingCriteria> sorting_criterion, ObservableCollection<controls.DIYGrid.ColumnBase> columns) {
|
||||
public static void set_sort_descriptions(this ICollectionView collection_view, IEnumerable<SortingCriteria> sorting_criteria, ObservableCollection<controls.DIYGrid.ColumnBase> columns) {
|
||||
using (collection_view.DeferRefresh()) {
|
||||
collection_view.SortDescriptions.SetItems(sorting_criterion.empty_if_null()
|
||||
collection_view.SortDescriptions.SetItems(sorting_criteria.empty_if_null()
|
||||
.Select(sc => new SortDescription(
|
||||
columns.FirstOrDefault(c => string.Equals(c.id, sc.col_name, StringComparison.CurrentCultureIgnoreCase))?.sort_member_path,
|
||||
sc.is_ascending ? ListSortDirection.Ascending : ListSortDirection.Descending))
|
||||
@@ -394,18 +394,18 @@ namespace mbts.ui {
|
||||
}
|
||||
}
|
||||
|
||||
public static IObservable<IReadOnlyList<SortingCriteria>> subscribe_sorting_criterion(this ICollectionView collection_view, Func<string, string> sort_member_to_id) =>
|
||||
public static IObservable<IReadOnlyList<SortingCriteria>> subscribe_sorting_criteria(this ICollectionView collection_view, Func<string, string> sort_member_to_id) =>
|
||||
Observable.Create<IReadOnlyList<SortingCriteria>>(o => {
|
||||
INotifyCollectionChanged notification_src = collection_view.SortDescriptions;
|
||||
IList<SortDescription> sort_descriptions = collection_view.SortDescriptions;
|
||||
var sorting_criterion = sort_descriptions.Select(to_criteria).ToList();
|
||||
var sorting_criteria = sort_descriptions.Select(to_criteria).ToList();
|
||||
notification_src.CollectionChanged += on_sort_descriptions_changed;
|
||||
o.OnNext(sorting_criterion);
|
||||
o.OnNext(sorting_criteria);
|
||||
return Disposable.Create(dispose);
|
||||
// local methods
|
||||
void on_sort_descriptions_changed(object sender, NotifyCollectionChangedEventArgs e) {
|
||||
CollectionHelper.reflect_change(sorting_criterion, collection_view.SortDescriptions, to_criteria, null, e);
|
||||
o.OnNext(sorting_criterion);
|
||||
CollectionHelper.reflect_change(sorting_criteria, collection_view.SortDescriptions, to_criteria, null, e);
|
||||
o.OnNext(sorting_criteria);
|
||||
}
|
||||
SortingCriteria to_criteria(SortDescription sd) => new SortingCriteria(sort_member_to_id(sd.PropertyName), sd.Direction == ListSortDirection.Ascending);
|
||||
void dispose() => notification_src.CollectionChanged -= on_sort_descriptions_changed;
|
||||
|
||||
@@ -43,24 +43,24 @@ namespace mbts.spark {
|
||||
foreach (var selected_item in all_securities.Where(s => selected_securities.Contains(s.Key))) {
|
||||
// verify clause isn't already in the list
|
||||
if (!security_criteria_clauses.Any(x => x.pretty_name == selected_item.Value.security.ToString())) {
|
||||
security_criteria_clauses.Insert(0, new SecurityCriteriaClause() {
|
||||
pretty_name = selected_item.Value.security.ToString(),
|
||||
exchanges = selected_exchanges.ToArray(),
|
||||
security_types = selected_security_types.ToArray(),
|
||||
symbols = selected_symbols.ToArray(),
|
||||
security_keys = new List<uint>() { selected_item.Key }
|
||||
});
|
||||
security_criteria_clauses.Insert(0, new SecurityCriteriaClause(
|
||||
pretty_name: selected_item.Value.security.ToString(),
|
||||
exchanges: selected_exchanges.ToArray(),
|
||||
security_types: selected_security_types.ToArray(),
|
||||
symbols: selected_symbols.ToArray(),
|
||||
security_keys: new[] { selected_item.Key }
|
||||
));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (!security_criteria_clauses.Any(x => x.pretty_name == criteria_input_name)) {
|
||||
security_criteria_clauses.Insert(0, new SecurityCriteriaClause() {
|
||||
pretty_name = criteria_input_name,
|
||||
exchanges = selected_exchanges.ToArray(),
|
||||
security_types = selected_security_types.ToArray(),
|
||||
symbols = selected_symbols.ToArray(),
|
||||
security_keys = selected_securities
|
||||
});
|
||||
security_criteria_clauses.Insert(0, new SecurityCriteriaClause(
|
||||
pretty_name: criteria_input_name,
|
||||
exchanges: selected_exchanges.ToArray(),
|
||||
security_types: selected_security_types.ToArray(),
|
||||
symbols: selected_symbols.ToArray(),
|
||||
security_keys: selected_securities.ToArray()
|
||||
));
|
||||
}
|
||||
}
|
||||
criteria_input_name = string.Empty;
|
||||
@@ -97,12 +97,12 @@ namespace mbts.spark {
|
||||
add_symbol_command = new DelegateCommand<string>(symbol => {
|
||||
_compose_criteria_clause_name(true);
|
||||
if (!security_criteria_clauses.Any(x => x.pretty_name == _criteria_input_name_from_double_click)) {
|
||||
security_criteria_clauses.Insert(0, new SecurityCriteriaClause() {
|
||||
pretty_name = _criteria_input_name_from_double_click,
|
||||
exchanges = selected_exchanges.ToArray(),
|
||||
security_types = selected_security_types.ToArray(),
|
||||
symbols = new string[] { symbol },
|
||||
});
|
||||
security_criteria_clauses.Insert(0, new SecurityCriteriaClause(
|
||||
pretty_name: _criteria_input_name_from_double_click,
|
||||
exchanges: selected_exchanges.ToArray(),
|
||||
security_types: selected_security_types.ToArray(),
|
||||
symbols: new string[] { symbol }
|
||||
));
|
||||
}
|
||||
ok_button_command.TryRaiseCanExecuteChanged();
|
||||
remove_criteria_command.TryRaiseCanExecuteChanged();
|
||||
@@ -110,11 +110,11 @@ namespace mbts.spark {
|
||||
add_security_type_command = new DelegateCommand<SecurityType>(sec_type => {
|
||||
_compose_criteria_clause_name(true, true);
|
||||
if (!security_criteria_clauses.Any(x => x.pretty_name == _criteria_input_name_from_double_click)) {
|
||||
security_criteria_clauses.Insert(0, new SecurityCriteriaClause() {
|
||||
pretty_name = _criteria_input_name_from_double_click,
|
||||
exchanges = selected_exchanges.ToArray(),
|
||||
security_types = new SecurityType[] { sec_type },
|
||||
});
|
||||
security_criteria_clauses.Insert(0, new SecurityCriteriaClause(
|
||||
pretty_name: _criteria_input_name_from_double_click,
|
||||
exchanges: selected_exchanges.ToArray(),
|
||||
security_types: new SecurityType[] { sec_type }
|
||||
));
|
||||
}
|
||||
ok_button_command.TryRaiseCanExecuteChanged();
|
||||
remove_criteria_command.TryRaiseCanExecuteChanged();
|
||||
@@ -122,10 +122,10 @@ namespace mbts.spark {
|
||||
add_exchange_command = new DelegateCommand<Venue>(exchange => {
|
||||
_compose_criteria_clause_name(true, true, true);
|
||||
if (!security_criteria_clauses.Any(x => x.pretty_name == _criteria_input_name_from_double_click)) {
|
||||
security_criteria_clauses.Insert(0, new SecurityCriteriaClause() {
|
||||
pretty_name = _criteria_input_name_from_double_click,
|
||||
exchanges = new Venue[] { exchange },
|
||||
});
|
||||
security_criteria_clauses.Insert(0, new SecurityCriteriaClause(
|
||||
pretty_name: _criteria_input_name_from_double_click,
|
||||
exchanges: new Venue[] { exchange }
|
||||
));
|
||||
}
|
||||
ok_button_command.TryRaiseCanExecuteChanged();
|
||||
remove_criteria_command.TryRaiseCanExecuteChanged();
|
||||
@@ -343,12 +343,16 @@ namespace mbts.spark {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: this should return a nullable (if no specific security is selected, the result should be null)
|
||||
public SecurityMD result {
|
||||
get {
|
||||
SecurityCriteriaClause scc = new SecurityCriteriaClause();
|
||||
scc.security_keys = selected_securities;
|
||||
SecurityCriteria crit = new SecurityCriteria(new SecurityCriteriaClause[] { scc });
|
||||
return all_securities.Where(s => security_in_criteria(crit, s.Value.security)).FirstOrDefault().Value;
|
||||
if (selected_securities.Count == 0)
|
||||
throw new InvalidOperationException("No securities selected.");
|
||||
foreach (var k in selected_securities) {
|
||||
if (all_securities.TryGetValue(k, out var smd))
|
||||
return smd;
|
||||
}
|
||||
throw new InvalidOperationException("None of the selected security keys are present in the security map.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -427,7 +431,7 @@ namespace mbts.spark {
|
||||
bool check_exchanges = !(x.exchanges == null || x.exchanges.Length == 0);
|
||||
bool check_security_types = !(x.security_types == null || x.security_types.Length == 0);
|
||||
bool check_symbols = !(x.symbols == null || x.symbols.Length == 0);
|
||||
bool check_security_keys = !(x.security_keys == null || x.security_keys.Count == 0);
|
||||
bool check_security_keys = !(x.security_keys == null || x.security_keys.Length == 0);
|
||||
bool check_something_in_clause = check_exchanges || check_security_types || check_symbols || check_security_keys;
|
||||
|
||||
if (check_something_in_clause) {
|
||||
|
||||
@@ -8,8 +8,7 @@ using System.Reactive.Linq;
|
||||
|
||||
namespace mbts.spark {
|
||||
[ProtoContract]
|
||||
public class SecurityCriteria : IEquatable<SecurityCriteria>
|
||||
{
|
||||
class SecurityCriteria : IEquatable<SecurityCriteria> {
|
||||
public SecurityCriteria()
|
||||
{
|
||||
clauses = new SecurityCriteriaClause[] { };
|
||||
@@ -29,9 +28,7 @@ namespace mbts.spark {
|
||||
|
||||
internal static SecurityCriteria from_keys(IEnumerable<uint> keys) =>
|
||||
new SecurityCriteria(new[] {
|
||||
new SecurityCriteriaClause {
|
||||
security_keys = keys.ToList()
|
||||
}
|
||||
new SecurityCriteriaClause (security_keys: keys.ToArray())
|
||||
});
|
||||
|
||||
internal static SecurityCriteria from_securities(ISet<SecurityImmutable> securities) =>
|
||||
@@ -49,27 +46,38 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
[ProtoContract]
|
||||
public class SecurityCriteriaClause : IEquatable<SecurityCriteriaClause>
|
||||
{
|
||||
public SecurityCriteriaClause() { }
|
||||
internal SecurityCriteriaClause(IEnumerable<SecurityImmutable> securities) {
|
||||
security_keys = securities.Select(s => s.Id).ToList();
|
||||
readonly struct SecurityCriteriaClause : IEquatable<SecurityCriteriaClause> {
|
||||
public SecurityCriteriaClause(
|
||||
Venue[] exchanges = null,
|
||||
SecurityType[] security_types = null,
|
||||
string[] symbols = null,
|
||||
uint[] security_keys = null,
|
||||
string pretty_name = null) {
|
||||
//
|
||||
this.exchanges = exchanges;
|
||||
this.security_types = security_types;
|
||||
this.symbols = symbols;
|
||||
this.security_keys = security_keys;
|
||||
this.pretty_name = pretty_name;
|
||||
}
|
||||
|
||||
public SecurityCriteriaClause(IEnumerable<SecurityImmutable> securities)
|
||||
: this(security_keys: securities.Select(s => s.Id).ToArray()) { }
|
||||
|
||||
[ProtoMember(1)]
|
||||
public string pretty_name;
|
||||
public readonly string pretty_name;
|
||||
|
||||
[ProtoMember(2)]
|
||||
public Venue[] exchanges;
|
||||
public readonly Venue[] exchanges;
|
||||
|
||||
[ProtoMember(3)]
|
||||
public SecurityType[] security_types;
|
||||
public readonly SecurityType[] security_types;
|
||||
|
||||
[ProtoMember(4)]
|
||||
public string[] symbols;
|
||||
public readonly string[] symbols;
|
||||
|
||||
[ProtoMember(5)]
|
||||
public List<uint> security_keys;
|
||||
public readonly uint[] security_keys;
|
||||
|
||||
public bool is_defined =>
|
||||
!string.IsNullOrEmpty(pretty_name) ||
|
||||
@@ -84,7 +92,6 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
public bool Equals(SecurityCriteriaClause other) =>
|
||||
other != null &&
|
||||
EqualityComparer.safe_sequence_equals(exchanges, other.exchanges) &&
|
||||
EqualityComparer.safe_sequence_equals(security_types, other.security_types) &&
|
||||
EqualityComparer.safe_sequence_equals(symbols, other.symbols) &&
|
||||
|
||||
@@ -90,7 +90,6 @@ namespace mbts.spark {
|
||||
/// <param name="clause">A SecurityCriteriaClause.</param>
|
||||
/// <returns>true if the clause is non-null and specifies one security-key, and nothing else; otherwise false.</returns>
|
||||
public static bool is_single_security(this SecurityCriteriaClause clause) =>
|
||||
clause != null &&
|
||||
clause.exchanges.is_null_or_empty() &&
|
||||
clause.symbols.is_null_or_empty() &&
|
||||
clause.security_types.is_null_or_empty() &&
|
||||
@@ -98,6 +97,45 @@ namespace mbts.spark {
|
||||
!clause.security_keys.Distinct().Skip(1).Any();
|
||||
|
||||
public static bool includes(this SecurityCriteria security_criteria, SecurityImmutable security) =>
|
||||
security_criteria != null && ContractPickerModel.security_in_criteria(security_criteria, security);
|
||||
security_criteria.is_defined() && ContractPickerModel.security_in_criteria(security_criteria, security);
|
||||
|
||||
public static bool includes(this SecurityCriteriaClause clause, SecurityImmutable security) =>
|
||||
_to_predicates(clause).AnyAndAll(p => p(security));
|
||||
|
||||
public static bool is_subset_of(this SecurityCriteriaClause clause, SecurityCriteriaClause other) =>
|
||||
// exchanges
|
||||
(other.exchanges.is_null_or_empty() ||
|
||||
(!clause.exchanges.is_null_or_empty() && clause.exchanges.All(other.exchanges.Contains))) &&
|
||||
// symbols
|
||||
(other.symbols.is_null_or_empty() ||
|
||||
(!clause.symbols.is_null_or_empty() && clause.symbols.All(other.symbols.Contains))) &&
|
||||
// security_types
|
||||
(other.security_types.is_null_or_empty() ||
|
||||
(!clause.security_types.is_null_or_empty() && clause.security_types.All(other.security_types.Contains))) &&
|
||||
// security_keys
|
||||
(other.security_keys.is_null_or_empty() ||
|
||||
(!clause.security_keys.is_null_or_empty() && clause.security_keys.All(other.security_keys.Contains)));
|
||||
|
||||
public static IEnumerable<string> fmt_diagnostic_msgs(this SecurityCriteriaClause clause) {
|
||||
if (clause.exchanges != null && clause.exchanges.Length > 0)
|
||||
yield return "Exchanges: " + string.Join(", ", clause.exchanges);
|
||||
if (clause.symbols != null && clause.symbols.Length > 0)
|
||||
yield return "Symbols: " + string.Join(", ", clause.symbols);
|
||||
if (clause.security_types != null && clause.security_types.Length > 0)
|
||||
yield return "Security Types: " + string.Join(", ", clause.security_types);
|
||||
if (clause.security_keys != null && clause.security_keys.Length > 0)
|
||||
yield return "Security Keys: " + string.Join(", ", clause.security_keys);
|
||||
}
|
||||
|
||||
static IEnumerable<Func<SecurityImmutable, bool>> _to_predicates(SecurityCriteriaClause clause) {
|
||||
if (clause.exchanges != null && clause.exchanges.Length > 0)
|
||||
yield return sec => clause.exchanges.Contains(sec.Exchange);
|
||||
if (clause.symbols != null && clause.symbols.Length > 0)
|
||||
yield return sec => clause.symbols.Contains(sec.Symbol);
|
||||
if (clause.security_types != null && clause.security_types.Length > 0)
|
||||
yield return sec => clause.security_types.Contains(sec.security_type());
|
||||
if (clause.security_keys != null && clause.security_keys.Length > 0)
|
||||
yield return sec => clause.security_keys.Contains(sec.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -169,7 +169,7 @@ namespace mbts.spark {
|
||||
}
|
||||
|
||||
// restore sort state or supply default value
|
||||
pnl_view.set_sort_descriptions(startup_data.sorting_criterion, columns);
|
||||
pnl_view.set_sort_descriptions(startup_data.sorting_criteria, columns);
|
||||
|
||||
var col_settings_flags = new Dictionary<string, GridColumnSettingsFeatureFlags> {
|
||||
{ Columns.StartPNL.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
|
||||
|
||||
@@ -40,25 +40,53 @@ namespace mbts.ui {
|
||||
public static bool operator !=(QuantityConversionData x, QuantityConversionData y) => !x.Equals(y);
|
||||
}
|
||||
|
||||
class DisplayQuantityMultiplier : IDisplayTranslator<uint> {
|
||||
uint _actual_value;
|
||||
static class DisplayQuantityMultiplier {
|
||||
public static DisplayQuantityMultiplier<uint> create_uint() =>
|
||||
new DisplayQuantityMultiplier<uint>(
|
||||
DisplayTranslatorExtensions.to_display,
|
||||
DisplayTranslatorExtensions.from_display);
|
||||
|
||||
public static DisplayQuantityMultiplier<double> create_double() =>
|
||||
new DisplayQuantityMultiplier<double>(
|
||||
DisplayTranslatorExtensions.to_display,
|
||||
DisplayTranslatorExtensions.from_display);
|
||||
}
|
||||
|
||||
class DisplayQuantityMultiplier<T> : IDisplayTranslator<T> {
|
||||
readonly Func<QuantityConversionData, T, T> _to_display, _from_display;
|
||||
readonly IEqualityComparer<T> _comparer;
|
||||
T _actual_value;
|
||||
QuantityConversionData _conversion_data;
|
||||
|
||||
public DisplayQuantityMultiplier(
|
||||
Func<QuantityConversionData, T, T> to_display,
|
||||
Func<QuantityConversionData, T, T> from_display,
|
||||
IEqualityComparer<T> comparer = null,
|
||||
T actual_value = default,
|
||||
QuantityConversionData conversion_data = default) {
|
||||
//
|
||||
_to_display = to_display ?? throw new ArgumentNullException(nameof(to_display));
|
||||
_from_display = from_display ?? throw new ArgumentNullException(nameof(from_display));
|
||||
_comparer = comparer ?? EqualityComparer<T>.Default;
|
||||
_actual_value = actual_value;
|
||||
_conversion_data = conversion_data;
|
||||
}
|
||||
|
||||
public event Action value_changed;
|
||||
|
||||
public uint actual_value {
|
||||
public T actual_value {
|
||||
get => _actual_value;
|
||||
set {
|
||||
if (_actual_value != value) {
|
||||
if (!_comparer.Equals(_actual_value, value)) {
|
||||
_actual_value = value;
|
||||
value_changed?.Invoke();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public uint display_value {
|
||||
get => _conversion_data.to_display(_actual_value);
|
||||
set => actual_value = _conversion_data.from_display(value);
|
||||
public T display_value {
|
||||
get => _to_display(_conversion_data, _actual_value);
|
||||
set => actual_value = _from_display(_conversion_data, value);
|
||||
}
|
||||
|
||||
public QuantityConversionData conversion_data {
|
||||
@@ -168,5 +196,13 @@ namespace mbts.ui {
|
||||
default: return display_value;
|
||||
}
|
||||
}
|
||||
|
||||
public static double from_display(this QuantityConversionData quantity_conversion_data, double display_value) {
|
||||
switch (quantity_conversion_data.op) {
|
||||
case QuantityConversionData.OpType.DivideActual: return display_value * quantity_conversion_data.value;
|
||||
case QuantityConversionData.OpType.MultiplyActual: return display_value.safe_divide(quantity_conversion_data.value);
|
||||
default: return display_value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,18 @@
|
||||
using System;
|
||||
using bts.api;
|
||||
|
||||
namespace bts.api
|
||||
{
|
||||
public static class SecurityExtensions
|
||||
{
|
||||
namespace bts.api {
|
||||
public static class SecurityExtensions {
|
||||
public static SecurityType security_type(this Security s) { return ((SecurityImmutable)s).security_type(); }
|
||||
|
||||
public static SecurityType security_type(this Security.ContractOneofCase contract_case) {
|
||||
switch (contract_case) {
|
||||
case Security.ContractOneofCase.Future: return SecurityType.Future;
|
||||
case Security.ContractOneofCase.Option: return SecurityType.Option;
|
||||
case Security.ContractOneofCase.Spread: return SecurityType.Spread;
|
||||
case Security.ContractOneofCase.Synthetic: return SecurityType.Synthetic;
|
||||
default: return SecurityType.Unset;
|
||||
}
|
||||
}
|
||||
|
||||
public static string display_symbol(this SecurityImmutable security) =>
|
||||
SecurityHelper.get_display_symbol(security);
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,24 @@
|
||||
using System;
|
||||
using mbts.co2;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using static bts.api.Security;
|
||||
|
||||
namespace bts.api {
|
||||
internal static class SecurityHelper {
|
||||
public static IEnumerable<string> get_all_display_symbols() =>
|
||||
get_all_display_symbols(UserSymbol.get_all().Select(usym => usym.symbol));
|
||||
|
||||
public static IEnumerable<string> get_all_display_symbols(IEnumerable<string> system_symbols) {
|
||||
// todo: actual impl
|
||||
return system_symbols;
|
||||
}
|
||||
|
||||
public static string get_display_symbol(SecurityImmutable security) {
|
||||
// todo: actual impl
|
||||
return security.Symbol;
|
||||
}
|
||||
|
||||
public static IEnumerable<FutureLeg> get_flat_future_legs(SecurityImmutable sec) {
|
||||
switch (sec.ContractCase) {
|
||||
case ContractOneofCase.Spread: return _get_flat_future_legs(sec.Spread.Legs, 1);
|
||||
|
||||
@@ -7,6 +7,26 @@ using System.Reactive.Linq;
|
||||
|
||||
namespace System.Collections.Generic {
|
||||
public static class EnumerableExtensions {
|
||||
/// <summary>
|
||||
/// Similar to <see cref="Enumerable.All{TSource}(IEnumerable{TSource}, Func{TSource, bool})"/>, but returns false if the <paramref name="source"/> is empty.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The type of elements in the source.</typeparam>
|
||||
/// <param name="source">The sequence of elements to which the predicate will be applied.</param>
|
||||
/// <param name="predicate">The predicate applied to each element in the specified sequence.</param>
|
||||
/// <returns>True if the source sequence is not empty, and every element within it passes the test in the specified predicate; otherwise, false.</returns>
|
||||
public static bool AnyAndAll<T>(this IEnumerable<T> source, Func<T, bool> predicate) {
|
||||
using (var en = source.GetEnumerator()) {
|
||||
if (en.MoveNext()) {
|
||||
do {
|
||||
if (!predicate(en.Current))
|
||||
return false;
|
||||
} while (en.MoveNext());
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
#region Ordered
|
||||
public static IOrderedEnumerable<T> Ordered<T>(this IEnumerable<T> enumerable) =>
|
||||
enumerable.OrderBy(t => t);
|
||||
@@ -165,6 +185,9 @@ namespace System.Collections.Generic {
|
||||
}
|
||||
}
|
||||
|
||||
public static IList<T> ToListLazy<T>(this IEnumerable<T> source) =>
|
||||
new LazyList<T>(source);
|
||||
|
||||
public static bool TryGetFirst<T>(this IEnumerable<T> source, out T result) {
|
||||
if (source == null) throw new ArgumentNullException(nameof(source));
|
||||
using (var en = source.GetEnumerator()) {
|
||||
@@ -590,6 +613,9 @@ namespace System.Collections.Generic {
|
||||
public static bool is_null_or_empty<T>(this IEnumerable<T> source) =>
|
||||
source == null || !source.Any();
|
||||
|
||||
public static bool is_null_or_empty<T>(this T[] array) =>
|
||||
array == null || array.Length == 0;
|
||||
|
||||
public static IEnumerable<T> empty_if_null<T>(this IEnumerable<T> source) =>
|
||||
source ?? Enumerable.Empty<T>();
|
||||
|
||||
@@ -634,5 +660,44 @@ namespace System.Collections.Generic {
|
||||
|
||||
public int? Count => _collection?.Count ?? _ro_collection?.Count;
|
||||
}
|
||||
|
||||
class LazyList<T> : IList<T> {
|
||||
IEnumerable<T> _source;
|
||||
IList<T> _list_backing;
|
||||
|
||||
public LazyList(IEnumerable<T> source) =>
|
||||
_source = source;
|
||||
|
||||
public T this[int index] { get => _list[index]; set => _list[index] = value; }
|
||||
|
||||
public int Count => _list.Count;
|
||||
|
||||
public bool IsReadOnly => _list.IsReadOnly;
|
||||
|
||||
IList<T> _list {
|
||||
get {
|
||||
if (_list_backing == null) {
|
||||
if (_source == null) {
|
||||
_list_backing = new List<T>(0);
|
||||
} else {
|
||||
_list_backing = new List<T>(_source);
|
||||
_source = null;
|
||||
}
|
||||
}
|
||||
return _list_backing;
|
||||
}
|
||||
}
|
||||
|
||||
public void Add(T item) => _list.Add(item);
|
||||
public void Clear() => _list.Clear();
|
||||
public bool Contains(T item) => _list.Contains(item);
|
||||
public void CopyTo(T[] array, int arrayIndex) => _list.CopyTo(array, arrayIndex);
|
||||
public IEnumerator<T> GetEnumerator() => _list.GetEnumerator();
|
||||
public int IndexOf(T item) => _list.IndexOf(item);
|
||||
public void Insert(int index, T item) => _list.Insert(index, item);
|
||||
public bool Remove(T item) => _list.Remove(item);
|
||||
public void RemoveAt(int index) => _list.RemoveAt(index);
|
||||
IEnumerator IEnumerable.GetEnumerator() => _list.GetEnumerator();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -40,6 +40,17 @@ namespace bts.utils {
|
||||
});
|
||||
}
|
||||
|
||||
public static void FilterIncremental<T, TKey>(this TableUpdate<T, TKey> table, Func<T, bool> predicate, out IEnumerable<T> added, out IEnumerable<Change<T>> changes, out IEnumerable<T> removed) where TKey : IEquatable<TKey> {
|
||||
// added
|
||||
added = table.added.Where(predicate).Concat(
|
||||
table.changes.Where(ch => predicate(ch.New) && !predicate(ch.Old)).Select(ch => ch.New));
|
||||
// changes
|
||||
changes = table.changes.Where(ch => predicate(ch.New) && predicate(ch.Old));
|
||||
// removed
|
||||
removed = table.removed.Where(predicate).Concat(
|
||||
table.changes.Where(ch => !predicate(ch.New) && predicate(ch.Old)).Select(ch => ch.Old));
|
||||
}
|
||||
|
||||
public static TableUpdate<T, TKey> with_added<T, TKey>(this TableUpdate<T, TKey> table, IEnumerable<T> added) where TKey : IEquatable<TKey> =>
|
||||
TableUpdate<T, TKey>.update(table, added, Enumerable.Empty<Change<T>>(), Enumerable.Empty<T>(), table.key_extractor);
|
||||
|
||||
@@ -81,7 +92,8 @@ namespace bts.utils {
|
||||
void update(TableUpdate<T, TKey> input) {
|
||||
state = input.state;
|
||||
var builder = output.to_builder();
|
||||
// execute all parent_to_children changes first, so descendent-propagation will be efficient (otherwise propagation might be needlessly performed on values that are yet to be removed, or performed with the wrong root, if the real root is yet to be added).
|
||||
// execute all parent_to_children changes first, so descendent-propagation will be efficient
|
||||
// (otherwise propagation might be needlessly performed on values that are yet to be removed, or performed with the wrong root, if the real root is yet to be added).
|
||||
foreach (var v in input.removed.Concat(input.changes.Select(ch => ch.Old))) {
|
||||
var k = input.key_extractor(v);
|
||||
parent_to_children.remove(parent_key(v), v);
|
||||
|
||||
@@ -1 +1 @@
|
||||
set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.cpp;metrics/metrics.cpp;metricsLine truncated
|
||||
set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/AlgoTypes.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;mercury/actors/IPollableActor.cpp;mercury/broker/Broker.cpp;mercury/broker/BrokerProxy.cpp;mercury/broker/ILocalBroker.cpp;mercury/broker/IRemoteBroker.cpp;mercury/common/mercury_common.cpp;mercury/events/TimerEvent.cpp;mercury/executor/Executor.cpp;mercury/topics/Topic.Line truncated
|
||||
@@ -1 +1 @@
|
||||
set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessionManager.cpp;utils/AuthToken.cLine truncated
|
||||
set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/service_helpers/AlgoServiceUtils.cpp;api/service_helpers/PositionUtilities.cpp;api/services/AdminService.proto;api/services/AlgoDefinitionService.proto;api/services/AlgoService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/BasePositionService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MBOService.proto;api/services/MarginService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/MarketDataService.proto;api/services/MoneyFileService.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/keycode.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/position_cfg.conf;config/defaults/span.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/AlgoTypes.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/keycode.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/perflog_cfg.proto;config/protos/position_cfg.proto;config/protos/quickbus_cfg.proto;config/protos/span.proto;config/protos/spreader.proto;config/protos/subprocess.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/sod.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MBOProcessor.cpp;md/MBOServiceServer.cpp;md/MDClient.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/Product.cpp;md/SecurityCache.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SecurityMapper.cpp;md/SecurityOracle.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/ice/ICEUtils.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/service/MarketDataServiceServer.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/mbo_tests.cpp;md/test/md2_tests.cpp;md/test/md_test_utils.cpp;md/test/synthetic_book_merge_tests.cpp;md/vendor/OnixsUtils.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthSessioLine truncated
|
||||
@@ -0,0 +1,22 @@
|
||||
syntax='proto2';
|
||||
package bts.config;
|
||||
|
||||
message AlgoTypeContext {
|
||||
repeated string exchanges = 1;
|
||||
repeated string symbols = 2;
|
||||
repeated string security_types = 3;
|
||||
}
|
||||
|
||||
message AlgoTypeDef {
|
||||
optional string name = 1;
|
||||
optional bool is_attachable = 2 [default = false];
|
||||
}
|
||||
|
||||
message AlgoTypeRule {
|
||||
optional AlgoTypeContext context = 1;
|
||||
repeated AlgoTypeDef algos = 2;
|
||||
}
|
||||
|
||||
message AlgoTypeRuleSet {
|
||||
repeated AlgoTypeRule rules = 1;
|
||||
}
|
||||
@@ -92,7 +92,8 @@ public:
|
||||
ask = ask_ps.price();
|
||||
PriceSize last_ps;
|
||||
datetime::LLDateTime trade_time;
|
||||
handle.get_last_trade(time, last_ps, trade_time, nullptr);
|
||||
TimeStamp zero_time;
|
||||
handle.get_last_trade(zero_time, last_ps, trade_time, nullptr);
|
||||
last = last_ps.price();
|
||||
settle = handle.settlement_price().price();
|
||||
}
|
||||
|
||||
@@ -323,28 +323,28 @@ void PositionServiceServer::set_base_position(
|
||||
}
|
||||
|
||||
void PositionServiceServer::update_security_parameters(
|
||||
const SecurityParametersBatchOp&,
|
||||
const SecurityParametersBatchOp& req,
|
||||
const api::Response<SecurityParametersBatchOpResponse>&){
|
||||
// TODO
|
||||
// LOG(persist, Info, "PositionServiceServer::update_security_parameters bp count:{}",
|
||||
// req.op_params_size());
|
||||
// for (const auto& p : req.op_params()){
|
||||
// std::string key_str = std::to_string(p.security_key());
|
||||
// auto db_p = me->security_params_store->retrieve_one(security_params_ns, key_str);
|
||||
// auto found = db_p.first;
|
||||
// if (!found) {
|
||||
// me->security_params_store->insert(security_params_ns,
|
||||
// key_str,
|
||||
// utils::pb::to_string(p));
|
||||
// }
|
||||
// else {
|
||||
// me->security_params_store->insert(security_params_ns,
|
||||
// key_str,
|
||||
// utils::pb::to_string(p));
|
||||
// }
|
||||
// }
|
||||
// _load_security_params();
|
||||
// _compute_pnl_and_publish();
|
||||
LOG(persist, Info, "PositionServiceServer::update_security_parameters bp count:{}",
|
||||
req.op_params_size());
|
||||
for (const auto& p : req.op_params()){
|
||||
std::string key_str = std::to_string(p.security_key());
|
||||
auto db_p = me->security_params_store->retrieve_one(security_params_ns, key_str);
|
||||
auto found = db_p.first;
|
||||
if (!found) {
|
||||
me->security_params_store->insert(security_params_ns,
|
||||
key_str,
|
||||
utils::pb::to_string(p));
|
||||
}
|
||||
else {
|
||||
me->security_params_store->update(security_params_ns,
|
||||
key_str,
|
||||
utils::pb::to_string(p));
|
||||
}
|
||||
}
|
||||
_load_security_params();
|
||||
_compute_pnl_and_publish();
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in new issue
Block a user