synthetic management window shows all synthetics, with or without a strategy

This commit is contained in:
John Colvin committed 2018-02-28 19:48:05 -05:00
1 parent 2cc62fb9d2
commit 0888d7066f
4 files changed
+24 -6

No files matched your search

@@ -24,7 +24,14 @@ namespace mbts.spark
}
public IObservable<IReadOnlyDictionary<uint, ExecutionStrategyImmutable>> strategy => _bus.subscribe(SparkTags.SyntheticstrategiesTag);
public IObservable<IReadOnlyDictionary<uint, (ExecutionStrategyImmutable strategy, SecurityMD md)>> strategy_tuple => _bus.subscribe(SparkTags.SecuritiesTag).CombineLatest(strategy, (m, s) => s.Join(m));
public IObservable<IReadOnlyDictionary<uint, (ExecutionStrategyImmutable? strategy, SecurityMD md)>> strategy_tuple =>
_bus.subscribe(SparkTags.SecuritiesTag)
.Select(md_map => md_map.Values.Where(smd => smd.security.ContractCase == Security.ContractOneofCase.Synthetic).ToList())
.CombineLatest(_bus.subscribe(SparkTags.SyntheticstrategiesTag),
(synthetics, strategies) => synthetics
.ToDictionary(smd => smd.security.Id)
.LeftJoin(strategies, (security, strategy) => (new ExecutionStrategyImmutable?(strategy), security), security => (new ExecutionStrategyImmutable?(), security))
);
public async Task<(ExecutionStrategyImmutable result, bool success)> lookup_strategy_async(SecurityImmutable security) {
var result = await _service.query_security_metadata_async(new MetadataQuery { SecurityKey = { security.Id } });
@@ -25,10 +25,11 @@
c:DataGridFilterProperties.Filter="{Binding DataContext.security_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.security_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource RegexFinder}"/>
<DataGridTextColumn Header="# Legs" Binding="{Binding n_legs}" Width="*"
<DataGridTextColumn Header="# Legs" Binding="{Binding n_legs}"
c:DataGridFilterProperties.Filter="{Binding DataContext.n_legs_filter, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterActive="{Binding DataContext.n_legs_filter.active, Source={u:DirectReference grid}}"
c:DataGridFilterProperties.FilterTemplate="{StaticResource IntMinMaxTemplate}"/>
<DataGridTextColumn Header="Strategy Present" Binding="{Binding strategy_present}" Width="*"/>
</DataGrid.Columns>
</c:DataGridEx>
</Grid>
@@ -10,7 +10,7 @@ using static bts.shell.SyntheticManagementWindowFactory;
using static mbts.spark.DataGridColumnFilters;
namespace mbts.spark {
class SyntheticManagementVM : SecurityMDGrid<SyntheticManagementVM.Row, (ExecutionStrategyImmutable strategy, SecurityMD md)> {
class SyntheticManagementVM : SecurityMDGrid<SyntheticManagementVM.Row, (ExecutionStrategyImmutable? strategy, SecurityMD md)> {
readonly SpreaderModel _model;
public SyntheticManagementVM(IBus bus, SpreaderModel model) : this(bus, model, null, null) { }
@@ -18,7 +18,7 @@ namespace mbts.spark {
: base(model.strategy_tuple.Select(map => map.Values), sorting) =>
_model = model;
protected override Row row_factory((ExecutionStrategyImmutable strategy, SecurityMD md) row_model) => new Row(row_model.md, row_model.strategy);
protected override Row row_factory((ExecutionStrategyImmutable? strategy, SecurityMD md) row_model) => new Row(row_model.md, row_model.strategy);
#region Filters
public IDataGridColumnPersistentFilter<Row, TimeFilterTuple> create_time_filter { get; } = new Time<Row>(r => r.create_time, nameof(Row.create_time));
@@ -41,9 +41,9 @@ namespace mbts.spark {
new PartFormattingTuple(ContractParts.Symbol),
new PartFormattingTuple(ContractParts.RawExp, "l")
};
readonly ExecutionStrategyImmutable _strategy;
readonly ExecutionStrategyImmutable? _strategy;
public Row(SecurityMD security_md, ExecutionStrategyImmutable strategy) : base(security_md) {
public Row(SecurityMD security_md, ExecutionStrategyImmutable? strategy) : base(security_md) {
_strategy = strategy;
name = security.Synthetic.Name;
n_legs = security.Synthetic.Legs.Count();
@@ -54,6 +54,7 @@ namespace mbts.spark {
public string name { get; }
public int n_legs { get; }
public string description { get; }
public bool strategy_present => _strategy.HasValue;
}
}
}
@@ -367,6 +367,15 @@ namespace System.Collections.Generic
return new ReadOnlyDictionary<TKey, TResult>(iks.ToDictionary(k => k, k => select(dictionary[k], merge_target[k])));
}
public static IReadOnlyDictionary<TKey, TResult> LeftJoin<TKey, TValue1, TValue2, TResult>(this IReadOnlyDictionary<TKey, TValue1> dictionary, IReadOnlyDictionary<TKey, TValue2> merge_target,
Func<TValue1, TValue2, TResult> select, Func<TValue1, TResult> select_left_only) =>
dictionary.ToDictionary(kv => kv.Key, kv => {
if (merge_target.TryGetValue(kv.Key, out TValue2 v2))
return select(kv.Value, v2);
else
return select_left_only(kv.Value);
});
public static IReadOnlyDictionary<TKey, (TValue1, TValue2)> SuperJoin<TKey, TValue1, TValue2>(this IReadOnlyDictionary<TKey, TValue1> dictionary, IReadOnlyDictionary<TKey, TValue2> merge_target) {
var eks1 = dictionary.Keys.Except(merge_target.Keys);
var eks2 = merge_target.Keys.Except(dictionary.Keys);