Compare commits
73
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6bb4c73a8 | ||
|
|
e43a2a4818 | ||
|
|
cde0f44b7d | ||
|
|
b07a1e2c74 | ||
|
|
8376fce5fe | ||
|
|
d9e5c846c2 | ||
|
|
65736c13ef | ||
|
|
071c28e925 | ||
|
|
8355e3e1be | ||
|
|
f9a6e0963c | ||
|
|
b2879837c6 | ||
|
|
0d03ddb009 | ||
|
|
a6dfa4ae80 | ||
|
|
e66ec82ba8 | ||
|
|
9ce5e971c6 | ||
|
|
3e7cc49ebb | ||
|
|
d07e68b6e2 | ||
|
|
619ece2313 | ||
|
|
1dda9566f3 | ||
|
|
3704d1ed16 | ||
|
|
a524ca02a5 | ||
|
|
3c97f2552b | ||
|
|
15b1d55ef1 | ||
|
|
4e42c9f01b | ||
|
|
76775f821a | ||
|
|
e7088f6b1c | ||
|
|
f2c3ff4be6 | ||
|
|
1fb42ade59 | ||
|
|
129650e9d4 | ||
|
|
170a44ac04 | ||
|
|
7e04f02327 | ||
|
|
abda2dbf97 | ||
|
|
ad1a45cf49 | ||
|
|
e9abdd0ff2 | ||
|
|
9254002318 | ||
|
|
596780b7f4 | ||
|
|
7ba061ac20 | ||
|
|
c01593d119 | ||
|
|
09e2a1764f | ||
|
|
a780668bce | ||
|
|
5b79aeaa14 | ||
|
|
049c006b5f | ||
|
|
6fdc344472 | ||
|
|
cb09b93553 | ||
|
|
21447d32e5 | ||
|
|
28b03e1cd2 | ||
|
|
a7acb89c15 | ||
|
|
35289710ba | ||
|
|
4677acfb39 | ||
|
|
ac05d0d69e | ||
|
|
25a9b6b433 | ||
|
|
b78713ad0d | ||
|
|
1f3d0e879c | ||
|
|
baad4dc68e | ||
|
|
ef7c0c7a30 | ||
|
|
3b3c4a2a35 | ||
|
|
ef9fc66a31 | ||
|
|
212d9c853b | ||
|
|
7815b18b6b | ||
|
|
05126074d4 | ||
|
|
3611d2c1f3 | ||
|
|
b5ad4b8104 | ||
|
|
43d7c0a2b5 | ||
|
|
12e361cec7 | ||
|
|
82c126362d | ||
|
|
fd2ba70031 | ||
|
|
ab410c339f | ||
|
|
9e3f16d8bc | ||
|
|
a3f194d708 | ||
|
|
bf87c46fcd | ||
|
|
222d4b266e | ||
|
|
d593eaf058 | ||
|
|
55d021ccb1 |
No files matched your search
@@ -7,6 +7,24 @@
|
|||||||
"commands": [
|
"commands": [
|
||||||
"dotnet-format"
|
"dotnet-format"
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
"fable": {
|
||||||
|
"version": "4.0.0-theta-018",
|
||||||
|
"commands": [
|
||||||
|
"fable"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"fantomas": {
|
||||||
|
"version": "5.2.2",
|
||||||
|
"commands": [
|
||||||
|
"fantomas"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"fake-cli": {
|
||||||
|
"version": "6.0.0",
|
||||||
|
"commands": [
|
||||||
|
"fake"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
Submodule externals updated: 4d96613ca8...4a3e40193e.
@@ -1,53 +1,55 @@
|
|||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ComputerSpecificConfig>..\..\tools\override\$(computername).props</ComputerSpecificConfig>
|
<ComputerSpecificConfig>..\..\tools\override\$(computername).props</ComputerSpecificConfig>
|
||||||
<SparkRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\..))</SparkRoot>
|
<SparkRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\..))</SparkRoot>
|
||||||
<SourceRoot>$([System.IO.Path]::GetFullPath($(SparkRoot)\src))</SourceRoot>
|
<SourceRoot>$([System.IO.Path]::GetFullPath($(SparkRoot)\src))</SourceRoot>
|
||||||
<Externals>$(SparkRoot)\externals\windows</Externals>
|
<Externals>$(SparkRoot)\externals\windows</Externals>
|
||||||
<DepotName>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetFullPath($(SparkRoot)))))</DepotName>
|
<DepotName>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetFullPath($(SparkRoot)))))</DepotName>
|
||||||
<ErrorReport>None</ErrorReport>
|
<ErrorReport>None</ErrorReport>
|
||||||
<Prefer32Bit>False</Prefer32Bit>
|
<Prefer32Bit>False</Prefer32Bit>
|
||||||
<Deterministic>true</Deterministic>
|
<Deterministic>true</Deterministic>
|
||||||
<EnableDefaultContentItems>False</EnableDefaultContentItems>
|
<EnableDefaultContentItems>False</EnableDefaultContentItems>
|
||||||
<ShowMissingItemTypes>false</ShowMissingItemTypes>
|
<ShowMissingItemTypes>false</ShowMissingItemTypes>
|
||||||
<Configuration Condition="'$(configuration)'==''">Debug</Configuration>
|
<Configuration Condition="'$(configuration)'==''">Debug</Configuration>
|
||||||
<EnablePreviewFeatures>true</EnablePreviewFeatures>
|
<EnablePreviewFeatures>true</EnablePreviewFeatures>
|
||||||
</PropertyGroup>
|
<LangVersion>11</LangVersion>
|
||||||
|
</PropertyGroup>
|
||||||
<PropertyGroup Label="Output">
|
|
||||||
<BaseOutputPath>$(SparkRoot)\build\$(Configuration)</BaseOutputPath>
|
<PropertyGroup Label="Output">
|
||||||
<OutputPath>$(BaseOutputPath)\bin</OutputPath>
|
<BaseOutputPath>$(SparkRoot)\build\$(Configuration)</BaseOutputPath>
|
||||||
<BaseIntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
<OutputPath>$(BaseOutputPath)\bin</OutputPath>
|
||||||
<IntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</IntermediateOutputPath>
|
<BaseIntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
||||||
<GenDir>$(BaseOutputPath)\gen\$(MSBuildProjectName)</GenDir>
|
<IntermediateOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</IntermediateOutputPath>
|
||||||
</PropertyGroup>
|
<ProtoOutputPath>$(BaseOutputPath)\obj\$(MSBuildProjectName)</ProtoOutputPath>
|
||||||
|
<GenDir>$(BaseOutputPath)\gen\$(MSBuildProjectName)</GenDir>
|
||||||
<Import
|
</PropertyGroup>
|
||||||
Project="$(ComputerSpecificConfig)"
|
|
||||||
Condition="Exists($(ComputerSpecificConfig))" />
|
<Import
|
||||||
|
Project="$(ComputerSpecificConfig)"
|
||||||
<PropertyGroup Label="ProtoBuf">
|
Condition="Exists($(ComputerSpecificConfig))" />
|
||||||
<ProtocPluginBase>$(SparkRoot)\src\lib\api\service_compiler</ProtocPluginBase>
|
|
||||||
<protoc>$(Externals)\bin\protoc.exe</protoc>
|
<PropertyGroup Label="ProtoBuf">
|
||||||
<protogen>$(Externals)\bin\protogen.exe</protogen>
|
<ProtocPluginBase>$(SparkRoot)\src\lib\api\service_compiler</ProtocPluginBase>
|
||||||
</PropertyGroup>
|
<protoc>$(Externals)\bin\protoc.exe</protoc>
|
||||||
|
<protogen>$(Externals)\bin\protogen.exe</protogen>
|
||||||
<ItemDefinitionGroup>
|
</PropertyGroup>
|
||||||
<Proto2></Proto2>
|
|
||||||
<Proto3>
|
<ItemDefinitionGroup>
|
||||||
<OutBase>$(IntermediateOutputPath)\gen\%(relativedir)</OutBase>
|
<Proto2></Proto2>
|
||||||
<OutCS>%(OutBase)%(FileName).cs</OutCS>
|
<Proto3>
|
||||||
<OutCSClient>%(OutBase)%(FileName).client.pb.cs</OutCSClient>
|
<OutBase>$(IntermediateOutputPath)\gen\%(relativedir)</OutBase>
|
||||||
<OutCSServer>%(OutBase)%(FileName).server.pb.cs</OutCSServer>
|
<OutCS>%(OutBase)%(FileName).cs</OutCS>
|
||||||
<OutCSImmutable>%(OutBase)%(FileName).immutable.pb.cs</OutCSImmutable>
|
<OutCSClient>%(OutBase)%(FileName).client.pb.cs</OutCSClient>
|
||||||
<CompileOptions></CompileOptions>
|
<OutCSServer>%(OutBase)%(FileName).server.pb.cs</OutCSServer>
|
||||||
</Proto3>
|
<OutCSImmutable>%(OutBase)%(FileName).immutable.pb.cs</OutCSImmutable>
|
||||||
<Proto3Excel>
|
<CompileOptions></CompileOptions>
|
||||||
<OutBase>$(IntermediateOutputPath)\gen\%(relativedir)</OutBase>
|
</Proto3>
|
||||||
<OutCSExcel>%(OutBase)%(FileName).excel.pb.cs</OutCSExcel>
|
<Proto3Excel>
|
||||||
<CompileOptions></CompileOptions>
|
<OutBase>$(IntermediateOutputPath)\gen\%(relativedir)</OutBase>
|
||||||
</Proto3Excel>
|
<OutCSExcel>%(OutBase)%(FileName).excel.pb.cs</OutCSExcel>
|
||||||
</ItemDefinitionGroup>
|
<CompileOptions></CompileOptions>
|
||||||
|
</Proto3Excel>
|
||||||
</Project>
|
</ItemDefinitionGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -3,7 +3,6 @@ namespace mbts.spark {
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.api.analytics;
|
using bts.api.analytics;
|
||||||
using bts.collections;
|
using bts.collections;
|
||||||
using bts.reactive;
|
|
||||||
using bts.utils;
|
using bts.utils;
|
||||||
|
|
||||||
using mbts;
|
using mbts;
|
||||||
@@ -18,6 +17,7 @@ namespace mbts.spark {
|
|||||||
using Spark.Core;
|
using Spark.Core;
|
||||||
using Spark.Core.Collections;
|
using Spark.Core.Collections;
|
||||||
using Spark.Core.Disposables;
|
using Spark.Core.Disposables;
|
||||||
|
using Spark.Core.Reactive;
|
||||||
using Spark.ViewModel.Commands;
|
using Spark.ViewModel.Commands;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|||||||
@@ -0,0 +1,120 @@
|
|||||||
|
namespace mbts.spark {
|
||||||
|
using bts;
|
||||||
|
using bts.api;
|
||||||
|
|
||||||
|
using mbts;
|
||||||
|
using mbts.analytics;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Collections;
|
||||||
|
|
||||||
|
// For each vs, it sends the vol surface calc request (_do_periodic_auto_fit)
|
||||||
|
// and then commits the response
|
||||||
|
public class SingleVolSurfaceAutoFitSource : IDisposable {
|
||||||
|
private readonly ThreadedBlackboard _bb;
|
||||||
|
private readonly int _vs_id;
|
||||||
|
private readonly ITag<VolSurfaceInput> _vs_input_tag;
|
||||||
|
private readonly ITag<VolSurfaceCalculationResponse> _vs_calc_response_tag;
|
||||||
|
private DateTime _last_req_time = DateTime.MinValue;
|
||||||
|
private TimeSpan _req_period = TimeSpan.MaxValue;
|
||||||
|
private int _req_id = 0;
|
||||||
|
public SingleVolSurfaceAutoFitSource(int vs_id, ThreadedBlackboard bb) {
|
||||||
|
_bb = bb;
|
||||||
|
_vs_id = vs_id;
|
||||||
|
_vs_input_tag = SparkTags.VolSurfaceCommittedInputTag(vs_id);
|
||||||
|
_vs_calc_response_tag = SparkTags.VolSurfaceAutoCalculationResponseTag(vs_id);
|
||||||
|
_bb.subscribe(_vs_input_tag);
|
||||||
|
_bb.subscribe(_vs_calc_response_tag);
|
||||||
|
_bb.subscribe(SparkTags.CurrentUser);
|
||||||
|
_bb.data_callback += _on_bb_data;
|
||||||
|
_bb.timer_callback += _on_bb_timer;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _on_bb_data(object tag, object data) {
|
||||||
|
if (tag.Equals(_vs_input_tag))
|
||||||
|
_possibly_autofit();
|
||||||
|
else if (tag.Equals(_vs_calc_response_tag)) {
|
||||||
|
VolSurfaceCalculationResponse calc_resp = data as VolSurfaceCalculationResponse;
|
||||||
|
bts.Log.Gen.info($"SingleVolSurfaceAutoFitSource._on_bb_data vs_id: {_vs_id} " +
|
||||||
|
$"received calculation response");
|
||||||
|
_bb.post(SparkTags.VolSurfaceCommitTag(_vs_id),
|
||||||
|
calc_resp.volsurface_calculation_output.volsurface_input);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool _user_has_vs_control() {
|
||||||
|
VolSurfaceInput vs_input = _bb.read_state(_vs_input_tag);
|
||||||
|
string current_user = _bb.read_state(SparkTags.CurrentUser).name;
|
||||||
|
return vs_input != null &&
|
||||||
|
vs_input.surface_settings.core_settings.vs_manager == current_user;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _on_bb_timer() {
|
||||||
|
_possibly_autofit();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _possibly_autofit() {
|
||||||
|
var auto_fit_period = _get_auto_fit_periodic();
|
||||||
|
if (!auto_fit_period.HasValue)
|
||||||
|
return;
|
||||||
|
if (DateTime.Now - _last_req_time <= auto_fit_period)
|
||||||
|
return;
|
||||||
|
if (!_user_has_vs_control())
|
||||||
|
return;
|
||||||
|
// auto fit here
|
||||||
|
bts.Log.Gen.info($"SingleVolSurfaceAutoFitSource vs_id: {_vs_id} requesting fit " +
|
||||||
|
$"last_req_time: {_last_req_time} period: {auto_fit_period.Value}");
|
||||||
|
_send_request();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Nullable<TimeSpan> _get_auto_fit_periodic() {
|
||||||
|
VolSurfaceInput vs_input = _bb.read_state(_vs_input_tag);
|
||||||
|
if (vs_input == null)
|
||||||
|
return null;
|
||||||
|
var fit_settings =
|
||||||
|
VolSurfaceDataFunctions.get_market_fit_settings(vs_input.surface_settings);
|
||||||
|
if (fit_settings == null)
|
||||||
|
return null;
|
||||||
|
var auto_fit_setting = fit_settings.vs_auto_fit_settings;
|
||||||
|
if (auto_fit_setting == null)
|
||||||
|
return null;
|
||||||
|
if (auto_fit_setting.auto_fit_region == VolSurfaceEnums.VolCurveFitRegion.None)
|
||||||
|
return null;
|
||||||
|
var time_based_fit_setting = auto_fit_setting.time_based_settings;
|
||||||
|
if (time_based_fit_setting == null)
|
||||||
|
return null;
|
||||||
|
if (!time_based_fit_setting.period_seconds.HasValue)
|
||||||
|
return null;
|
||||||
|
return TimeSpan.FromSeconds(time_based_fit_setting.period_seconds.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void _send_request() {
|
||||||
|
VolSurfaceInput vs_input = _bb.read_state(_vs_input_tag);
|
||||||
|
if (vs_input == null)
|
||||||
|
return;
|
||||||
|
VolCurveMarketFitAction mf_action = new VolCurveMarketFitAction(
|
||||||
|
VolCurveMarketFitAction.ActionType.FitWholeCurve, null, false);
|
||||||
|
VolCurveAction vc_action = new VolCurveAction(mf_action);
|
||||||
|
IDictionary<VolSurfaceExpiration, VolCurveAction> action_map =
|
||||||
|
vs_input.surface_parameters.curve_parameters_map.ToDictionary(
|
||||||
|
i => i.Item1,
|
||||||
|
i => vc_action
|
||||||
|
);
|
||||||
|
VolSurfaceCalculationRequest req = new VolSurfaceCalculationRequest(vs_input,
|
||||||
|
_req_id++, action_map, true, true);
|
||||||
|
_last_req_time = DateTime.Now;
|
||||||
|
_bb.post(SparkTags.VolSurfaceAutoCalculationRequestTag(_vs_id), req);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region IDisposable
|
||||||
|
public void Dispose() {
|
||||||
|
_bb.data_callback -= _on_bb_data;
|
||||||
|
_bb.timer_callback -= _on_bb_timer;
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -63,9 +63,9 @@ namespace mbts.spark {
|
|||||||
vs_input, vs_nonvol_data.contracts, aux_data_map);
|
vs_input, vs_nonvol_data.contracts, aux_data_map);
|
||||||
_timer.stop();
|
_timer.stop();
|
||||||
var tag_str = tag == null ? "Null" : tag.ToString();
|
var tag_str = tag == null ? "Null" : tag.ToString();
|
||||||
bts.Log.Gen.info($"SingleVolSurfaceCommittedOutputRetriever._recompute_and_publish " +
|
// bts.Log.Gen.info($"SingleVolSurfaceCommittedOutputRetriever._recompute_and_publish " +
|
||||||
$"vs_id: {_vs_id} time:{_timer.lastIntervalTime} ms tag:{tag_str} " +
|
// $"vs_id: {_vs_id} time:{_timer.lastIntervalTime} ms tag:{tag_str} " +
|
||||||
$"tid:{_tid()}"); //output: {vs_output.log_string()}*/");
|
// $"tid:{_tid()}"); //output: {vs_output.log_string()}*/");
|
||||||
_logger.log(_log_id, _log_id, _timer.lastIntervalTime);
|
_logger.log(_log_id, _log_id, _timer.lastIntervalTime);
|
||||||
_bb.post(_out_bb_computed_vol_tag, vs_output);
|
_bb.post(_out_bb_computed_vol_tag, vs_output);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
using bts.api.analytics;
|
using bts.api.analytics;
|
||||||
|
|
||||||
using mbts.analytics;
|
using mbts.analytics;
|
||||||
|
using mbts.ui;
|
||||||
|
|
||||||
using Spark.Core.Protobuf;
|
using Spark.Core.Protobuf;
|
||||||
|
|
||||||
@@ -13,6 +14,7 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
using System.Windows;
|
||||||
|
|
||||||
// For a single VolSurface this class
|
// For a single VolSurface this class
|
||||||
// 1. Listents to commmits and calls the service to persist data
|
// 1. Listents to commmits and calls the service to persist data
|
||||||
@@ -24,7 +26,6 @@
|
|||||||
private readonly ITag<VolSurfaceInput> _in_bb_committ_tag;
|
private readonly ITag<VolSurfaceInput> _in_bb_committ_tag;
|
||||||
private readonly AnalyticsService _analytics_service;
|
private readonly AnalyticsService _analytics_service;
|
||||||
private readonly HighPerformanceTimer _timer = new HighPerformanceTimer();
|
private readonly HighPerformanceTimer _timer = new HighPerformanceTimer();
|
||||||
private readonly string _user;
|
|
||||||
private readonly List<IDisposable> _disposables = new List<IDisposable>();
|
private readonly List<IDisposable> _disposables = new List<IDisposable>();
|
||||||
private IDictionary<UInt64, VolSurfaceInputSnapshot> _snp_shot_map = new
|
private IDictionary<UInt64, VolSurfaceInputSnapshot> _snp_shot_map = new
|
||||||
Dictionary<UInt64, VolSurfaceInputSnapshot>();
|
Dictionary<UInt64, VolSurfaceInputSnapshot>();
|
||||||
@@ -35,10 +36,10 @@
|
|||||||
volsurface_id));
|
volsurface_id));
|
||||||
_volsurface_id = volsurface_id;
|
_volsurface_id = volsurface_id;
|
||||||
_bb = threaded_bb;
|
_bb = threaded_bb;
|
||||||
_user = "TEST_USER"; // TODO
|
|
||||||
_in_bb_committ_tag = SparkTags.VolSurfaceCommitTag(volsurface_id);
|
_in_bb_committ_tag = SparkTags.VolSurfaceCommitTag(volsurface_id);
|
||||||
_analytics_service = analytics_service;
|
_analytics_service = analytics_service;
|
||||||
_bb.subscribe(_in_bb_committ_tag);
|
_bb.subscribe(_in_bb_committ_tag);
|
||||||
|
_bb.subscribe(SparkTags.CurrentUser);
|
||||||
_bb.data_callback += _on_bb_data;
|
_bb.data_callback += _on_bb_data;
|
||||||
var vs_sub = _analytics_service.subscribei_volsurfaces()
|
var vs_sub = _analytics_service.subscribei_volsurfaces()
|
||||||
.ObserveOn(SynchronizationContext.Current)
|
.ObserveOn(SynchronizationContext.Current)
|
||||||
@@ -54,8 +55,10 @@
|
|||||||
private void _on_vss(bts.api.core.Update<VolSurfaceEntryImmutable, UInt64> update) {
|
private void _on_vss(bts.api.core.Update<VolSurfaceEntryImmutable, UInt64> update) {
|
||||||
IEnumerable<VolSurfaceEntryImmutable> all_vss = update.all;
|
IEnumerable<VolSurfaceEntryImmutable> all_vss = update.all;
|
||||||
var this_vs_vss = all_vss.Where(vs => vs.VsId == _volsurface_id);
|
var this_vs_vss = all_vss.Where(vs => vs.VsId == _volsurface_id);
|
||||||
bts.Log.Gen.info(String.Format("SingleVolSurfaceGateway._on_vss count:{0} vs_count:{1}",
|
bts.Log.Gen.info(
|
||||||
all_vss.Count(), this_vs_vss.Count()));
|
$"SingleVolSurfaceGateway._on_vss vs_count: {this_vs_vss.Count()} " +
|
||||||
|
$"all: {update.all.Count()} added: {update.added.Count()} " +
|
||||||
|
$"updated: {update.changed.Count()} removed: {update.removed.Count()}");
|
||||||
if (this_vs_vss.Count() == 0) {
|
if (this_vs_vss.Count() == 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -83,22 +86,39 @@
|
|||||||
static VolSurfaceInput _to_vs_input(VolSurfaceEntryImmutable vs) =>
|
static VolSurfaceInput _to_vs_input(VolSurfaceEntryImmutable vs) =>
|
||||||
ProtobufSerializationHelper.deserialize<VolSurfaceInput>(vs.Volsurface.ToByteArray());
|
ProtobufSerializationHelper.deserialize<VolSurfaceInput>(vs.Volsurface.ToByteArray());
|
||||||
|
|
||||||
|
// private void _show_save_error(string message) {
|
||||||
|
// BTSMessageBox.Show(message, "Vol Save Error", BTSMessageBoxButtons.OK);
|
||||||
|
// }
|
||||||
|
|
||||||
private void _on_bb_data(object tag, object data) {
|
private void _on_bb_data(object tag, object data) {
|
||||||
if (_in_bb_committ_tag.Equals(tag)) {
|
if (_in_bb_committ_tag.Equals(tag)) {
|
||||||
try {
|
try {
|
||||||
_timer.start();
|
_timer.start();
|
||||||
VolSurfaceInput vs_input = data as VolSurfaceInput;
|
VolSurfaceInput vs_input = data as VolSurfaceInput;
|
||||||
|
var user_tup = _bb.read_state(SparkTags.CurrentUser);
|
||||||
|
string current_user = user_tup.name;
|
||||||
|
string vs_manager = vs_input.surface_settings.core_settings.vs_manager;
|
||||||
|
if (current_user != vs_manager) {
|
||||||
|
string msg = $"User {current_user} does not have the permission to save vols. " +
|
||||||
|
$"Permission can be obtained via the grid context menu item 'Acquire ownership from {vs_manager}'";
|
||||||
|
BTSMessageBox.Show(msg, "Vol Save Error", BTSMessageBoxButtons.OK);
|
||||||
|
return;
|
||||||
|
}
|
||||||
_sanitize_input(ref vs_input);
|
_sanitize_input(ref vs_input);
|
||||||
vs_input = VolSurfaceDataFunctions.unset_driver_overrides(vs_input);
|
vs_input = VolSurfaceDataFunctions.unset_driver_overrides(vs_input);
|
||||||
vs_input.saver_login = _user;
|
VolSurfaceUtilityFunctions.save_volsurface(vs_input, _analytics_service, current_user);
|
||||||
VolSurfaceUtilityFunctions.save_volsurface(vs_input, _analytics_service, _user);
|
|
||||||
_timer.stop();
|
_timer.stop();
|
||||||
Log.Gen.info(String.Format(
|
Log.Gen.info(String.Format(
|
||||||
"SingleVolSurfaceGateway._on_bb_data Time to commit volsurface {0} {1} msecs",
|
"SingleVolSurfaceGateway._on_bb_data Time to commit volsurface {0} {1} msecs",
|
||||||
_volsurface_id, _timer.lastIntervalTime));
|
_volsurface_id, _timer.lastIntervalTime));
|
||||||
var archived_theos = _get_theos();
|
var archived_theos = _get_theos();
|
||||||
if (archived_theos != null)
|
if (archived_theos != null) {
|
||||||
|
_timer.start();
|
||||||
_analytics_service.archive_theos(archived_theos);
|
_analytics_service.archive_theos(archived_theos);
|
||||||
|
_timer.stop();
|
||||||
|
Log.Gen.info($"SingleVolSurfaceGateway._on_bb_data archiving theos vs_id: {_volsurface_id} size: " +
|
||||||
|
$"{archived_theos.SecTheo.Count} time: {_timer.lastIntervalTime} msecs");
|
||||||
|
}
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Log.Gen.warn(ex.ToString());
|
Log.Gen.warn(ex.ToString());
|
||||||
_bb.post(SparkTags.MessageDisplayTag,
|
_bb.post(SparkTags.MessageDisplayTag,
|
||||||
|
|||||||
@@ -36,7 +36,11 @@ namespace mbts.spark {
|
|||||||
new SingleVolSurfaceDataSource(SingleVolSurfaceDataSource.SymbolListType.Committed, _vs_id, _bb,
|
new SingleVolSurfaceDataSource(SingleVolSurfaceDataSource.SymbolListType.Committed, _vs_id, _bb,
|
||||||
a_syms => new SingleVolSurfaceCommittedOutputRetriever(_vs_id, _bb, a_syms)),
|
a_syms => new SingleVolSurfaceCommittedOutputRetriever(_vs_id, _bb, a_syms)),
|
||||||
new SingleVolSurfaceDataSource(SingleVolSurfaceDataSource.SymbolListType.Combined, _vs_id, _bb,
|
new SingleVolSurfaceDataSource(SingleVolSurfaceDataSource.SymbolListType.Combined, _vs_id, _bb,
|
||||||
a_syms => new SingleVolSurfaceRequestCalculator(_vs_id, a_syms, _bb)),
|
a_syms => new SingleVolSurfaceRequestCalculator(
|
||||||
|
SingleVolSurfaceRequestCalculator.RequestType.UI, _vs_id, a_syms, _bb)),
|
||||||
|
new SingleVolSurfaceDataSource(SingleVolSurfaceDataSource.SymbolListType.Combined, _vs_id, _bb,
|
||||||
|
a_syms => new SingleVolSurfaceRequestCalculator(
|
||||||
|
SingleVolSurfaceRequestCalculator.RequestType.AUTO, _vs_id, a_syms, _bb)),
|
||||||
new SingleVolSurfaceMarketImpliedVolSource(_vs_id, _bb),
|
new SingleVolSurfaceMarketImpliedVolSource(_vs_id, _bb),
|
||||||
// new SingleVolSurfaceTheoSource(_vs_id, _bb),
|
// new SingleVolSurfaceTheoSource(_vs_id, _bb),
|
||||||
// TODO: suspending heatmaps for now (12/24/21)
|
// TODO: suspending heatmaps for now (12/24/21)
|
||||||
@@ -44,6 +48,7 @@ namespace mbts.spark {
|
|||||||
// server work that can optionally be done on the client
|
// server work that can optionally be done on the client
|
||||||
new SingleVolSurfaceDataSource (SingleVolSurfaceDataSource.SymbolListType.Committed, _vs_id, _bb,
|
new SingleVolSurfaceDataSource (SingleVolSurfaceDataSource.SymbolListType.Committed, _vs_id, _bb,
|
||||||
a_syms => new SingleVolSurfaceInterpGreeksPublisher (_vs_id, _bb, a_syms)),
|
a_syms => new SingleVolSurfaceInterpGreeksPublisher (_vs_id, _bb, a_syms)),
|
||||||
|
new SingleVolSurfaceAutoFitSource(_vs_id, _bb),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ namespace mbts.spark {
|
|||||||
var exp_price_map = OptionDriverPriceMap.get_vs_price_map(
|
var exp_price_map = OptionDriverPriceMap.get_vs_price_map(
|
||||||
all_sym_price_map, (s) => _option_symbols.Contains(s));
|
all_sym_price_map, (s) => _option_symbols.Contains(s));
|
||||||
if (sc_data != null && vs_nonvol_input != null && exp_price_map != null) {
|
if (sc_data != null && vs_nonvol_input != null && exp_price_map != null) {
|
||||||
bts.Log.Gen.info($"SingleVolSurfaceNonVolDataSource vs_id:{_vs_id} " +
|
bts.Log.Gen.diag($"SingleVolSurfaceNonVolDataSource vs_id:{_vs_id} " +
|
||||||
"publishing VolSurfaceNonVolData");
|
"publishing VolSurfaceNonVolData");
|
||||||
_bb.post(_out_bb_vs_nonvol_data_tag,
|
_bb.post(_out_bb_vs_nonvol_data_tag,
|
||||||
new VolSurfaceNonVolData(
|
new VolSurfaceNonVolData(
|
||||||
|
|||||||
@@ -18,10 +18,16 @@ namespace mbts.spark {
|
|||||||
// Pubs :
|
// Pubs :
|
||||||
// 1. Calc Resp
|
// 1. Calc Resp
|
||||||
public class SingleVolSurfaceRequestCalculator : IDisposable {
|
public class SingleVolSurfaceRequestCalculator : IDisposable {
|
||||||
|
public enum RequestType {
|
||||||
|
UI = 0,
|
||||||
|
AUTO
|
||||||
|
}
|
||||||
|
private readonly RequestType _request_type = RequestType.UI;
|
||||||
private readonly int _vs_id;
|
private readonly int _vs_id;
|
||||||
private readonly HashSet<string> _symbols;
|
private readonly HashSet<string> _symbols;
|
||||||
private readonly ThreadedBlackboard _bb;
|
private readonly ThreadedBlackboard _bb;
|
||||||
private readonly ITag<VolSurfaceCalculationRequest> _in_bb_request_tag;
|
private readonly ITag<VolSurfaceCalculationRequest> _in_bb_request_tag;
|
||||||
|
private readonly ITag<VolSurfaceCalculationRequest> _in_bb_auto_request_tag;
|
||||||
private readonly ITag<VolSurfaceNonVolData> _in_bb_nonvol_data_tag;
|
private readonly ITag<VolSurfaceNonVolData> _in_bb_nonvol_data_tag;
|
||||||
private readonly ITag<VolSurfaceStandardTime> _in_bb_vs_standard_time_tag;
|
private readonly ITag<VolSurfaceStandardTime> _in_bb_vs_standard_time_tag;
|
||||||
private readonly ITag<VolSurfaceEnums.MarketSide> _in_bb_market_impliedvol_side_tag;
|
private readonly ITag<VolSurfaceEnums.MarketSide> _in_bb_market_impliedvol_side_tag;
|
||||||
@@ -30,18 +36,22 @@ namespace mbts.spark {
|
|||||||
/// data
|
/// data
|
||||||
private VolSurfaceOutput _last_output;
|
private VolSurfaceOutput _last_output;
|
||||||
|
|
||||||
public SingleVolSurfaceRequestCalculator(int vs_id, IEnumerable<string> symbols,
|
public SingleVolSurfaceRequestCalculator(RequestType request_type,
|
||||||
|
int vs_id, IEnumerable<string> symbols,
|
||||||
ThreadedBlackboard threaded_bb) {
|
ThreadedBlackboard threaded_bb) {
|
||||||
bts.Log.Gen.info($"SingleVolSurfaceRequestCalculator cons vs_id: {vs_id}");
|
bts.Log.Gen.info($"SingleVolSurfaceRequestCalculator cons vs_id: {vs_id} request_type: {request_type}");
|
||||||
|
_request_type = request_type;
|
||||||
_vs_id = vs_id;
|
_vs_id = vs_id;
|
||||||
_symbols = new HashSet<string>(symbols);
|
_symbols = new HashSet<string>(symbols);
|
||||||
_bb = threaded_bb;
|
_bb = threaded_bb;
|
||||||
_in_bb_request_tag = SparkTags.VolSurfaceCalculationRequestTag(vs_id);
|
_in_bb_request_tag = SparkTags.VolSurfaceCalculationRequestTag(vs_id);
|
||||||
|
_in_bb_auto_request_tag = SparkTags.VolSurfaceAutoCalculationRequestTag(vs_id);
|
||||||
_in_bb_nonvol_data_tag = SparkTags.VolSurfaceNonVolDataTag(vs_id);
|
_in_bb_nonvol_data_tag = SparkTags.VolSurfaceNonVolDataTag(vs_id);
|
||||||
_in_bb_vs_standard_time_tag = SparkTags.VolSurfaceStandardTimeTag(vs_id);
|
_in_bb_vs_standard_time_tag = SparkTags.VolSurfaceStandardTimeTag(vs_id);
|
||||||
_in_bb_market_impliedvol_side_tag = SparkTags.VolSurfaceMarketImpliedVolSide(vs_id);
|
_in_bb_market_impliedvol_side_tag = SparkTags.VolSurfaceMarketImpliedVolSide(vs_id);
|
||||||
_in_bb_dirty_tag = SparkTags.VolSurfaceDirtyStateTag(vs_id);
|
_in_bb_dirty_tag = SparkTags.VolSurfaceDirtyStateTag(vs_id);
|
||||||
_bb.subscribe(_in_bb_request_tag);
|
_bb.subscribe(_in_bb_request_tag);
|
||||||
|
_bb.subscribe(_in_bb_auto_request_tag);
|
||||||
_bb.subscribe(_in_bb_nonvol_data_tag);
|
_bb.subscribe(_in_bb_nonvol_data_tag);
|
||||||
_bb.subscribe(_in_bb_vs_standard_time_tag);
|
_bb.subscribe(_in_bb_vs_standard_time_tag);
|
||||||
_bb.subscribe(_in_bb_vs_standard_time_tag);
|
_bb.subscribe(_in_bb_vs_standard_time_tag);
|
||||||
@@ -51,11 +61,21 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void _on_bb_data(object tag, object data) {
|
private void _on_bb_data(object tag, object data) {
|
||||||
if (_in_bb_request_tag.Equals(tag) || _in_bb_dirty_tag.Equals(tag))
|
switch (_request_type) {
|
||||||
_recompute_and_publish(true);
|
case RequestType.UI: {
|
||||||
else if (_in_bb_nonvol_data_tag.Equals(tag) || _in_bb_vs_standard_time_tag.Equals(tag))
|
if (_in_bb_request_tag.Equals(tag) || _in_bb_dirty_tag.Equals(tag))
|
||||||
_recompute_and_publish(false);
|
_recompute_and_publish(true);
|
||||||
|
else if (_in_bb_nonvol_data_tag.Equals(tag) || _in_bb_vs_standard_time_tag.Equals(tag))
|
||||||
|
_recompute_and_publish(false);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case RequestType.AUTO: {
|
||||||
|
if (tag.Equals(_in_bb_auto_request_tag)) {
|
||||||
|
_serve_auto_request();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _recompute_and_publish(bool is_new_request) {
|
private void _recompute_and_publish(bool is_new_request) {
|
||||||
@@ -80,7 +100,7 @@ namespace mbts.spark {
|
|||||||
nonvol_data.driver_price_map,
|
nonvol_data.driver_price_map,
|
||||||
vs_standard_time, true);
|
vs_standard_time, true);
|
||||||
IDictionary<VolSurfaceExpiration, VolCurveAction> action_map =
|
IDictionary<VolSurfaceExpiration, VolCurveAction> action_map =
|
||||||
_post_process_action(effective_req, aux_data_map);
|
_post_process_action(_bb, _vs_id, effective_req, aux_data_map);
|
||||||
_last_output = GeneralVolSurfaceCalculator.compute(effective_req.volsurface_input,
|
_last_output = GeneralVolSurfaceCalculator.compute(effective_req.volsurface_input,
|
||||||
nonvol_data.contracts,
|
nonvol_data.contracts,
|
||||||
aux_data_map,
|
aux_data_map,
|
||||||
@@ -89,16 +109,49 @@ namespace mbts.spark {
|
|||||||
effective_req.cascade_up,
|
effective_req.cascade_up,
|
||||||
effective_req.cascade_down);
|
effective_req.cascade_down);
|
||||||
_timer.stop();
|
_timer.stop();
|
||||||
bts.Log.Gen.info($"SingleVolSurfaceRequestCalculator._recompute_and_publish time: " +
|
bts.Log.Gen.info($"SingleVolSurfaceRequestCalculator._recompute_and_publish vs_id: {_vs_id} " +
|
||||||
$"{_timer.lastIntervalTime}");
|
$"time: {_timer.lastIntervalTime}");
|
||||||
_bb.post(SparkTags.VolSurfaceCalculationResponseTag(_vs_id),
|
_bb.post(SparkTags.VolSurfaceCalculationResponseTag(_vs_id),
|
||||||
new VolSurfaceCalculationResponse(_last_output, effective_req.request_id));
|
new VolSurfaceCalculationResponse(_last_output, effective_req.request_id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void _serve_auto_request() {
|
||||||
|
bts.Log.Gen.info($"SingleVolSurfaceRequestCalculator._serve_auto_request " +
|
||||||
|
$"vs_id: {_vs_id} auto request received");
|
||||||
|
bool is_dirty = _bb.read_state(_in_bb_dirty_tag, false);
|
||||||
|
VolSurfaceNonVolData nonvol_data = _bb.read_state(_in_bb_nonvol_data_tag);
|
||||||
|
VolSurfaceStandardTime vs_standard_time = _bb.read_state(_in_bb_vs_standard_time_tag);
|
||||||
|
VolSurfaceCalculationRequest auto_req = _bb.read_state(_in_bb_auto_request_tag);
|
||||||
|
if (is_dirty || nonvol_data == null || vs_standard_time == null || auto_req == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_timer.start();
|
||||||
|
IDictionary<VolSurfaceExpiration, VolSurfaceExpirationAuxiliaryData> aux_data_map =
|
||||||
|
VolSurfaceUtilityFunctions.compute_aux_data(auto_req.volsurface_input,
|
||||||
|
nonvol_data.input,
|
||||||
|
nonvol_data.driver_price_map,
|
||||||
|
vs_standard_time, true);
|
||||||
|
IDictionary<VolSurfaceExpiration, VolCurveAction> action_map =
|
||||||
|
_post_process_action(_bb, _vs_id, auto_req, aux_data_map);
|
||||||
|
var vs_output = GeneralVolSurfaceCalculator.compute(auto_req.volsurface_input,
|
||||||
|
nonvol_data.contracts,
|
||||||
|
aux_data_map,
|
||||||
|
action_map,
|
||||||
|
null,
|
||||||
|
auto_req.cascade_up,
|
||||||
|
auto_req.cascade_down);
|
||||||
|
_timer.stop();
|
||||||
|
bts.Log.Gen.info($"SingleVolSurfaceRequestCalculator._serve_auto_request vs_id: {_vs_id} " +
|
||||||
|
$"time: {_timer.lastIntervalTime}");
|
||||||
|
_bb.post(SparkTags.VolSurfaceAutoCalculationResponseTag(_vs_id),
|
||||||
|
new VolSurfaceCalculationResponse(vs_output, auto_req.request_id));
|
||||||
|
}
|
||||||
|
|
||||||
/// Computes the impl vol if the action is fit to market
|
/// Computes the impl vol if the action is fit to market
|
||||||
private IDictionary<VolSurfaceExpiration, VolCurveAction> _post_process_action(
|
private static IDictionary<VolSurfaceExpiration, VolCurveAction> _post_process_action(
|
||||||
|
ThreadedBlackboard bb, int vs_id,
|
||||||
VolSurfaceCalculationRequest req,
|
VolSurfaceCalculationRequest req,
|
||||||
IDictionary<VolSurfaceExpiration, VolSurfaceExpirationAuxiliaryData> aux_data_map) {
|
IDictionary<VolSurfaceExpiration, VolSurfaceExpirationAuxiliaryData> aux_data_map) {
|
||||||
IDictionary<VolSurfaceExpiration, VolCurveAction> rv = req.action_map;
|
IDictionary<VolSurfaceExpiration, VolCurveAction> rv = req.action_map;
|
||||||
@@ -109,7 +162,7 @@ namespace mbts.spark {
|
|||||||
VolCurveAction rep_action = rv.ElementAt(0).Value;
|
VolCurveAction rep_action = rv.ElementAt(0).Value;
|
||||||
if (rep_action.action_type == VolCurveAction.ActionType.FitToMarket) {
|
if (rep_action.action_type == VolCurveAction.ActionType.FitToMarket) {
|
||||||
IDictionary<VolSurfaceExpiration, VolCurveMarketImpliedVolData> impl_vol_map =
|
IDictionary<VolSurfaceExpiration, VolCurveMarketImpliedVolData> impl_vol_map =
|
||||||
_fill_in_implied_vols(req.volsurface_input, req.action_map, aux_data_map,
|
_fill_in_implied_vols(bb, vs_id, req.volsurface_input, req.action_map, aux_data_map,
|
||||||
req.cascade_up, req.cascade_down);
|
req.cascade_up, req.cascade_down);
|
||||||
rv = impl_vol_map.ToDictionary(kv => kv.Key, kv => new VolCurveAction(
|
rv = impl_vol_map.ToDictionary(kv => kv.Key, kv => new VolCurveAction(
|
||||||
new VolCurveMarketFitAction(rep_action.market_fit_action.fit_action, kv.Value,
|
new VolCurveMarketFitAction(rep_action.market_fit_action.fit_action, kv.Value,
|
||||||
@@ -119,7 +172,8 @@ namespace mbts.spark {
|
|||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
private IDictionary<VolSurfaceExpiration, VolCurveMarketImpliedVolData> _fill_in_implied_vols(
|
private static IDictionary<VolSurfaceExpiration, VolCurveMarketImpliedVolData> _fill_in_implied_vols(
|
||||||
|
ThreadedBlackboard bb, int vs_id,
|
||||||
VolSurfaceInput vs_inp,
|
VolSurfaceInput vs_inp,
|
||||||
IDictionary<VolSurfaceExpiration, VolCurveAction> action_map,
|
IDictionary<VolSurfaceExpiration, VolCurveAction> action_map,
|
||||||
IDictionary<VolSurfaceExpiration, VolSurfaceExpirationAuxiliaryData> aux_data_map,
|
IDictionary<VolSurfaceExpiration, VolSurfaceExpirationAuxiliaryData> aux_data_map,
|
||||||
@@ -140,15 +194,15 @@ namespace mbts.spark {
|
|||||||
applicable_exps = applicable_exps.Where(vs_exp => master_exps.Contains(vs_exp));
|
applicable_exps = applicable_exps.Where(vs_exp => master_exps.Contains(vs_exp));
|
||||||
|
|
||||||
VolSurfaceEnums.MarketSide impliedvol_side =
|
VolSurfaceEnums.MarketSide impliedvol_side =
|
||||||
SingleVolSurfaceMarketImpliedVolSource._get_market_impliedvol_side(_bb, _vs_id);
|
SingleVolSurfaceMarketImpliedVolSource._get_market_impliedvol_side(bb, vs_id);
|
||||||
foreach (VolSurfaceExpiration vs_exp in applicable_exps) {
|
foreach (VolSurfaceExpiration vs_exp in applicable_exps) {
|
||||||
VolSurfaceExpiration md_exp;
|
VolSurfaceExpiration md_exp;
|
||||||
VolCurveMarketImpliedVolData exp_impl_data =
|
VolCurveMarketImpliedVolData exp_impl_data =
|
||||||
VolSurfaceCoreFunctions.compute_implied_vols(vs_inp, vs_exp, aux_data_map,
|
VolSurfaceCoreFunctions.compute_implied_vols(vs_inp, vs_exp, aux_data_map,
|
||||||
arg_vs_exp => SingleVolSurfaceMarketImpliedVolSource.get_option_bbo(_bb, arg_vs_exp),
|
arg_vs_exp => SingleVolSurfaceMarketImpliedVolSource.get_option_bbo(bb, arg_vs_exp),
|
||||||
impliedvol_side,
|
impliedvol_side,
|
||||||
SingleVolSurfaceMarketImpliedVolSource._ignore_market_implied_vol_source_settings(
|
SingleVolSurfaceMarketImpliedVolSource._ignore_market_implied_vol_source_settings(
|
||||||
_bb, _vs_id),
|
bb, vs_id),
|
||||||
out md_exp);
|
out md_exp);
|
||||||
rv[vs_exp] = exp_impl_data;
|
rv[vs_exp] = exp_impl_data;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ namespace mbts.analytics {
|
|||||||
output.Add(symbol, symbol_data);
|
output.Add(symbol, symbol_data);
|
||||||
}
|
}
|
||||||
IReadOnlyDictionary<string, TData> ro_output = output;
|
IReadOnlyDictionary<string, TData> ro_output = output;
|
||||||
bts.Log.Gen.info($"SymbolAggregationPublisher._on_timer publishing " +
|
bts.Log.Gen.diag($"SymbolAggregationPublisher._on_timer publishing " +
|
||||||
$"tag: {_out_tag} sz: {ro_output.Count}");
|
$"tag: {_out_tag} sz: {ro_output.Count}");
|
||||||
_bb.post(_out_tag, ro_output);
|
_bb.post(_out_tag, ro_output);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -270,6 +270,7 @@ namespace mbts.spark {
|
|||||||
new mbts.analytics.VolSurfaceNonVolInput(exp_param_map.exp_map.ToDictionary()));
|
new mbts.analytics.VolSurfaceNonVolInput(exp_param_map.exp_map.ToDictionary()));
|
||||||
} else if (_in_bb_req_vol.Equals(tag)) {
|
} else if (_in_bb_req_vol.Equals(tag)) {
|
||||||
ClientArchivedVolRequest client_req = _bb.read_state(_in_bb_req_vol);
|
ClientArchivedVolRequest client_req = _bb.read_state(_in_bb_req_vol);
|
||||||
|
bts.Log.Ui.info($"VolSurfaceBusManager._on_bb_update ClientArchivedVolRequest: {client_req.ToString()}");
|
||||||
ArchivedTheoRetrieval ret = client_req.ret;
|
ArchivedTheoRetrieval ret = client_req.ret;
|
||||||
if (ret == null || ret.SecTup == null) {
|
if (ret == null || ret.SecTup == null) {
|
||||||
bts.Log.Ui.warn($"VolSurfaceBusManager malformed ArchivedTheoRetrieval");
|
bts.Log.Ui.warn($"VolSurfaceBusManager malformed ArchivedTheoRetrieval");
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ using bts.api;
|
|||||||
using bts.collections;
|
using bts.collections;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using bts.api.orderman;
|
using bts.api.orderman;
|
||||||
|
using bts.api.analytics;
|
||||||
using bts;
|
using bts;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
@@ -23,6 +24,8 @@ namespace mbts.spark {
|
|||||||
_order_service = order_service;
|
_order_service = order_service;
|
||||||
_bb.subscribe(SparkTags.AllInterpGreeks);
|
_bb.subscribe(SparkTags.AllInterpGreeks);
|
||||||
_bb.subscribe(SparkTags.SystemContractsTag);
|
_bb.subscribe(SparkTags.SystemContractsTag);
|
||||||
|
_bb.subscribe(SparkTags.CurrentUser);
|
||||||
|
_bb.subscribe(SparkTags.VolSurfaceUsageTag);
|
||||||
_bb.data_callback += _on_data;
|
_bb.data_callback += _on_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,6 +58,27 @@ namespace mbts.spark {
|
|||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private IReadOnlyDictionary<string, OptionTheoInterpolationData>
|
||||||
|
_filter_for_publish(IReadOnlyDictionary<string, OptionTheoInterpolationData> all_theos) {
|
||||||
|
// find the symbol vs vs_id, get the committed vs, see if it is
|
||||||
|
// owned by the current user, and only then publish it
|
||||||
|
HashSet<string> syms = new HashSet<string>();
|
||||||
|
VolSurfaceUsageListImmutable usage = _bb.read_state(SparkTags.VolSurfaceUsageTag);
|
||||||
|
string current_user = _bb.read_state(SparkTags.CurrentUser).name;
|
||||||
|
foreach (var u in usage.UsageList) {
|
||||||
|
VolSurfaceInput vs_input =
|
||||||
|
_bb.read_state(SparkTags.VolSurfaceCommittedInputTag(u.VsId));
|
||||||
|
if (vs_input != null) {
|
||||||
|
if (vs_input.surface_settings.core_settings.vs_manager ==
|
||||||
|
current_user) {
|
||||||
|
syms.Add(u.SecTup.Symbol);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return
|
||||||
|
all_theos.Where(kv => syms.Contains(kv.Key)).ToDictionary(kv => kv.Key, kv => kv.Value);
|
||||||
|
}
|
||||||
|
|
||||||
private void _publish_data() {
|
private void _publish_data() {
|
||||||
SystemContractData sc_data = _bb.read_state(SparkTags.SystemContractsTag, null);
|
SystemContractData sc_data = _bb.read_state(SparkTags.SystemContractsTag, null);
|
||||||
IReadOnlyDictionary<string, OptionTheoInterpolationData> all_theos =
|
IReadOnlyDictionary<string, OptionTheoInterpolationData> all_theos =
|
||||||
@@ -64,6 +88,11 @@ namespace mbts.spark {
|
|||||||
if (sc_data == null || all_theos == null || all_drivers == null)
|
if (sc_data == null || all_theos == null || all_drivers == null)
|
||||||
return;
|
return;
|
||||||
_timer.start();
|
_timer.start();
|
||||||
|
all_theos = _filter_for_publish(all_theos);
|
||||||
|
if (all_theos.Count == 0) {
|
||||||
|
bts.Log.Gen.info($"InterpTheosServerPublisher._publish_data all_theos.Count == 0");
|
||||||
|
return;
|
||||||
|
}
|
||||||
IDictionary<UInt32, DriverMD> driver_map = _get_drivers(all_drivers, sc_data);
|
IDictionary<UInt32, DriverMD> driver_map = _get_drivers(all_drivers, sc_data);
|
||||||
IEnumerable<Tuple<SecurityImmutable, TheoPoint>> theo_map = _get_theos(all_theos, sc_data);
|
IEnumerable<Tuple<SecurityImmutable, TheoPoint>> theo_map = _get_theos(all_theos, sc_data);
|
||||||
// assemble it together and send it to the server
|
// assemble it together and send it to the server
|
||||||
@@ -86,6 +115,7 @@ namespace mbts.spark {
|
|||||||
ptp.Vega = is_call ? tp.cvega : tp.pvega;
|
ptp.Vega = is_call ? tp.cvega : tp.pvega;
|
||||||
ptp.Theta = is_call ? tp.c_theta : tp.p_theta;
|
ptp.Theta = is_call ? tp.c_theta : tp.p_theta;
|
||||||
ptp.Rho = Double.NaN;
|
ptp.Rho = Double.NaN;
|
||||||
|
ptp.Vol = tp.vol;
|
||||||
ptp_list.Add(ptp);
|
ptp_list.Add(ptp);
|
||||||
}
|
}
|
||||||
bts.api.orderman.PrecomputedTheos server_theos = new PrecomputedTheos();
|
bts.api.orderman.PrecomputedTheos server_theos = new PrecomputedTheos();
|
||||||
@@ -96,7 +126,7 @@ namespace mbts.spark {
|
|||||||
_order_service.set_precomputed_theos(server_theos);
|
_order_service.set_precomputed_theos(server_theos);
|
||||||
_timer.stop();
|
_timer.stop();
|
||||||
var pub_time = _timer.lastIntervalTime;
|
var pub_time = _timer.lastIntervalTime;
|
||||||
bts.Log.Gen.info($"InterpTheosServerPublisher._publish_data " +
|
bts.Log.Gen.info($"InterpTheosServerPublisher._publish_data symbols: {all_theos.Count} " +
|
||||||
$"size: {server_theos.Theos.Count} comp_time: {comp_time} msecs " +
|
$"size: {server_theos.Theos.Count} comp_time: {comp_time} msecs " +
|
||||||
$"pub_time: {pub_time}");
|
$"pub_time: {pub_time}");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,12 +26,13 @@ namespace mbts.spark {
|
|||||||
_refresh = new(_is_dirty.refresh);
|
_refresh = new(_is_dirty.refresh);
|
||||||
_committed_value.Changed += on_committed_changed;
|
_committed_value.Changed += on_committed_changed;
|
||||||
_candidate_value.Changed += on_candidate_changed;
|
_candidate_value.Changed += on_candidate_changed;
|
||||||
_is_dirty.Changed += (o, n) => {
|
if (column.type.is_editable()) {
|
||||||
Log.assert(o != n);
|
_is_dirty.Changed += (o, n) => {
|
||||||
Log.Ui.info(
|
Log.Ui.info(
|
||||||
$"VolSurface '{expiration}.{column}' is_dirty changed to {n}. " +
|
$"VolSurface '{expiration}.{column}' is_dirty changed to {n}. " +
|
||||||
$"commited: {committed_value}; candidate: {candidate_value}");
|
$"commited: {committed_value}; candidate: {candidate_value}");
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
|
||||||
void on_committed_changed(object? oldval, object? newval) =>
|
void on_committed_changed(object? oldval, object? newval) =>
|
||||||
_is_dirty.refresh();
|
_is_dirty.refresh();
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ namespace mbts.spark.VolSurface {
|
|||||||
|
|
||||||
class VolSurfaceGridVM : DisposableViewModelBase {
|
class VolSurfaceGridVM : DisposableViewModelBase {
|
||||||
readonly VolSurfaceVM _parent;
|
readonly VolSurfaceVM _parent;
|
||||||
|
readonly UserTuple _user;
|
||||||
readonly ObservableCollection<VolSurfaceDisplayGridExpiration> _expirations = new();
|
readonly ObservableCollection<VolSurfaceDisplayGridExpiration> _expirations = new();
|
||||||
readonly DeferrableAction _invalidate_rows;
|
readonly DeferrableAction _invalidate_rows;
|
||||||
readonly ColumnsModel _columns_model;
|
readonly ColumnsModel _columns_model;
|
||||||
@@ -41,10 +42,12 @@ namespace mbts.spark.VolSurface {
|
|||||||
VolSurfaceVM vm,
|
VolSurfaceVM vm,
|
||||||
VolSurfaceDisplayModel model,
|
VolSurfaceDisplayModel model,
|
||||||
ISet<string> hidden_columns,
|
ISet<string> hidden_columns,
|
||||||
ISet<VolSurfaceExpiration> hidden_expirations) {
|
ISet<VolSurfaceExpiration> hidden_expirations,
|
||||||
|
UserTuple user) {
|
||||||
Log.notnull(hidden_columns);
|
Log.notnull(hidden_columns);
|
||||||
Log.notnull(hidden_expirations);
|
Log.notnull(hidden_expirations);
|
||||||
_parent = vm;
|
_parent = vm;
|
||||||
|
_user = user;
|
||||||
this.model = model;
|
this.model = model;
|
||||||
_columns_model = new(create_exp_column_view());
|
_columns_model = new(create_exp_column_view());
|
||||||
_hidden_columns = hidden_columns;
|
_hidden_columns = hidden_columns;
|
||||||
@@ -83,7 +86,7 @@ namespace mbts.spark.VolSurface {
|
|||||||
_columns_model);
|
_columns_model);
|
||||||
|
|
||||||
VolSurfaceRowVM row_factory(VolSurfaceDisplayGridExpiration exp) =>
|
VolSurfaceRowVM row_factory(VolSurfaceDisplayGridExpiration exp) =>
|
||||||
new(this, exp);
|
new(this, exp, _user);
|
||||||
|
|
||||||
IDisposable connect_row(VolSurfaceRowVM row) {
|
IDisposable connect_row(VolSurfaceRowVM row) {
|
||||||
row.request_calculate += request_recalc;
|
row.request_calculate += request_recalc;
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#nullable enable
|
#nullable enable
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
|
using bts;
|
||||||
using bts.collections;
|
using bts.collections;
|
||||||
|
|
||||||
using mbts.spark.VolSurface;
|
using mbts.spark.VolSurface;
|
||||||
@@ -9,6 +10,7 @@ namespace mbts.spark {
|
|||||||
using mbts.ui.utility;
|
using mbts.ui.utility;
|
||||||
|
|
||||||
using Spark.Core.Disposables;
|
using Spark.Core.Disposables;
|
||||||
|
using Spark.Core.Reactive;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@@ -22,6 +24,10 @@ namespace mbts.spark {
|
|||||||
readonly VolSurfaceGridVM _parent;
|
readonly VolSurfaceGridVM _parent;
|
||||||
readonly Property<VolSurfaceColumn?> _column;
|
readonly Property<VolSurfaceColumn?> _column;
|
||||||
readonly Property<DIYGridSuperHeaderVM?> _super_header;
|
readonly Property<DIYGridSuperHeaderVM?> _super_header;
|
||||||
|
readonly UserTuple _user;
|
||||||
|
readonly Property<bool> _is_open;
|
||||||
|
readonly DelegateProperty<string> _vs_manager;
|
||||||
|
readonly List<IDisposable> _resources = new();
|
||||||
|
|
||||||
ICommand? _revert_cmd;
|
ICommand? _revert_cmd;
|
||||||
ICommand? _shift_selection_cmd;
|
ICommand? _shift_selection_cmd;
|
||||||
@@ -34,21 +40,29 @@ namespace mbts.spark {
|
|||||||
ICommand? _copy_all_to_clipboard_cmd;
|
ICommand? _copy_all_to_clipboard_cmd;
|
||||||
ICommand? _smart_copy_rolls_rates_cmd;
|
ICommand? _smart_copy_rolls_rates_cmd;
|
||||||
ICommand? _import_csv_cmd;
|
ICommand? _import_csv_cmd;
|
||||||
|
ObservantCommand? _acquire_ownership_cmd;
|
||||||
|
|
||||||
public VolSurfaceRowContextMenuVM(VolSurfaceGridVM parent, VolSurfaceRowVM row) {
|
public VolSurfaceRowContextMenuVM(VolSurfaceGridVM parent, VolSurfaceRowVM row, UserTuple user) {
|
||||||
_parent = parent;
|
_parent = parent;
|
||||||
_row = row;
|
_row = row;
|
||||||
|
_user = user;
|
||||||
_column = backing<VolSurfaceColumn?>(nameof(column));
|
_column = backing<VolSurfaceColumn?>(nameof(column));
|
||||||
_super_header = backing<DIYGridSuperHeaderVM?>(nameof(super_header));
|
_super_header = backing<DIYGridSuperHeaderVM?>(nameof(super_header));
|
||||||
|
_vs_manager = backing(
|
||||||
|
nameof(vs_manager),
|
||||||
|
() => _parent.model.get_active_settings()?.core_settings?.vs_manager ?? string.Empty);
|
||||||
|
_is_open = backing(nameof(is_open), false);
|
||||||
|
|
||||||
_dispose = Disposable.Create(
|
_resources.AddRange(
|
||||||
_column.invalidate_others_on_change(nameof(column_name)),
|
_column.invalidate_others_on_change(nameof(column_name)),
|
||||||
_super_header.invalidate_others_on_change(nameof(group_name)),
|
_super_header.invalidate_others_on_change(nameof(group_name)),
|
||||||
|
_is_open.Subscribe(_ => _vs_manager.refresh()),
|
||||||
_parent.visible_rows.ObserveSelf()
|
_parent.visible_rows.ObserveSelf()
|
||||||
.BufferLatest(TimeSpan.FromSeconds(1))
|
.BufferLatest(TimeSpan.FromSeconds(1))
|
||||||
.OnDispatcher()
|
.OnDispatcher()
|
||||||
.Subscribe(_ => sync_symbols()));
|
.Subscribe(_ => sync_symbols()));
|
||||||
|
|
||||||
|
_dispose = Disposable.Create(() => _resources.DisposeAll(true));
|
||||||
void sync_symbols() {
|
void sync_symbols() {
|
||||||
var visible_exps = _parent.visible_rows.Map(r => r.expiration.symbol);
|
var visible_exps = _parent.visible_rows.Map(r => r.expiration.symbol);
|
||||||
symbols.sync_with_models(
|
symbols.sync_with_models(
|
||||||
@@ -164,6 +178,34 @@ namespace mbts.spark {
|
|||||||
_parent.model.csv_importing_enabled,
|
_parent.model.csv_importing_enabled,
|
||||||
null);
|
null);
|
||||||
|
|
||||||
|
public ICommand acquire_ownership_cmd {
|
||||||
|
get {
|
||||||
|
if (_acquire_ownership_cmd is null) {
|
||||||
|
_acquire_ownership_cmd = new(
|
||||||
|
() => {
|
||||||
|
var settings = _parent.model.get_active_settings();
|
||||||
|
if (settings is null) {
|
||||||
|
Log.Ui.error("Unable to acquire volsurface ownership: settings are null.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
settings.core_settings.vs_manager = _user.name;
|
||||||
|
_parent.model.set_candidate_settings(settings);
|
||||||
|
});
|
||||||
|
_resources.Add(_vs_manager.observe_current(true)
|
||||||
|
.Subscribe(SelectorObserver.builder(_acquire_ownership_cmd).wrap<string>(
|
||||||
|
curr => curr != _user.name)));
|
||||||
|
}
|
||||||
|
return _acquire_ownership_cmd;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool is_open {
|
||||||
|
get => _is_open.Value;
|
||||||
|
set => _is_open.set(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string vs_manager => _vs_manager.Value;
|
||||||
|
|
||||||
VolSurfaceDisplayGridColumn _assert_model() =>
|
VolSurfaceDisplayGridColumn _assert_model() =>
|
||||||
column?.model ?? throw new InvalidOperationException();
|
column?.model ?? throw new InvalidOperationException();
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
#nullable enable
|
#nullable enable
|
||||||
namespace mbts.spark.VolSurface {
|
namespace mbts.spark.VolSurface {
|
||||||
|
using bts;
|
||||||
|
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
using mbts.ui.controls;
|
using mbts.ui.controls;
|
||||||
using mbts.ui.shell;
|
using mbts.ui.shell;
|
||||||
@@ -16,14 +18,16 @@ namespace mbts.spark.VolSurface {
|
|||||||
readonly VolSurfaceGridVM _parent;
|
readonly VolSurfaceGridVM _parent;
|
||||||
readonly VolSurfaceDisplayGridExpiration _exp;
|
readonly VolSurfaceDisplayGridExpiration _exp;
|
||||||
readonly Dictionary<string, CellData> _cells = new();
|
readonly Dictionary<string, CellData> _cells = new();
|
||||||
|
readonly UserTuple _user;
|
||||||
readonly DeferrableAction _request_calculate;
|
readonly DeferrableAction _request_calculate;
|
||||||
|
|
||||||
VolSurfaceRowContextMenuVM? _context_menu;
|
VolSurfaceRowContextMenuVM? _context_menu;
|
||||||
bool _is_selected;
|
bool _is_selected;
|
||||||
|
|
||||||
public VolSurfaceRowVM(VolSurfaceGridVM parent, VolSurfaceDisplayGridExpiration exp) {
|
public VolSurfaceRowVM(VolSurfaceGridVM parent, VolSurfaceDisplayGridExpiration exp, UserTuple user) {
|
||||||
_parent = parent;
|
_parent = parent;
|
||||||
_exp = exp;
|
_exp = exp;
|
||||||
|
_user = user;
|
||||||
_request_calculate = new(() => request_calculate?.Invoke());
|
_request_calculate = new(() => request_calculate?.Invoke());
|
||||||
_dispose = Disposable.Create(() => {
|
_dispose = Disposable.Create(() => {
|
||||||
_cells.Values.DisposeAll();
|
_cells.Values.DisposeAll();
|
||||||
@@ -49,7 +53,7 @@ namespace mbts.spark.VolSurface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public VolSurfaceRowContextMenuVM context_menu =>
|
public VolSurfaceRowContextMenuVM context_menu =>
|
||||||
_context_menu ??= new(_parent, this);
|
_context_menu ??= new(_parent, this, _user);
|
||||||
|
|
||||||
public VolSurfaceCellVM get_cell(VolSurfaceDisplayGridColumn column) =>
|
public VolSurfaceCellVM get_cell(VolSurfaceDisplayGridColumn column) =>
|
||||||
_cells.GetOrAdd(column.unique_col_name, _ => _create_cell(column)).vm;
|
_cells.GetOrAdd(column.unique_col_name, _ => _create_cell(column)).vm;
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
#nullable enable
|
||||||
|
|
||||||
|
namespace mbts.spark {
|
||||||
|
using bts.api.domain;
|
||||||
|
|
||||||
|
using mbts.analytics;
|
||||||
|
using mbts.ui.shell;
|
||||||
|
using mbts.ui.utility;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
using VolCurveFitRegion = analytics.VolSurfaceEnums.VolCurveFitRegion;
|
||||||
|
|
||||||
|
public class VolSurfaceAutoFitSettingsVM : DisposableViewModelBase {
|
||||||
|
readonly Property<VolCurveFitRegion> _fit_region;
|
||||||
|
readonly Property<uint?> _period_secs;
|
||||||
|
readonly Property<double?> _driver_points_moved;
|
||||||
|
readonly Property<double?> _atm_points_moved;
|
||||||
|
readonly Property<bool> _is_auto_fit_enabled;
|
||||||
|
|
||||||
|
public VolSurfaceAutoFitSettingsVM() {
|
||||||
|
_fit_region = backing(nameof(fit_region), VolCurveFitRegion.None);
|
||||||
|
_is_auto_fit_enabled = backing(
|
||||||
|
nameof(is_auto_fit_enabled),
|
||||||
|
_fit_region.observe_current(true),
|
||||||
|
r => r != VolCurveFitRegion.None);
|
||||||
|
_period_secs = backing<uint?>(nameof(period_secs), 10);
|
||||||
|
_driver_points_moved = backing<double?>(nameof(driver_points_moved));
|
||||||
|
_atm_points_moved = backing<double?>(nameof(atm_points_moved));
|
||||||
|
_fit_region.Changed += (o, n) => RaisePropertyChanged(nameof(is_auto_fit_enabled));
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerable<VolCurveFitRegion> fit_regions =>
|
||||||
|
EnumHelper.get_values<VolCurveFitRegion>();
|
||||||
|
|
||||||
|
public VolCurveFitRegion fit_region {
|
||||||
|
get => _fit_region.Value;
|
||||||
|
set => _fit_region.set(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool is_auto_fit_enabled => _is_auto_fit_enabled.Value;
|
||||||
|
|
||||||
|
public uint? period_secs {
|
||||||
|
get => _period_secs.Value;
|
||||||
|
set => _period_secs.set(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public double? driver_points_moved {
|
||||||
|
get => _driver_points_moved.Value;
|
||||||
|
set => _driver_points_moved.set(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TickDisplaySettingsImmutable? driver_points_display =>
|
||||||
|
user.settings.TickFactors.pennies.to_api_tick_display_settingsi();
|
||||||
|
|
||||||
|
public double? atm_points_moved {
|
||||||
|
get => _atm_points_moved.Value;
|
||||||
|
set => _atm_points_moved.set(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TickDisplaySettingsImmutable? atm_points_display =>
|
||||||
|
user.settings.TickFactors.pennies.to_api_tick_display_settingsi();
|
||||||
|
|
||||||
|
public void load_from(VolSurfaceAutoFitSettings value) {
|
||||||
|
fit_region = value?.auto_fit_region ?? VolCurveFitRegion.None;
|
||||||
|
period_secs = value?.time_based_settings?.period_seconds;
|
||||||
|
driver_points_moved = value?.driver_move_based_settings?.points_moved;
|
||||||
|
atm_points_moved = value?.atm_implied_vol_based_settings?.points_moved;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void assign_to(VolSurfaceAutoFitSettings value) {
|
||||||
|
if (value is null) {
|
||||||
|
throw new ArgumentNullException(nameof(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
value.auto_fit_region = fit_region;
|
||||||
|
value.time_based_settings = new() {
|
||||||
|
period_seconds = period_secs
|
||||||
|
};
|
||||||
|
value.driver_move_based_settings = new() {
|
||||||
|
points_moved = driver_points_moved
|
||||||
|
};
|
||||||
|
value.atm_implied_vol_based_settings = new() {
|
||||||
|
points_moved = atm_points_moved
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -40,6 +40,7 @@ namespace mbts.spark {
|
|||||||
vol_model_cubic_spline_vm.load_from(settings.spline_model_settings);
|
vol_model_cubic_spline_vm.load_from(settings.spline_model_settings);
|
||||||
vol_model_dual_quadratic_vm.load_from(settings.dualquadratic_model_settings);
|
vol_model_dual_quadratic_vm.load_from(settings.dualquadratic_model_settings);
|
||||||
vol_path_parabolic_vm.load_from(settings.core_settings.volpath_settings.parabolic_vol_path_settings);
|
vol_path_parabolic_vm.load_from(settings.core_settings.volpath_settings.parabolic_vol_path_settings);
|
||||||
|
auto_fit_vm.load_from(settings.core_settings.market_fit_settings.vs_auto_fit_settings);
|
||||||
|
|
||||||
init_rotation_vms(call_rotations, _core_settings.call_rotation.strike_vol_movement_pairs);
|
init_rotation_vms(call_rotations, _core_settings.call_rotation.strike_vol_movement_pairs);
|
||||||
init_rotation_vms(put_rotations, _core_settings.put_rotation.strike_vol_movement_pairs);
|
init_rotation_vms(put_rotations, _core_settings.put_rotation.strike_vol_movement_pairs);
|
||||||
@@ -105,6 +106,7 @@ namespace mbts.spark {
|
|||||||
}).ToList();
|
}).ToList();
|
||||||
_core_settings.strangle.strike_vol_movement_pairs = strangles.SelectMany(r => new[] { Tuple.Create(r.target_put_strike, r.put_move), Tuple.Create(r.target_call_strike, r.call_move) }).ToList();
|
_core_settings.strangle.strike_vol_movement_pairs = strangles.SelectMany(r => new[] { Tuple.Create(r.target_put_strike, r.put_move), Tuple.Create(r.target_call_strike, r.call_move) }).ToList();
|
||||||
_core_settings.atm_shift.atm_strike_vol_movement = atm_shifts.Count == 1 ? atm_shifts[0].move : 0;
|
_core_settings.atm_shift.atm_strike_vol_movement = atm_shifts.Count == 1 ? atm_shifts[0].move : 0;
|
||||||
|
auto_fit_vm.assign_to(_core_settings.market_fit_settings.vs_auto_fit_settings);
|
||||||
commit(_settings);
|
commit(_settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,23 +235,7 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool enable_auto_fit {
|
public VolSurfaceAutoFitSettingsVM auto_fit_vm { get; } = new();
|
||||||
get => _core_settings.market_fit_settings.enable_auto_fit;
|
|
||||||
set {
|
|
||||||
using var _ = detect_property_change();
|
|
||||||
_core_settings.market_fit_settings.enable_auto_fit = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public VolSurfaceEnums.VolCurveFitRegion auto_fit_region {
|
|
||||||
get => _core_settings.market_fit_settings.auto_fit_region;
|
|
||||||
set { _core_settings.market_fit_settings.auto_fit_region = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public double auto_fit_time_ms {
|
|
||||||
get => _core_settings.market_fit_settings.auto_fit_time_ms;
|
|
||||||
set { _core_settings.market_fit_settings.auto_fit_time_ms = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool auto_decay_vol_time {
|
public bool auto_decay_vol_time {
|
||||||
get => _core_settings.time_settings.time_mode == VolSurfaceEnums.VolSurfaceTimeMode.AutoDecay;
|
get => _core_settings.time_settings.time_mode == VolSurfaceEnums.VolSurfaceTimeMode.AutoDecay;
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#nullable enable
|
#nullable enable
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
|
using bts;
|
||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.collections;
|
using bts.collections;
|
||||||
|
|
||||||
@@ -27,6 +28,7 @@ namespace mbts.spark {
|
|||||||
readonly IBus _bus;
|
readonly IBus _bus;
|
||||||
readonly string _request_id = Guid.NewGuid().ToString();
|
readonly string _request_id = Guid.NewGuid().ToString();
|
||||||
readonly VolSurfaceDisplayModel _model;
|
readonly VolSurfaceDisplayModel _model;
|
||||||
|
readonly UserTuple _user;
|
||||||
readonly IRaiseCanExecuteChangedCommand _revert_cmd;
|
readonly IRaiseCanExecuteChangedCommand _revert_cmd;
|
||||||
readonly IRaiseCanExecuteChangedCommand _commit_cmd;
|
readonly IRaiseCanExecuteChangedCommand _commit_cmd;
|
||||||
readonly IDialogCommand _main_settings_cmd;
|
readonly IDialogCommand _main_settings_cmd;
|
||||||
@@ -38,10 +40,16 @@ namespace mbts.spark {
|
|||||||
bool _ignore_implied_vol_settings;
|
bool _ignore_implied_vol_settings;
|
||||||
|
|
||||||
public VolSurfaceVM(
|
public VolSurfaceVM(
|
||||||
VolSurfaceDisplayModel model, int id, IBus bus, VolSurfaceWindowSettings startup_data) {
|
VolSurfaceDisplayModel model,
|
||||||
|
int id,
|
||||||
|
IBus bus,
|
||||||
|
VolSurfaceWindowSettings startup_data,
|
||||||
|
UserTuple user
|
||||||
|
) {
|
||||||
_model = model;
|
_model = model;
|
||||||
_vs_id = id;
|
_vs_id = id;
|
||||||
_bus = bus;
|
_bus = bus;
|
||||||
|
_user = user;
|
||||||
macro_actions = new VolSurfaceMacroActionsVM(_model);
|
macro_actions = new VolSurfaceMacroActionsVM(_model);
|
||||||
globals = new VolSurfaceGlobalParameterVM(_model);
|
globals = new VolSurfaceGlobalParameterVM(_model);
|
||||||
|
|
||||||
@@ -49,7 +57,7 @@ namespace mbts.spark {
|
|||||||
_grid_settings = startup_data.macro_grid_settings ?? new VolSurfaceMacroGridSettings();
|
_grid_settings = startup_data.macro_grid_settings ?? new VolSurfaceMacroGridSettings();
|
||||||
var hidden_exps_set = startup_data.hidden_exps.empty_if_null().ToHashSet();
|
var hidden_exps_set = startup_data.hidden_exps.empty_if_null().ToHashSet();
|
||||||
grid = new VolSurfaceGridVM(
|
grid = new VolSurfaceGridVM(
|
||||||
this, _model, _grid_settings.hidden_cols(), hidden_exps_set);
|
this, _model, _grid_settings.hidden_cols(), hidden_exps_set, _user);
|
||||||
grid.on_selection_changed += _on_grid_selection_changed;
|
grid.on_selection_changed += _on_grid_selection_changed;
|
||||||
_model.publish_grid_settings(_grid_settings);
|
_model.publish_grid_settings(_grid_settings);
|
||||||
|
|
||||||
|
|||||||
@@ -4,13 +4,11 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace mbts.analytics
|
namespace mbts.analytics {
|
||||||
{
|
|
||||||
/// These are the VolSurface settings that are common
|
/// These are the VolSurface settings that are common
|
||||||
/// to any Vol Model
|
/// to any Vol Model
|
||||||
[ProtoBuf.ProtoContract(Name = "VolSurfaceCoreSettings")]
|
[ProtoBuf.ProtoContract(Name = "VolSurfaceCoreSettings")]
|
||||||
public class VolSurfaceCoreSettings
|
public class VolSurfaceCoreSettings {
|
||||||
{
|
|
||||||
[ProtoBuf.ProtoMember(1)]
|
[ProtoBuf.ProtoMember(1)]
|
||||||
public string vol_surface_name;
|
public string vol_surface_name;
|
||||||
[ProtoBuf.ProtoMember(2)]
|
[ProtoBuf.ProtoMember(2)]
|
||||||
@@ -87,5 +85,7 @@ namespace mbts.analytics
|
|||||||
get => _time_settings ??= new();
|
get => _time_settings ??= new();
|
||||||
set => _time_settings = value;
|
set => _time_settings = value;
|
||||||
}
|
}
|
||||||
|
[ProtoBuf.ProtoMember(240)]
|
||||||
|
public string vs_manager { get; set; } = string.Empty;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -75,6 +75,7 @@ namespace mbts.analytics {
|
|||||||
if (core_settings.market_fit_settings == null) {
|
if (core_settings.market_fit_settings == null) {
|
||||||
core_settings.market_fit_settings = new VolSurfaceMarketFitSettings();
|
core_settings.market_fit_settings = new VolSurfaceMarketFitSettings();
|
||||||
}
|
}
|
||||||
|
core_settings.market_fit_settings.vs_auto_fit_settings ??= new();
|
||||||
if (core_settings.time_settings == null) {
|
if (core_settings.time_settings == null) {
|
||||||
core_settings.time_settings = new VolSurfaceTimeSettings();
|
core_settings.time_settings = new VolSurfaceTimeSettings();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -141,6 +141,7 @@ namespace mbts.analytics
|
|||||||
|
|
||||||
public enum VolCurveFitRegion
|
public enum VolCurveFitRegion
|
||||||
{
|
{
|
||||||
|
None,
|
||||||
ATM,
|
ATM,
|
||||||
All
|
All
|
||||||
}
|
}
|
||||||
@@ -230,4 +231,4 @@ namespace mbts.analytics
|
|||||||
USE_CALENDAR_FOR_BUSINESS
|
USE_CALENDAR_FOR_BUSINESS
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,11 +4,9 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace mbts.analytics
|
namespace mbts.analytics {
|
||||||
{
|
|
||||||
[ProtoBuf.ProtoContract(Name = "VolSurfaceMarketFitSettings")]
|
[ProtoBuf.ProtoContract(Name = "VolSurfaceMarketFitSettings")]
|
||||||
public class VolSurfaceMarketFitSettings
|
public class VolSurfaceMarketFitSettings {
|
||||||
{
|
|
||||||
/// use one sided market or not
|
/// use one sided market or not
|
||||||
[ProtoBuf.ProtoMember(10)]
|
[ProtoBuf.ProtoMember(10)]
|
||||||
public bool ignore_one_sided_markets;
|
public bool ignore_one_sided_markets;
|
||||||
@@ -22,19 +20,44 @@ namespace mbts.analytics
|
|||||||
public double graph_update_period_ms = 2500;
|
public double graph_update_period_ms = 2500;
|
||||||
/// If this is set to true a regression curve is drawn
|
/// If this is set to true a regression curve is drawn
|
||||||
/// and the vol model adheres to that
|
/// and the vol model adheres to that
|
||||||
[ProtoBuf.ProtoMember(50)]
|
[ProtoBuf.ProtoMember(50)]
|
||||||
public bool use_weighted_regression_fit = false;
|
public bool use_weighted_regression_fit = false;
|
||||||
[ProtoBuf.ProtoMember(55)]
|
[ProtoBuf.ProtoMember(55)]
|
||||||
public uint regression_order = 4;
|
public uint regression_order = 4;
|
||||||
/// The system auto fits and saves vols if this is
|
|
||||||
/// set to true
|
[ProtoBuf.ProtoMember(90)]
|
||||||
[ProtoBuf.ProtoMember(60)]
|
public VolSurfaceAutoFitSettings vs_auto_fit_settings { get; set; }
|
||||||
public bool enable_auto_fit = false;
|
}
|
||||||
/// If enable_auto_fit = true, this governs
|
|
||||||
/// how often the system auto-fits
|
[ProtoBuf.ProtoContract(Name = "VolSurfaceAutoFitSettings")]
|
||||||
[ProtoBuf.ProtoMember(70)]
|
public class VolSurfaceAutoFitSettings {
|
||||||
public double auto_fit_time_ms = 30000;
|
// each of these settings can be enabled independently. if they are enabled
|
||||||
[ProtoBuf.ProtoMember(80)]
|
// then any of them being true will result in an autmatic fit
|
||||||
public VolSurfaceEnums.VolCurveFitRegion auto_fit_region = VolSurfaceEnums.VolCurveFitRegion.ATM;
|
[ProtoBuf.ProtoContract(Name = "TimeBasedSettings")]
|
||||||
|
public class TimeBasedSettings {
|
||||||
|
[ProtoBuf.ProtoMember(10)]
|
||||||
|
public uint? period_seconds { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[ProtoBuf.ProtoContract(Name = "DriverMoveBasedSettings")]
|
||||||
|
public class DriverMoveBasedSettings {
|
||||||
|
[ProtoBuf.ProtoMember(10)]
|
||||||
|
public double? points_moved { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[ProtoBuf.ProtoContract(Name = "ATMImpliedVolBasedSettings")]
|
||||||
|
public class ATMImpliedVolBasedSettings {
|
||||||
|
[ProtoBuf.ProtoMember(20)]
|
||||||
|
public double? points_moved { get; set; }
|
||||||
|
// we can do price terms moved as well
|
||||||
|
}
|
||||||
|
[ProtoBuf.ProtoMember(5)]
|
||||||
|
public VolSurfaceEnums.VolCurveFitRegion auto_fit_region;
|
||||||
|
[ProtoBuf.ProtoMember(10)]
|
||||||
|
public TimeBasedSettings time_based_settings = null;
|
||||||
|
[ProtoBuf.ProtoMember(20)]
|
||||||
|
public DriverMoveBasedSettings driver_move_based_settings = null;
|
||||||
|
[ProtoBuf.ProtoMember(30)]
|
||||||
|
public ATMImpliedVolBasedSettings atm_implied_vol_based_settings = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -475,6 +475,7 @@ namespace mbts.analytics {
|
|||||||
public static ResultMessage save_volsurface(
|
public static ResultMessage save_volsurface(
|
||||||
VolSurfaceInput vs_input, AnalyticsService service, string user = "") {
|
VolSurfaceInput vs_input, AnalyticsService service, string user = "") {
|
||||||
vs_input.saver_login = user;
|
vs_input.saver_login = user;
|
||||||
|
vs_input.surface_settings.core_settings.vs_manager = user;
|
||||||
// convert to VolSurfaceEntry
|
// convert to VolSurfaceEntry
|
||||||
var to_save = new VolSurfaceEntry();
|
var to_save = new VolSurfaceEntry();
|
||||||
var serialized_vs = ProtobufSerializationHelper.serialize(vs_input);
|
var serialized_vs = ProtobufSerializationHelper.serialize(vs_input);
|
||||||
@@ -595,7 +596,7 @@ namespace mbts.analytics {
|
|||||||
_greek_getter(g)(t, is_call);
|
_greek_getter(g)(t, is_call);
|
||||||
|
|
||||||
public static IDictionary<double, IEnumerable<Theos>> hash_strikes(IEnumerable<Theos> theos) =>
|
public static IDictionary<double, IEnumerable<Theos>> hash_strikes(IEnumerable<Theos> theos) =>
|
||||||
theos.Map(t => t.strike);
|
theos.Map(t => t.strike);
|
||||||
|
|
||||||
static Func<Theos, bool, double> _greek_getter(VolSurfaceGreeks g) =>
|
static Func<Theos, bool, double> _greek_getter(VolSurfaceGreeks g) =>
|
||||||
g switch {
|
g switch {
|
||||||
|
|||||||
@@ -88,8 +88,8 @@ namespace mbts.analytics {
|
|||||||
|
|
||||||
public void set_driver_price(
|
public void set_driver_price(
|
||||||
IDictionary<VolSurfaceExpiration, double> driver_price_map) {
|
IDictionary<VolSurfaceExpiration, double> driver_price_map) {
|
||||||
Log.Gen.info($"VolSurfaceInterpGreeksProducer.set_driver_price " +
|
// Log.Gen.info($"VolSurfaceInterpGreeksProducer.set_driver_price " +
|
||||||
$"vs_id: {_vs_id} exp_count: {driver_price_map.Count}");
|
// $"vs_id: {_vs_id} exp_count: {driver_price_map.Count}");
|
||||||
_driver_price_map = new Dictionary<VolSurfaceExpiration, double>(driver_price_map);
|
_driver_price_map = new Dictionary<VolSurfaceExpiration, double>(driver_price_map);
|
||||||
_compute_and_fire(InputType.DriverPrice);
|
_compute_and_fire(InputType.DriverPrice);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -135,7 +135,10 @@ namespace bts {
|
|||||||
var meta = _security_metadata.get(smd.security);
|
var meta = _security_metadata.get(smd.security);
|
||||||
if (meta.HasValue) {
|
if (meta.HasValue) {
|
||||||
exch_secs[smd.id] = new(
|
exch_secs[smd.id] = new(
|
||||||
smd.security, smd.md, meta.Value.PriceDisplay, meta.Value.QuantityDisplay);
|
smd.security,
|
||||||
|
smd.md,
|
||||||
|
meta.Value.HasPriceDisplay ? meta.Value.PriceDisplay : null,
|
||||||
|
meta.Value.HasQuantityDisplay ? meta.Value.QuantityDisplay : null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_bus.post(SparkTags.ServerSecuritiesTag, exch_secs);
|
_bus.post(SparkTags.ServerSecuritiesTag, exch_secs);
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ namespace bts {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void _on_server_sec_map(IReadOnlyDictionary<uint, SecurityMD> sec_map) {
|
private void _on_server_sec_map(IReadOnlyDictionary<uint, SecurityMD> sec_map) {
|
||||||
_log_options(sec_map);
|
//_log_options(sec_map);
|
||||||
bts.Log.Gen.info(String.Format("MergedMDDaemon._on_server_sec_map sz: {0}", sec_map.Count()));
|
bts.Log.Gen.info(String.Format("MergedMDDaemon._on_server_sec_map sz: {0}", sec_map.Count()));
|
||||||
_server_sec_map = new Dictionary<uint, SecurityMD>(sec_map);
|
_server_sec_map = new Dictionary<uint, SecurityMD>(sec_map);
|
||||||
_merge_and_post();
|
_merge_and_post();
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ namespace mbts.spark {
|
|||||||
r => new ReportImmutable?(r),
|
r => new ReportImmutable?(r),
|
||||||
r => r?.Id ?? throw new ArgumentNullException(nameof(r)));
|
r => r?.Id ?? throw new ArgumentNullException(nameof(r)));
|
||||||
_window_factories = new() {
|
_window_factories = new() {
|
||||||
new VolSurfaceWindowFactory(this, bus),
|
new VolSurfaceWindowFactory(this, bus, user.Value),
|
||||||
new AnalyticsExpirationParametersWindowFactory(this, bus),
|
new AnalyticsExpirationParametersWindowFactory(this, bus),
|
||||||
new SlideReportWindowFactory(this, bus, reports_demuxer.subscribe),
|
new SlideReportWindowFactory(this, bus, reports_demuxer.subscribe),
|
||||||
new ComboReportWindowFactory(this, bus, reports_demuxer.subscribe),
|
new ComboReportWindowFactory(this, bus, reports_demuxer.subscribe),
|
||||||
|
|||||||
@@ -793,70 +793,106 @@
|
|||||||
Grid.Row="5"
|
Grid.Row="5"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Grid.ColumnSpan="4"
|
Grid.ColumnSpan="4"
|
||||||
|
DataContext="{Binding auto_fit_vm}"
|
||||||
Header="Auto Fit"
|
Header="Auto Fit"
|
||||||
Margin="0,5,0,0"
|
Margin="0,5,0,0"
|
||||||
Padding="5"
|
Padding="5">
|
||||||
IsEnabled="False">
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<CheckBox
|
|
||||||
Grid.ColumnSpan="2" Content="Enabled" IsChecked="{Binding enable_auto_fit}" />
|
|
||||||
|
|
||||||
<TextBlock Grid.Row="1" Text="Region" Margin="16,5,0,0">
|
|
||||||
<TextBlock.Style>
|
|
||||||
<Style TargetType="TextBlock">
|
|
||||||
<Style.Triggers>
|
|
||||||
<DataTrigger
|
|
||||||
Binding="{Binding enable_auto_fit}"
|
|
||||||
Value="False">
|
|
||||||
<Setter
|
|
||||||
Property="Foreground"
|
|
||||||
Value="Gray" />
|
|
||||||
</DataTrigger>
|
|
||||||
</Style.Triggers>
|
|
||||||
</Style>
|
|
||||||
</TextBlock.Style>
|
|
||||||
</TextBlock>
|
|
||||||
|
|
||||||
|
<TextBlock Grid.Row="0" Text="Fit Region" />
|
||||||
<ComboBox
|
<ComboBox
|
||||||
|
Grid.Row="0"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
|
Margin="8,0,0,0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
ItemsSource="{Binding fit_regions}"
|
||||||
|
SelectedItem="{Binding fit_region}">
|
||||||
|
<ComboBox.ItemTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<TextBlock Text="{Binding Converter={x:Static shell:VolSurfaceSettingsEditor.AutoFitRegionDisplayTextConverter}}" />
|
||||||
|
</DataTemplate>
|
||||||
|
</ComboBox.ItemTemplate>
|
||||||
|
</ComboBox>
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="1"
|
||||||
|
Margin="0,5,0,0"
|
||||||
|
Text="Every" />
|
||||||
|
<c:TickUpDownNullableUInt32
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="12,0,0,0"
|
HorizontalAlignment="Left"
|
||||||
HorizontalAlignment="Stretch"
|
VerticalAlignment="Center"
|
||||||
ItemsSource="{Binding auto_fit_region_choices}"
|
Minimum="30"
|
||||||
SelectedValue="{Binding auto_fit_region}"
|
Margin="8,0,0,0"
|
||||||
IsEnabled="{Binding enable_auto_fit}" />
|
Width="60"
|
||||||
|
Value="{Binding period_secs}"
|
||||||
|
IsEnabled="{Binding is_auto_fit_enabled}" />
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="1"
|
||||||
|
Grid.Column="2"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
Margin="3,5,0,0"
|
||||||
|
Text="secs" />
|
||||||
|
|
||||||
<TextBlock Grid.Row="2" Text="Fit Time" Margin="16,5,0,0">
|
<TextBlock
|
||||||
<TextBlock.Style>
|
Grid.Row="2"
|
||||||
<Style TargetType="TextBlock">
|
Margin="0,5,0,0"
|
||||||
<Style.Triggers>
|
Text="When Driver moves" />
|
||||||
<DataTrigger Binding="{Binding enable_auto_fit}" Value="False">
|
<c:TickUpDownNullableDouble
|
||||||
<Setter Property="Foreground" Value="Gray" />
|
|
||||||
</DataTrigger>
|
|
||||||
</Style.Triggers>
|
|
||||||
</Style>
|
|
||||||
</TextBlock.Style>
|
|
||||||
</TextBlock>
|
|
||||||
|
|
||||||
<c:TextBoxDouble
|
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
c:TextBoxEx.Suffix="ms"
|
ToolTipService.ShowOnDisabled="True"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Margin="8,0,0,0"
|
||||||
Width="60"
|
Width="60"
|
||||||
Margin="12,5,0,0"
|
Value="{Binding driver_points_moved}"
|
||||||
IsEnabled="{Binding enable_auto_fit}"
|
Increment="0.01"
|
||||||
Value="{Binding auto_fit_time_ms}"
|
TickDisplaySettings="{Binding driver_points_display}"
|
||||||
Template="{StaticResource SuffixTemplate}" />
|
IsEnabled="False"
|
||||||
|
ToolTip="Not yet supported (coming soon)" />
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="2"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
Margin="3,5,0,0"
|
||||||
|
Text="%" />
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="3"
|
||||||
|
Margin="0,5,0,0"
|
||||||
|
Text="When ATM moves" />
|
||||||
|
<c:TickUpDownNullableDouble
|
||||||
|
Grid.Row="3"
|
||||||
|
Grid.Column="1"
|
||||||
|
ToolTipService.ShowOnDisabled="True"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
Margin="8,0,0,0"
|
||||||
|
Width="60"
|
||||||
|
Value="{Binding atm_points_moved}"
|
||||||
|
Increment="0.01"
|
||||||
|
TickDisplaySettings="{Binding atm_points_display}"
|
||||||
|
IsEnabled="False"
|
||||||
|
ToolTip="Not yet supported (coming soon)" />
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="3"
|
||||||
|
Grid.Column="2"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
Margin="3,5,0,0"
|
||||||
|
Text="%" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -1,9 +1,20 @@
|
|||||||
#nullable enable
|
#nullable enable
|
||||||
namespace mbts.ui.shell {
|
namespace mbts.ui.shell {
|
||||||
|
using mbts.analytics;
|
||||||
|
using mbts.ui.converters;
|
||||||
|
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
|
using System.Windows.Data;
|
||||||
|
|
||||||
partial class VolSurfaceSettingsEditor : Window {
|
partial class VolSurfaceSettingsEditor : Window {
|
||||||
public VolSurfaceSettingsEditor() =>
|
public VolSurfaceSettingsEditor() =>
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
|
public static IValueConverter AutoFitRegionDisplayTextConverter =>
|
||||||
|
ValueConverter.create<VolSurfaceEnums.VolCurveFitRegion, string>(fr =>
|
||||||
|
fr switch {
|
||||||
|
VolSurfaceEnums.VolCurveFitRegion.None => "Disabled",
|
||||||
|
_ => fr.ToString()
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -262,7 +262,7 @@
|
|||||||
IsDragAdornerEnabled="False"
|
IsDragAdornerEnabled="False"
|
||||||
ContextMenuOpening="_on_context_menu_opening">
|
ContextMenuOpening="_on_context_menu_opening">
|
||||||
<c:DIYGrid.ContextMenu>
|
<c:DIYGrid.ContextMenu>
|
||||||
<ContextMenu>
|
<ContextMenu IsOpen="{Binding is_open}">
|
||||||
<MenuItem
|
<MenuItem
|
||||||
Header="Populate Empty Expirations"
|
Header="Populate Empty Expirations"
|
||||||
Command="{Binding populate_empty_exps_cmd}" />
|
Command="{Binding populate_empty_exps_cmd}" />
|
||||||
@@ -413,6 +413,11 @@
|
|||||||
</MenuItem.ItemContainerStyle>
|
</MenuItem.ItemContainerStyle>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="Import CSV..." Command="{Binding import_csv_cmd}" />
|
<MenuItem Header="Import CSV..." Command="{Binding import_csv_cmd}" />
|
||||||
|
<MenuItem Command="{Binding acquire_ownership_cmd}">
|
||||||
|
<MenuItem.Header>
|
||||||
|
<TextBlock Text="{Binding vs_manager, StringFormat='Acquire ownership from \'{0}\''}" />
|
||||||
|
</MenuItem.Header>
|
||||||
|
</MenuItem>
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</c:DIYGrid.ContextMenu>
|
</c:DIYGrid.ContextMenu>
|
||||||
<c:DIYGrid.RowStyle>
|
<c:DIYGrid.RowStyle>
|
||||||
|
|||||||
@@ -122,7 +122,7 @@
|
|||||||
}
|
}
|
||||||
var mouse_pos = Mouse.GetPosition(this);
|
var mouse_pos = Mouse.GetPosition(this);
|
||||||
if (!this.ChildAtPoint<VolSurfaceRowView>(mouse_pos, out var row)) {
|
if (!this.ChildAtPoint<VolSurfaceRowView>(mouse_pos, out var row)) {
|
||||||
cm.IsOpen = false;
|
cm.SetCurrentValue(ContextMenu.IsOpenProperty, false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var cgs = g.GetColumnGeometry().ToList();
|
var cgs = g.GetColumnGeometry().ToList();
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
|
using bts;
|
||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
|
|
||||||
@@ -14,14 +15,20 @@
|
|||||||
public const string WINDOW_TYPE = "VolSurface";
|
public const string WINDOW_TYPE = "VolSurface";
|
||||||
|
|
||||||
readonly VolSurfaceWindowSettings _startup_data;
|
readonly VolSurfaceWindowSettings _startup_data;
|
||||||
|
readonly UserTuple _user;
|
||||||
|
|
||||||
VolSurfaceVM _vm;
|
VolSurfaceVM _vm;
|
||||||
VolSurfaceView _view;
|
VolSurfaceView _view;
|
||||||
|
|
||||||
public VolSurfaceWindow(
|
public VolSurfaceWindow(
|
||||||
VolSurfaceWindowFactory factory, IBus bus, string vs_name, VolSurfaceWindowSettings startup_data) :
|
VolSurfaceWindowFactory factory,
|
||||||
base(vs_name, bus, factory, Icons.vol_surface) {
|
IBus bus,
|
||||||
|
string vs_name,
|
||||||
|
VolSurfaceWindowSettings startup_data,
|
||||||
|
UserTuple user
|
||||||
|
) : base(vs_name, bus, factory, Icons.vol_surface) {
|
||||||
_startup_data = startup_data ?? throw new ArgumentNullException(nameof(startup_data));
|
_startup_data = startup_data ?? throw new ArgumentNullException(nameof(startup_data));
|
||||||
|
_user = user;
|
||||||
this.vs_name = vs_name;
|
this.vs_name = vs_name;
|
||||||
_dispose = Disposable.Create(() => Disposable.dispose(ref _vm));
|
_dispose = Disposable.Create(() => Disposable.dispose(ref _vm));
|
||||||
}
|
}
|
||||||
@@ -37,7 +44,7 @@
|
|||||||
public override UIElement Content => _view;
|
public override UIElement Content => _view;
|
||||||
|
|
||||||
public void thread_init() {
|
public void thread_init() {
|
||||||
_vm = new VolSurfaceVM(new VolSurfaceDisplayModel(vs_id, _bus, true), vs_id, _bus, _startup_data);
|
_vm = new VolSurfaceVM(new (vs_id, _bus, true), vs_id, _bus, _startup_data, _user);
|
||||||
_view = new VolSurfaceView {
|
_view = new VolSurfaceView {
|
||||||
DataContext = _vm
|
DataContext = _vm
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
|
using bts;
|
||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.shell;
|
using bts.shell;
|
||||||
|
|
||||||
@@ -10,10 +11,12 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
class VolSurfaceWindowFactory : ShellWindowFactory<VolSurfaceWindowSettings> {
|
class VolSurfaceWindowFactory : ShellWindowFactory<VolSurfaceWindowSettings> {
|
||||||
readonly IBus _bus;
|
readonly IBus _bus;
|
||||||
|
readonly UserTuple _user;
|
||||||
|
|
||||||
public VolSurfaceWindowFactory(IShellModule module, IBus bus)
|
public VolSurfaceWindowFactory(IShellModule module, IBus bus, UserTuple user)
|
||||||
: base(module, "VolSurface") {
|
: base(module, "VolSurface") {
|
||||||
_bus = bus;
|
_bus = bus;
|
||||||
|
_user = user;
|
||||||
_dispose = bus.subscribe(SparkTags.ShowVolSurface).OnDispatcher().Subscribe(
|
_dispose = bus.subscribe(SparkTags.ShowVolSurface).OnDispatcher().Subscribe(
|
||||||
async state => _bus.post(SparkTags.ShowWindow, await _create(state)));
|
async state => _bus.post(SparkTags.ShowWindow, await _create(state)));
|
||||||
}
|
}
|
||||||
@@ -22,7 +25,7 @@ namespace mbts.spark {
|
|||||||
_create(state);
|
_create(state);
|
||||||
|
|
||||||
async Task<IShellWindow> _create(VolSurfaceWindowSettings state) =>
|
async Task<IShellWindow> _create(VolSurfaceWindowSettings state) =>
|
||||||
new VolSurfaceWindow(this, _bus, await _lookup_vs_name(state.id), state);
|
new VolSurfaceWindow(this, _bus, await _lookup_vs_name(state.id), state, _user);
|
||||||
|
|
||||||
async Task<string> _lookup_vs_name(int vs_id) {
|
async Task<string> _lookup_vs_name(int vs_id) {
|
||||||
var (vol_surfaces, success) = await _bus.subscribe(SparkTags.VolSurfaceListTag).FirstAsyncTask(TimeSpan.FromSeconds(2));
|
var (vol_surfaces, success) = await _bus.subscribe(SparkTags.VolSurfaceListTag).FirstAsyncTask(TimeSpan.FromSeconds(2));
|
||||||
|
|||||||
@@ -176,10 +176,11 @@
|
|||||||
</usp:DataGridParameterCellTemplateConverter.QuantityMeasureTemplate>
|
</usp:DataGridParameterCellTemplateConverter.QuantityMeasureTemplate>
|
||||||
</usp:DataGridParameterCellTemplateConverter>
|
</usp:DataGridParameterCellTemplateConverter>
|
||||||
<Style x:Key="ExpanderToggleButton" TargetType="ToggleButton">
|
<Style x:Key="ExpanderToggleButton" TargetType="ToggleButton">
|
||||||
|
<Setter Property="Foreground" Value="{u:BTSColor ExecutionStrategy.expander_foreground}"/>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="ToggleButton">
|
<ControlTemplate TargetType="ToggleButton">
|
||||||
<Grid Background="Transparent">
|
<Grid Background="{u:BTSColor ExecutionStrategy.expander_background}">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="12" />
|
<ColumnDefinition Width="12" />
|
||||||
<ColumnDefinition/>
|
<ColumnDefinition/>
|
||||||
@@ -190,7 +191,7 @@
|
|||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Margin="0,5,0,0"
|
Margin="0,5,0,0"
|
||||||
SnapsToDevicePixels="False"
|
SnapsToDevicePixels="False"
|
||||||
Stroke="#77333333"
|
Stroke="{u:BTSColor ExecutionStrategy.arrow_background}"
|
||||||
StrokeThickness="2"
|
StrokeThickness="2"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
/>
|
/>
|
||||||
@@ -199,6 +200,7 @@
|
|||||||
ContentSource="{TemplateBinding Content}"
|
ContentSource="{TemplateBinding Content}"
|
||||||
Margin="3,0,0,0"
|
Margin="3,0,0,0"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="IsChecked" Value="True">
|
<Trigger Property="IsChecked" Value="True">
|
||||||
@@ -211,7 +213,7 @@
|
|||||||
<Setter Property="Stroke" TargetName="arrow" Value="Black"/>
|
<Setter Property="Stroke" TargetName="arrow" Value="Black"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="IsEnabled" Value="False">
|
<Trigger Property="IsEnabled" Value="False">
|
||||||
<Setter Property="Stroke" TargetName="arrow" Value="#FF707070"/>
|
<Setter Property="Stroke" TargetName="arrow" Value="{u:BTSColor ExecutionStrategy.arrow_background_selected}"/>
|
||||||
<Setter Property="Foreground" Value="Gray"/>
|
<Setter Property="Foreground" Value="Gray"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
@@ -278,7 +280,8 @@
|
|||||||
<ColumnDefinition/>
|
<ColumnDefinition/>
|
||||||
</SelectiveScrollingGrid.ColumnDefinitions>
|
</SelectiveScrollingGrid.ColumnDefinitions>
|
||||||
<DataGridRowHeader
|
<DataGridRowHeader
|
||||||
Background="Transparent"
|
Foreground="{u:BTSColor ExecutionStrategy.expander_foreground}"
|
||||||
|
Background="{u:BTSColor ExecutionStrategy.data_grid_row_header_background}"
|
||||||
Padding="{Binding section_count, Converter={StaticResource RowHeaderGroupIndentConverter}}"
|
Padding="{Binding section_count, Converter={StaticResource RowHeaderGroupIndentConverter}}"
|
||||||
FontWeight="{Binding font_weight, FallbackValue={u:FontWeight Normal}}"
|
FontWeight="{Binding font_weight, FallbackValue={u:FontWeight Normal}}"
|
||||||
SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
|
SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
|
||||||
@@ -317,9 +320,17 @@
|
|||||||
<Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
|
<Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
|
||||||
<Setter Property="BorderThickness" Value="1,0"/>
|
<Setter Property="BorderThickness" Value="1,0"/>
|
||||||
<Setter Property="BorderBrush" Value="Transparent"/>
|
<Setter Property="BorderBrush" Value="Transparent"/>
|
||||||
|
<Setter Property="Background" Value="{u:BTSColor ExecutionStrategy.alternate_column_background}"/>
|
||||||
<Setter Property="Template" Value="{StaticResource DataGridRowTemplate}"/>
|
<Setter Property="Template" Value="{StaticResource DataGridRowTemplate}"/>
|
||||||
<Setter Property="usp:ExecutionStrategyEditor.RowHasErrors" Value="{Binding has_errors}"/>
|
<Setter Property="usp:ExecutionStrategyEditor.RowHasErrors" Value="{Binding has_errors}"/>
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
|
<Trigger Property="ListBox.AlternationIndex" Value="1">
|
||||||
|
<Setter Property="Background" Value="{u:BTSColor ExecutionStrategy.data_grid_background}"/>
|
||||||
|
</Trigger>
|
||||||
|
<!-- <Trigger Property="ListBox.AlternationIndex" Value="2">
|
||||||
|
<Setter Property="Background" Value="LightBlue"/>
|
||||||
|
<Setter Property="Foreground" Value="Navy"/>
|
||||||
|
</Trigger> -->
|
||||||
<DataTrigger Binding="{Binding read_only}" Value="True">
|
<DataTrigger Binding="{Binding read_only}" Value="True">
|
||||||
<Setter Property="TextElement.Foreground" Value="{u:BTSColor UI.input_disabled_text_dark}"/>
|
<Setter Property="TextElement.Foreground" Value="{u:BTSColor UI.input_disabled_text_dark}"/>
|
||||||
<Setter Property="ToolTip">
|
<Setter Property="ToolTip">
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ namespace mbts.spark {
|
|||||||
main_vm.rows.AddRange(parsed_synths.Select(ps => {
|
main_vm.rows.AddRange(parsed_synths.Select(ps => {
|
||||||
var sec = ps.result;
|
var sec = ps.result;
|
||||||
var r = new SyntheticImportRowVM(orders_model.admin_model.user.id, used_names.Contains) {
|
var r = new SyntheticImportRowVM(orders_model.admin_model.user.id, used_names.Contains) {
|
||||||
tick_factors = TickUtils.get_regional_ticks(sec.ContractSpec).low_tick,
|
tick_factors = TickUtils.get_regional_ticks(sec.immutable()).low_tick,
|
||||||
name = sec.Synthetic.Name,
|
name = sec.Synthetic.Name,
|
||||||
parsed_synth = ps
|
parsed_synth = ps
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ namespace mbts.spark {
|
|||||||
public SyntheticEditorVM(SpreaderModel model, SecurityImmutable synthetic, ExecutionStrategyImmutable strategy, IObservable<bool> security_has_working_orders)
|
public SyntheticEditorVM(SpreaderModel model, SecurityImmutable synthetic, ExecutionStrategyImmutable strategy, IObservable<bool> security_has_working_orders)
|
||||||
: this(synthetic, strategy, false) {
|
: this(synthetic, strategy, false) {
|
||||||
ExceptionAssert.InvalidOperation.That(synthetic.Id != 0, "This constructor may only be used for already-existing synthetic securities (id must be non-zero).");
|
ExceptionAssert.InvalidOperation.That(synthetic.Id != 0, "This constructor may only be used for already-existing synthetic securities (id must be non-zero).");
|
||||||
_tick_factors = TickUtils.get_regional_ticks(synthetic.ContractSpec).low_tick;
|
_tick_factors = TickUtils.get_regional_ticks(synthetic).low_tick;
|
||||||
if (TickUtils.is_integer_tick(synthetic.ContractSpec)) {
|
if (TickUtils.is_integer_tick(synthetic.ContractSpec)) {
|
||||||
_use_fractional_ticks = false;
|
_use_fractional_ticks = false;
|
||||||
_integer_tick_size = DoubleHelper.to_optional_int32(synthetic.ContractSpec.LowTick) ?? 0;
|
_integer_tick_size = DoubleHelper.to_optional_int32(synthetic.ContractSpec.LowTick) ?? 0;
|
||||||
@@ -112,7 +112,7 @@ namespace mbts.spark {
|
|||||||
_set_ticks_automatically = false;
|
_set_ticks_automatically = false;
|
||||||
_set_quantities_automatically = false;
|
_set_quantities_automatically = false;
|
||||||
_set_price_mults_automatically = false;
|
_set_price_mults_automatically = false;
|
||||||
_tick_factors = TickUtils.get_regional_ticks(_synthetic.ContractSpec).low_tick;
|
_tick_factors = TickUtils.get_regional_ticks(_synthetic.immutable()).low_tick;
|
||||||
} else {
|
} else {
|
||||||
_deduce_name();
|
_deduce_name();
|
||||||
_deduce_ticks();
|
_deduce_ticks();
|
||||||
@@ -411,7 +411,7 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _deduce_ticks() {
|
void _deduce_ticks() {
|
||||||
_tick_factors = TickUtils.deduce_ticks(leg_tuples.Select(l => l.leg.Security.ContractSpec));
|
_tick_factors = TickUtils.deduce_ticks(leg_tuples.Select(l => l.leg.Security.immutable()));
|
||||||
RaisePropertyChanged(nameof(tick_factors));
|
RaisePropertyChanged(nameof(tick_factors));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -371,6 +371,7 @@
|
|||||||
<usp:AlgoEditorView
|
<usp:AlgoEditorView
|
||||||
DataContext="{Binding selected_definition}"
|
DataContext="{Binding selected_definition}"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
|
Foreground="{u:BTSColor UI.default_text}"
|
||||||
BorderBrush="{Binding algo_root, Converter={StaticResource OrderTypeBrushConverter}}"
|
BorderBrush="{Binding algo_root, Converter={StaticResource OrderTypeBrushConverter}}"
|
||||||
Padding="12,8" />
|
Padding="12,8" />
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ namespace Spark.Trading {
|
|||||||
meta.Value.Value.PriceDisplay : Security.Defaults.price_display_settingsi;
|
meta.Value.Value.PriceDisplay : Security.Defaults.price_display_settingsi;
|
||||||
if (security.HasValue) {
|
if (security.HasValue) {
|
||||||
rv = rv.with(
|
rv = rv.with(
|
||||||
tick_factors: security.spec_or_default().tick_factors().to_api_tick_factors());
|
tick_factors: security.Value.tick_factors().to_api_tick_factors());
|
||||||
}
|
}
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -241,7 +241,7 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public OrderBookVM? create_orderbook_vm() {
|
public OrderBookVM? create_orderbook_vm() {
|
||||||
var ticks = _owner.spec.full_ticks_from_zero(real_price);
|
var ticks = _owner.spec.count_ticks(real_price);
|
||||||
if (!ticks.HasValue) {
|
if (!ticks.HasValue) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -191,7 +191,7 @@ namespace mbts.spark {
|
|||||||
void increment_ticks_per_row() {
|
void increment_ticks_per_row() {
|
||||||
var tpr = ticks_per_row;
|
var tpr = ticks_per_row;
|
||||||
for (uint i = 1; i < 100; i++) {
|
for (uint i = 1; i < 100; i++) {
|
||||||
var new_tpr = TickUtils.fit_ticks_per_row_to_dollars(security.ContractSpec, ticks_per_row + i);
|
var new_tpr = TickUtils.fit_ticks_per_row_to_dollars(security, ticks_per_row + i);
|
||||||
if (new_tpr != tpr) {
|
if (new_tpr != tpr) {
|
||||||
ticks_per_row = new_tpr;
|
ticks_per_row = new_tpr;
|
||||||
break;
|
break;
|
||||||
@@ -201,7 +201,7 @@ namespace mbts.spark {
|
|||||||
void decrement_ticks_per_row() {
|
void decrement_ticks_per_row() {
|
||||||
var tpr = ticks_per_row;
|
var tpr = ticks_per_row;
|
||||||
for (uint i = 1; i < tpr; i++) {
|
for (uint i = 1; i < tpr; i++) {
|
||||||
var new_tpr = TickUtils.fit_ticks_per_row_to_dollars(security.ContractSpec, tpr - i);
|
var new_tpr = TickUtils.fit_ticks_per_row_to_dollars(security, tpr - i);
|
||||||
if (new_tpr != tpr) {
|
if (new_tpr != tpr) {
|
||||||
ticks_per_row = new_tpr;
|
ticks_per_row = new_tpr;
|
||||||
break;
|
break;
|
||||||
@@ -239,7 +239,8 @@ namespace mbts.spark {
|
|||||||
// since settings profiles may be shared among ladders
|
// since settings profiles may be shared among ladders
|
||||||
// of different securities/tick sizes, the ticks per row setting
|
// of different securities/tick sizes, the ticks per row setting
|
||||||
// may need to be rounded to a number that is a factor of $1.00
|
// may need to be rounded to a number that is a factor of $1.00
|
||||||
public uint? rounded_ticks_per_row => TickUtils.fit_ticks_per_row_to_dollars(_security.ContractSpec, ticks_per_row);
|
public uint? rounded_ticks_per_row =>
|
||||||
|
TickUtils.fit_ticks_per_row_to_dollars(_security, ticks_per_row);
|
||||||
|
|
||||||
public MarketSizeDisplayVM size_display { get; } = new MarketSizeDisplayVM();
|
public MarketSizeDisplayVM size_display { get; } = new MarketSizeDisplayVM();
|
||||||
public SimpleGridSettingsVM mini_ob { get; } = new SimpleGridSettingsVM(OrderBookGridSettingsManager.hard_column_flags);
|
public SimpleGridSettingsVM mini_ob { get; } = new SimpleGridSettingsVM(OrderBookGridSettingsManager.hard_column_flags);
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ namespace mbts.spark {
|
|||||||
IReadOnlyDictionary<uint, OrderSecurity> _cache = DictionaryHelper.empty<uint, OrderSecurity>();
|
IReadOnlyDictionary<uint, OrderSecurity> _cache = DictionaryHelper.empty<uint, OrderSecurity>();
|
||||||
ImmutableDictionary<AlgoKey, LadderFavoriteAlgoMetadata> _favorite_algo_metadata_map =
|
ImmutableDictionary<AlgoKey, LadderFavoriteAlgoMetadata> _favorite_algo_metadata_map =
|
||||||
ImmutableDictionary<AlgoKey, LadderFavoriteAlgoMetadata>.Empty;
|
ImmutableDictionary<AlgoKey, LadderFavoriteAlgoMetadata>.Empty;
|
||||||
ContractSpecificationImmutable? _spec;
|
RegionalTickFactors? _spec;
|
||||||
|
|
||||||
LadderVM(
|
LadderVM(
|
||||||
IBus bus,
|
IBus bus,
|
||||||
@@ -243,10 +243,9 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
var orders_source = settings.Select(s => s.ticks_per_row).DistinctUntilChanged()
|
var orders_source = settings.Select(s => s.ticks_per_row).DistinctUntilChanged()
|
||||||
.SelectSeries(tpr => {
|
.SelectSeries(tpr => {
|
||||||
var spec = TickUtils.multiply_tick_size(security.ContractSpec, tpr);
|
var spec = TickUtils.multiply_tick_size(security.regional_ticks(), tpr);
|
||||||
var price_comp = Comparer<double>.Create((a, b) =>
|
var price_comp = Comparer<double>.Create((a, b) =>
|
||||||
Comparer<int?>.Default.Compare(
|
Comparer<long?>.Default.Compare(spec.count_ticks(a), spec.count_ticks(b)));
|
||||||
spec.full_ticks_from_zero(a), spec.full_ticks_from_zero(b)));
|
|
||||||
return _order_price_source(model.orders, price_comp, p => TickUtils.normalize_price(spec, p));
|
return _order_price_source(model.orders, price_comp, p => TickUtils.normalize_price(spec, p));
|
||||||
});
|
});
|
||||||
_day_change.Changed += (o, n) => RaisePropertyChanged(
|
_day_change.Changed += (o, n) => RaisePropertyChanged(
|
||||||
@@ -394,9 +393,10 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public SecurityImmutable security => _model.security;
|
public SecurityImmutable security => _model.security;
|
||||||
public ContractSpecificationImmutable spec => _spec ?? (
|
public RegionalTickFactors spec => _spec ?? (
|
||||||
_spec = TickUtils.multiply_tick_size(
|
_spec = TickUtils.multiply_tick_size(
|
||||||
security.ContractSpec, current_settings?.ticks_per_row ?? 1)).Value;
|
security.regional_ticks(), current_settings?.ticks_per_row ?? 1))
|
||||||
|
?? RegionalTickFactors.Default;
|
||||||
|
|
||||||
public double display_quantity_divisor { get; }
|
public double display_quantity_divisor { get; }
|
||||||
public LadderSettings current_settings { get; private set; }
|
public LadderSettings current_settings { get; private set; }
|
||||||
@@ -826,7 +826,7 @@ namespace mbts.spark {
|
|||||||
if (!price.is_real()) {
|
if (!price.is_real()) {
|
||||||
msg = "not a real number";
|
msg = "not a real number";
|
||||||
} else if (settlement.is_real()) {
|
} else if (settlement.is_real()) {
|
||||||
var ticks_from_settle = security.ContractSpec.tickdiff(price, settlement);
|
var ticks_from_settle = security.tickdiff(price, settlement);
|
||||||
if (ticks_from_settle.HasValue) {
|
if (ticks_from_settle.HasValue) {
|
||||||
var max_cross = (current_settings?.ladder_order_limits?.max_settlement_cross_ticks)
|
var max_cross = (current_settings?.ladder_order_limits?.max_settlement_cross_ticks)
|
||||||
.as_nullable();
|
.as_nullable();
|
||||||
@@ -858,7 +858,7 @@ namespace mbts.spark {
|
|||||||
} else {
|
} else {
|
||||||
ulong _ = 0;
|
ulong _ = 0;
|
||||||
_model.md.get_bbo(ref _, out var bid, out var ask);
|
_model.md.get_bbo(ref _, out var bid, out var ask);
|
||||||
var mid = TickUtils.mid_tick(security.ContractSpec, bid.price, ask.price);
|
var mid = TickUtils.mid_tick(security.regional_ticks(), bid.price, ask.price);
|
||||||
_day_change.set(mid - md.settlement_price);
|
_day_change.set(mid - md.settlement_price);
|
||||||
}
|
}
|
||||||
_volume.set(volume);
|
_volume.set(volume);
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ using System.Windows.Media.Animation;
|
|||||||
using System.Windows.Threading;
|
using System.Windows.Threading;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
|
using RegionalTickFactors = user.settings.RegionalTickFactors;
|
||||||
|
|
||||||
partial class LadderGridHost : Control {
|
partial class LadderGridHost : Control {
|
||||||
static readonly int _initial_row_count;
|
static readonly int _initial_row_count;
|
||||||
static readonly bool _show_scrollbar;
|
static readonly bool _show_scrollbar;
|
||||||
@@ -83,7 +85,6 @@ namespace mbts.spark {
|
|||||||
bool _price_dirty = false, _piq_dirty = false;
|
bool _price_dirty = false, _piq_dirty = false;
|
||||||
LadderPriceList _price_list = new() {
|
LadderPriceList _price_list = new() {
|
||||||
length = _initial_row_count,
|
length = _initial_row_count,
|
||||||
spec = Security.Defaults.ContractSpecificationImmutable
|
|
||||||
};
|
};
|
||||||
LadderPriceList _pending_price_list = null;
|
LadderPriceList _pending_price_list = null;
|
||||||
IComparer<double> _price_comparer;
|
IComparer<double> _price_comparer;
|
||||||
@@ -384,16 +385,16 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
Column[] _columns { get; set; } = Array.Empty<Column>();
|
Column[] _columns { get; set; } = Array.Empty<Column>();
|
||||||
IEnumerable<Column> _visible_columns => _columns.Where(c => c.settings.show);
|
IEnumerable<Column> _visible_columns => _columns.Where(c => c.settings.show);
|
||||||
ContractSpecificationImmutable? _spec_backing;
|
RegionalTickFactors _spec_backing;
|
||||||
ContractSpecificationImmutable _spec {
|
RegionalTickFactors _spec {
|
||||||
get {
|
get {
|
||||||
if (_spec_backing.HasValue) {
|
if (_spec_backing is not null) {
|
||||||
return _spec_backing.Value;
|
return _spec_backing;
|
||||||
} else if (_vm != null) {
|
} else if (_vm != null) {
|
||||||
_spec_backing = TickUtils.multiply_tick_size(security.ContractSpec, _settings?.ticks_per_row ?? 1);
|
_spec_backing = TickUtils.multiply_tick_size(security.regional_ticks(), _settings?.ticks_per_row ?? 1);
|
||||||
return _spec_backing.Value;
|
return _spec_backing;
|
||||||
}
|
}
|
||||||
return Security.Defaults.ContractSpecificationImmutable;
|
return RegionalTickFactors.Default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -447,6 +448,15 @@ namespace mbts.spark {
|
|||||||
return _price_list.high_tick + tick_diff;
|
return _price_list.high_tick + tick_diff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool scroll_to_tick(long tick) {
|
||||||
|
if (tick > int.MaxValue) {
|
||||||
|
Log.Ui.error(
|
||||||
|
$"Unable to scroll to tick {tick} because it exceeds int.MaxValue");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return scroll_to_tick((int)tick);
|
||||||
|
}
|
||||||
|
|
||||||
public bool scroll_to_tick(int tick) {
|
public bool scroll_to_tick(int tick) {
|
||||||
if (_vm is null || _settings is null || _scroll_viewer is null) {
|
if (_vm is null || _settings is null || _scroll_viewer is null) {
|
||||||
return false;
|
return false;
|
||||||
@@ -460,21 +470,23 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
// The scrollbar's vertical offset won't change. Find the 'top tick' that will put the
|
// The scrollbar's vertical offset won't change. Find the 'top tick' that will put the
|
||||||
// target `tick` in the center of the viewport.
|
// target `tick` in the center of the viewport.
|
||||||
var top_tick = (int)_get_target_top_tick(tick);
|
checked {
|
||||||
if (_settings.animate_recenter) {
|
var top_tick = (int)_get_target_top_tick(tick);
|
||||||
var anim = new Int32Animation {
|
if (_settings.animate_recenter) {
|
||||||
From = _price_list.high_tick,
|
var anim = new Int32Animation {
|
||||||
To = top_tick,
|
From = (int)_price_list.high_tick,
|
||||||
Duration = TimeSpan.FromSeconds(0.15)
|
To = top_tick,
|
||||||
};
|
Duration = TimeSpan.FromSeconds(0.15)
|
||||||
var sb = new Storyboard();
|
};
|
||||||
sb.Children.Add(anim);
|
var sb = new Storyboard();
|
||||||
Storyboard.SetTarget(anim, this);
|
sb.Children.Add(anim);
|
||||||
Storyboard.SetTargetProperty(anim, new PropertyPath(TopTickProperty));
|
Storyboard.SetTarget(anim, this);
|
||||||
sb.Begin();
|
Storyboard.SetTargetProperty(anim, new PropertyPath(TopTickProperty));
|
||||||
} else {
|
sb.Begin();
|
||||||
_set_scrollbar_range(high_tick: top_tick);
|
} else {
|
||||||
_refresh_prices();
|
_set_scrollbar_range(high_tick: top_tick);
|
||||||
|
_refresh_prices();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -744,12 +756,12 @@ namespace mbts.spark {
|
|||||||
internal double price_for_point(Point point) =>
|
internal double price_for_point(Point point) =>
|
||||||
_price_for_row(_row_for_point(point));
|
_price_for_row(_row_for_point(point));
|
||||||
|
|
||||||
static uint? _size_from_row(int row, IList<double> price_list, NativePriceSize[] depth, ContractSpecificationImmutable spec) {
|
static uint? _size_from_row(int row, IList<double> price_list, NativePriceSize[] depth, RegionalTickFactors spec) {
|
||||||
if (price_list == null || depth == null) return null;
|
if (price_list == null || depth == null) return null;
|
||||||
else return row <= price_list.Count ? _size_from_price(price_list[row], depth, spec) : null;
|
else return row <= price_list.Count ? _size_from_price(price_list[row], depth, spec) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint? _size_from_price(double price, NativePriceSize[] depth, ContractSpecificationImmutable spec) {
|
static uint? _size_from_price(double price, NativePriceSize[] depth, RegionalTickFactors spec) {
|
||||||
if (!double.IsNaN(price) && depth.TryGetFirst(nps => spec.tick_equals(price, nps.price), out NativePriceSize result))
|
if (!double.IsNaN(price) && depth.TryGetFirst(nps => spec.tick_equals(price, nps.price), out NativePriceSize result))
|
||||||
return result.size;
|
return result.size;
|
||||||
return null;
|
return null;
|
||||||
@@ -1099,10 +1111,16 @@ namespace mbts.spark {
|
|||||||
Log.assert(_price_dirty);
|
Log.assert(_price_dirty);
|
||||||
_price_list = new LadderPriceList {
|
_price_list = new LadderPriceList {
|
||||||
length = _initial_row_count,
|
length = _initial_row_count,
|
||||||
spec = security.ContractSpec
|
security = security
|
||||||
};
|
};
|
||||||
var mid_tick = security.ContractSpec.tickdiff(_mkt_break_lines.origin, 0) ?? 0;
|
var mid_tick = security.tickdiff(_mkt_break_lines.origin, 0) ?? 0;
|
||||||
_set_scrollbar_range(high_tick: mid_tick + (_price_list.Count << 1));
|
if (mid_tick > int.MaxValue) {
|
||||||
|
Log.Ui.error(
|
||||||
|
$"Unable to set scrollbar range about mid_tick {mid_tick}: " +
|
||||||
|
$"tick count exceeds int.MaxValue");
|
||||||
|
} else {
|
||||||
|
_set_scrollbar_range(high_tick: (int)mid_tick + (_price_list.Count << 1));
|
||||||
|
}
|
||||||
_price_dirty = true;
|
_price_dirty = true;
|
||||||
}
|
}
|
||||||
if (_price_dirty) {
|
if (_price_dirty) {
|
||||||
@@ -1181,12 +1199,12 @@ namespace mbts.spark {
|
|||||||
_price_list, _vm.md.settlement_price,
|
_price_list, _vm.md.settlement_price,
|
||||||
_settings.net_change == LadderSettings.NetChangeTerms.Ticks,
|
_settings.net_change == LadderSettings.NetChangeTerms.Ticks,
|
||||||
_settings.row_height, _settings.price_column,
|
_settings.row_height, _settings.price_column,
|
||||||
security.ContractSpec);
|
_spec);
|
||||||
} else {
|
} else {
|
||||||
LadderRender.render_prices(
|
LadderRender.render_prices(
|
||||||
_price_vis_tup.visual, _price_vis_tup.glyph_context,
|
_price_vis_tup.visual, _price_vis_tup.glyph_context,
|
||||||
_price_list, _settings.row_height,
|
_price_list, _settings.row_height,
|
||||||
_settings.price_column, security.ContractSpec,
|
_settings.price_column, _spec,
|
||||||
_settings.price_display_format);
|
_settings.price_display_format);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1341,7 +1359,7 @@ namespace mbts.spark {
|
|||||||
return;
|
return;
|
||||||
if (_price_list is null) {
|
if (_price_list is null) {
|
||||||
_price_list = new LadderPriceList {
|
_price_list = new LadderPriceList {
|
||||||
spec = security.ContractSpec
|
security = security
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
_price_list.reset(null, null, _initial_row_count);
|
_price_list.reset(null, null, _initial_row_count);
|
||||||
@@ -1425,7 +1443,7 @@ namespace mbts.spark {
|
|||||||
_pending_scroll_to_origin |= _settings == null;
|
_pending_scroll_to_origin |= _settings == null;
|
||||||
_invalidate_spec();
|
_invalidate_spec();
|
||||||
if (_price_list != null) {
|
if (_price_list != null) {
|
||||||
_price_list.spec = _spec;
|
_price_list.security = security;
|
||||||
}
|
}
|
||||||
_bid_vis_tup.glyph_context = glyph_context(s.bid_column);
|
_bid_vis_tup.glyph_context = glyph_context(s.bid_column);
|
||||||
_ask_vis_tup.glyph_context = glyph_context(s.ask_column);
|
_ask_vis_tup.glyph_context = glyph_context(s.ask_column);
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
|
using RegionalTickFactors = user.settings.RegionalTickFactors;
|
||||||
|
|
||||||
class LadderPriceLineViewAdapter {
|
class LadderPriceLineViewAdapter {
|
||||||
public static double bid_line(
|
public static double bid_line(
|
||||||
double bid, double ask, double settlement, ContractSpecificationImmutable? spec) {
|
double bid, double ask, double settlement, RegionalTickFactors spec) {
|
||||||
return TickUtils.normalize_price(spec, impl());
|
return TickUtils.normalize_price(spec, impl());
|
||||||
double impl() {
|
double impl() {
|
||||||
if (!double.IsNaN(bid)) {
|
if (!double.IsNaN(bid)) {
|
||||||
@@ -17,7 +19,7 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static double ask_line(
|
public static double ask_line(
|
||||||
double bid, double ask, double settlement, ContractSpecificationImmutable? spec) {
|
double bid, double ask, double settlement, RegionalTickFactors spec) {
|
||||||
return TickUtils.normalize_price(spec, impl());
|
return TickUtils.normalize_price(spec, impl());
|
||||||
double impl() {
|
double impl() {
|
||||||
if (!double.IsNaN(ask)) {
|
if (!double.IsNaN(ask)) {
|
||||||
@@ -31,7 +33,7 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static double mid_line(
|
public static double mid_line(
|
||||||
double bid, double ask, double settlement, ContractSpecificationImmutable? spec) {
|
double bid, double ask, double settlement, RegionalTickFactors spec) {
|
||||||
return TickUtils.normalize_price(spec, impl());
|
return TickUtils.normalize_price(spec, impl());
|
||||||
double impl() {
|
double impl() {
|
||||||
if (double.IsNaN(bid)) {
|
if (double.IsNaN(bid)) {
|
||||||
@@ -43,16 +45,16 @@ namespace mbts.spark {
|
|||||||
if (double.IsNaN(ask)) {
|
if (double.IsNaN(ask)) {
|
||||||
return bid;
|
return bid;
|
||||||
}
|
}
|
||||||
if (spec.HasValue) {
|
if (spec is not null) {
|
||||||
return TickUtils.mid_tick(spec.Value, bid, ask);
|
return TickUtils.mid_tick(spec, bid, ask);
|
||||||
}
|
}
|
||||||
return bid;
|
return bid;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static double _try_tick_down(ContractSpecificationImmutable? spec, double value) {
|
static double _try_tick_down(RegionalTickFactors spec, double value) {
|
||||||
if (spec.HasValue) {
|
if (spec is not null) {
|
||||||
return spec.Value.tickdown(value);
|
return spec.tickdown(value);
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
|
using bts.utils;
|
||||||
|
|
||||||
using mbts.utils;
|
using mbts.utils;
|
||||||
|
|
||||||
@@ -8,52 +9,78 @@ using System.Collections.Generic;
|
|||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
|
using RegionalTickFactors = user.settings.RegionalTickFactors;
|
||||||
public class LadderPriceList : IReadOnlyList<double>, IList<double>, INotifyCollectionChanged, IEquatable<LadderPriceList> {
|
public class LadderPriceList : IReadOnlyList<double>, IList<double>, INotifyCollectionChanged, IEquatable<LadderPriceList> {
|
||||||
int _length;
|
const long _MAX_LENGTH = int.MaxValue;
|
||||||
int _high_tick;
|
|
||||||
|
long _length;
|
||||||
|
long _high_tick;
|
||||||
|
SecurityImmutable? _security;
|
||||||
|
RegionalTickFactors _regional_tick_backing;
|
||||||
|
RegionalTickFactors _regional_tick =>
|
||||||
|
_regional_tick_backing ??= TickUtils.get_regional_ticks(_security);
|
||||||
|
|
||||||
public LadderPriceList() { }
|
public LadderPriceList() { }
|
||||||
|
|
||||||
public LadderPriceList(LadderPriceList other) {
|
public LadderPriceList(LadderPriceList other) {
|
||||||
_length = other._length;
|
_length = other._length;
|
||||||
_high_tick = other._high_tick;
|
_high_tick = other._high_tick;
|
||||||
spec = other.spec;
|
_security = other._security;
|
||||||
}
|
}
|
||||||
|
|
||||||
public event NotifyCollectionChangedEventHandler CollectionChanged;
|
public event NotifyCollectionChangedEventHandler CollectionChanged;
|
||||||
|
|
||||||
|
public SecurityImmutable? security {
|
||||||
|
get => _security;
|
||||||
|
set {
|
||||||
|
if (value == _security) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_security = value;
|
||||||
|
_regional_tick_backing = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public ContractSpecificationImmutable spec { get; set; }
|
public ContractSpecificationImmutable spec { get; set; }
|
||||||
|
|
||||||
public int high_tick {
|
public long high_tick {
|
||||||
get => _high_tick;
|
get => _high_tick;
|
||||||
set => _high_tick = value;
|
set => _high_tick = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int low_tick {
|
public long low_tick {
|
||||||
get => high_tick - length;
|
get => high_tick - length;
|
||||||
set => reset(null, value, null);
|
set => reset(null, value, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public double start {
|
public double start {
|
||||||
get => spec.tickup(0, high_tick);
|
get => _regional_tick.tickup<double>(0, (uint)high_tick);
|
||||||
set => high_tick = spec.tickdiff(value, 0) ?? high_tick;
|
set => high_tick = _regional_tick.tickdiff(value, 0) ?? high_tick;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int length {
|
public long length {
|
||||||
get => _length;
|
get => _length;
|
||||||
set {
|
set {
|
||||||
if (value < 0) {
|
if (value < 0 || value > _MAX_LENGTH) {
|
||||||
throw new ArgumentException($"Value must be >= 0 (actually {value})");
|
throw new ArgumentException(
|
||||||
|
$"Value 'v' must be >= 0 and < {_MAX_LENGTH} (actually {value})");
|
||||||
}
|
}
|
||||||
_length = value;
|
_length = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public int Count => (int)length;
|
|
||||||
|
public int Count {
|
||||||
|
get {
|
||||||
|
checked {
|
||||||
|
return (int)length;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsReadOnly => false;
|
public bool IsReadOnly => false;
|
||||||
|
|
||||||
public double this[int idx] {
|
public double this[int idx] {
|
||||||
get => spec.tickup(0, high_tick - idx);
|
get => _regional_tick.tick<double>(0, high_tick - idx);
|
||||||
set => throw new NotSupportedException();
|
set => throw new NotSupportedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,11 +94,13 @@ namespace mbts.spark {
|
|||||||
GetEnumerator();
|
GetEnumerator();
|
||||||
|
|
||||||
public int IndexOf(double item) {
|
public int IndexOf(double item) {
|
||||||
var idx = spec.tickdiff(start, item) ?? -1;
|
var idx = _regional_tick.tickdiff(start, item) ?? -1;
|
||||||
if (idx < 0 || idx >= length) {
|
if (idx < 0 || idx >= length) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
return idx;
|
checked {
|
||||||
|
return (int)idx;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Insert(int index, double item) =>
|
public void Insert(int index, double item) =>
|
||||||
@@ -138,15 +167,15 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reset(int? high_tick = null, int? low_tick = null, int? length = null) {
|
public void reset(long? high_tick = null, long? low_tick = null, long? length = null) {
|
||||||
if (!high_tick.HasValue && !low_tick.HasValue && !length.HasValue) {
|
if (!high_tick.HasValue && !low_tick.HasValue && !length.HasValue) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (length.HasValue && length.Value < 0) {
|
if (length.HasValue && length.Value < 0) {
|
||||||
throw new ArgumentException("Must be >= 0", nameof(length));
|
throw new ArgumentException("Must be >= 0", nameof(length));
|
||||||
}
|
}
|
||||||
int new_high_tick = 0;
|
long new_high_tick = 0;
|
||||||
int new_length = 0;
|
long new_length = 0;
|
||||||
if (high_tick.HasValue) {
|
if (high_tick.HasValue) {
|
||||||
new_high_tick = high_tick.Value;
|
new_high_tick = high_tick.Value;
|
||||||
if (low_tick.HasValue) {
|
if (low_tick.HasValue) {
|
||||||
@@ -180,8 +209,7 @@ namespace mbts.spark {
|
|||||||
other != null &&
|
other != null &&
|
||||||
_high_tick == other._high_tick &&
|
_high_tick == other._high_tick &&
|
||||||
_length == other._length &&
|
_length == other._length &&
|
||||||
spec.LowTick.Equals(other.spec.LowTick) &&
|
_regional_tick.safe_equals(other._regional_tick);
|
||||||
spec.PriceBreak.Equals(other.spec.PriceBreak);
|
|
||||||
|
|
||||||
public override bool Equals(object obj) =>
|
public override bool Equals(object obj) =>
|
||||||
Equals(obj as LadderPriceList);
|
Equals(obj as LadderPriceList);
|
||||||
@@ -189,13 +217,10 @@ namespace mbts.spark {
|
|||||||
public override int GetHashCode() =>
|
public override int GetHashCode() =>
|
||||||
HashCode.Combine(_high_tick, _length);
|
HashCode.Combine(_high_tick, _length);
|
||||||
|
|
||||||
double _tick_to_price(int tick) =>
|
double _tick_to_price(long tick) =>
|
||||||
spec.tickup(0, tick);
|
_regional_tick.tick<double>(0, tick);
|
||||||
|
|
||||||
int? _price_to_tick(double price) =>
|
void _add_tick(long tick) {
|
||||||
spec.tickdiff(price, 0);
|
|
||||||
|
|
||||||
void _add_tick(int tick) {
|
|
||||||
int idx;
|
int idx;
|
||||||
if (length == 0) {
|
if (length == 0) {
|
||||||
_high_tick = tick;
|
_high_tick = tick;
|
||||||
@@ -204,7 +229,9 @@ namespace mbts.spark {
|
|||||||
_high_tick = tick;
|
_high_tick = tick;
|
||||||
idx = 0;
|
idx = 0;
|
||||||
} else if (tick == low_tick - 1) {
|
} else if (tick == low_tick - 1) {
|
||||||
idx = length;
|
checked {
|
||||||
|
idx = (int)length;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new ArgumentException($"Must be == {nameof(high_tick)} ({high_tick}) + 1, or == {nameof(low_tick)} ({low_tick}) - 1)");
|
throw new ArgumentException($"Must be == {nameof(high_tick)} ({high_tick}) + 1, or == {nameof(low_tick)} ({low_tick}) - 1)");
|
||||||
}
|
}
|
||||||
@@ -212,7 +239,7 @@ namespace mbts.spark {
|
|||||||
CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, _tick_to_price(tick), idx));
|
CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, _tick_to_price(tick), idx));
|
||||||
}
|
}
|
||||||
|
|
||||||
void _remove_tick(int tick) {
|
void _remove_tick(long tick) {
|
||||||
if (length == 0) {
|
if (length == 0) {
|
||||||
throw new InvalidOperationException("Cannot remove tick because length is 0");
|
throw new InvalidOperationException("Cannot remove tick because length is 0");
|
||||||
}
|
}
|
||||||
@@ -221,7 +248,9 @@ namespace mbts.spark {
|
|||||||
_high_tick--;
|
_high_tick--;
|
||||||
idx = 0;
|
idx = 0;
|
||||||
} else if (tick == low_tick) {
|
} else if (tick == low_tick) {
|
||||||
idx = length - 1;
|
checked {
|
||||||
|
idx = (int)(length - 1);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new ArgumentException(
|
throw new ArgumentException(
|
||||||
$"Can only remove {nameof(low_tick)} ({low_tick}) or " +
|
$"Can only remove {nameof(low_tick)} ({low_tick}) or " +
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ using mbts.ui;
|
|||||||
using mbts.ui.controls;
|
using mbts.ui.controls;
|
||||||
using mbts.ui.utility.text;
|
using mbts.ui.utility.text;
|
||||||
|
|
||||||
|
using Spark.Core;
|
||||||
using Spark.Core.Disposables;
|
using Spark.Core.Disposables;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
@@ -19,6 +20,8 @@ using System.Windows;
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
|
using RegionalTickFactors = user.settings.RegionalTickFactors;
|
||||||
|
|
||||||
static class BadgeRender {
|
static class BadgeRender {
|
||||||
// IMPORTANT: the return values for this method MUST BE IN SYNC with the "format" method, else "measure_height" and "LadderRender.measure_row_height" will be broken.
|
// IMPORTANT: the return values for this method MUST BE IN SYNC with the "format" method, else "measure_height" and "LadderRender.measure_row_height" will be broken.
|
||||||
static int _line_count_for_style(LadderSettings.BadgeStyle badge_style) => badge_style == LadderSettings.BadgeStyle.Alternate ? 2 : 1;
|
static int _line_count_for_style(LadderSettings.BadgeStyle badge_style) => badge_style == LadderSettings.BadgeStyle.Alternate ? 2 : 1;
|
||||||
@@ -73,6 +76,16 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static int index_of(IList<double> prices, double price, IComparer<double> comparer, bool relative_idx) {
|
public static int index_of(IList<double> prices, double price, IComparer<double> comparer, bool relative_idx) {
|
||||||
|
for (int i = 1; i < prices.Count; i++) {
|
||||||
|
Log.assert(prices[i - 1] > prices[i]);
|
||||||
|
var c = comparer.Compare(prices[i - 1], prices[i]);
|
||||||
|
if (c >= 0) {
|
||||||
|
c = comparer.Compare(prices[i - 1], prices[i]);
|
||||||
|
} else {
|
||||||
|
c = comparer.Compare(prices[i - 1], prices[i]);
|
||||||
|
}
|
||||||
|
Log.assert(c < 0);
|
||||||
|
}
|
||||||
var idx = CollectionHelper.binary_search(prices, price, comparer);
|
var idx = CollectionHelper.binary_search(prices, price, comparer);
|
||||||
if (relative_idx && idx < 0) {
|
if (relative_idx && idx < 0) {
|
||||||
idx = ~idx;
|
idx = ~idx;
|
||||||
@@ -95,30 +108,13 @@ namespace mbts.spark {
|
|||||||
settings.font_size, settings.width, row_height, HorizontalAlignment.Right,
|
settings.font_size, settings.width, row_height, HorizontalAlignment.Right,
|
||||||
-4, VerticalAlignment.Center, row * row_height, true);
|
-4, VerticalAlignment.Center, row * row_height, true);
|
||||||
|
|
||||||
public static IList<double> gen_prices(double mid, int row_count, ContractSpecificationImmutable spec) {
|
public static GlyphRun[] format_prices(IList<double> prices, double reference_price, bool format_in_tick_terms, double row_height, LadderColumnSettings settings, GlyphContext glyph_context, RegionalTickFactors spec) {
|
||||||
bool is_odd = row_count % 2 == 1;
|
|
||||||
var result = new double[row_count];
|
|
||||||
int range = row_count / 2;
|
|
||||||
int middle = row_count / 2;
|
|
||||||
result[middle] = mid;
|
|
||||||
double up = mid, down = mid;
|
|
||||||
// Starting from the middle iterate out to the edges
|
|
||||||
for (int x = 1; x <= range; ++x) {
|
|
||||||
up = spec.tickup(up);
|
|
||||||
down = spec.tickdown(down);
|
|
||||||
result[middle - x] = up;
|
|
||||||
result[middle + x] = down;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static GlyphRun[] format_prices(IList<double> prices, double reference_price, bool format_in_tick_terms, double row_height, LadderColumnSettings settings, GlyphContext glyph_context, ContractSpecificationImmutable spec) {
|
|
||||||
var result = new GlyphRun[prices.Count];
|
var result = new GlyphRun[prices.Count];
|
||||||
Parallel.For(0, prices.Count, i =>
|
Parallel.For(0, prices.Count, i =>
|
||||||
result[i] = format_text(spec.format(prices[i] - reference_price, format_in_tick_terms), i, row_height, settings, glyph_context));
|
result[i] = format_text(spec.format(prices[i] - reference_price, format_in_tick_terms), i, row_height, settings, glyph_context));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
public static GlyphRun[] format_prices(IList<double> prices, double row_height, LadderColumnSettings settings, GlyphContext glyph_context, ContractSpecificationImmutable spec, LadderSettings.PriceDisplayFormat price_display_format) {
|
public static GlyphRun[] format_prices(IList<double> prices, double row_height, LadderColumnSettings settings, GlyphContext glyph_context, RegionalTickFactors spec, LadderSettings.PriceDisplayFormat price_display_format) {
|
||||||
var result = new GlyphRun[prices.Count];
|
var result = new GlyphRun[prices.Count];
|
||||||
Parallel.For(0, prices.Count, i =>
|
Parallel.For(0, prices.Count, i =>
|
||||||
result[i] = format_text(spec.format(prices[i]), i, row_height, settings, glyph_context, price_display_format));
|
result[i] = format_text(spec.format(prices[i]), i, row_height, settings, glyph_context, price_display_format));
|
||||||
@@ -143,12 +139,12 @@ namespace mbts.spark {
|
|||||||
bool format_in_tick_terms,
|
bool format_in_tick_terms,
|
||||||
double row_height,
|
double row_height,
|
||||||
LadderColumnSettings settings,
|
LadderColumnSettings settings,
|
||||||
ContractSpecificationImmutable spec) {
|
RegionalTickFactors tick) {
|
||||||
if (price_list.IsNullOrEmpty()) {
|
if (price_list.IsNullOrEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
render_prices(
|
render_prices(
|
||||||
price, glyph_context, price_list, row_height, settings, spec,
|
price, glyph_context, price_list, row_height, settings, tick,
|
||||||
wrt_price, format_in_tick_terms);
|
wrt_price, format_in_tick_terms);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,12 +154,12 @@ namespace mbts.spark {
|
|||||||
IList<double> dprices,
|
IList<double> dprices,
|
||||||
double row_height,
|
double row_height,
|
||||||
LadderColumnSettings settings,
|
LadderColumnSettings settings,
|
||||||
ContractSpecificationImmutable spec,
|
RegionalTickFactors tick,
|
||||||
double wrt_price,
|
double wrt_price,
|
||||||
bool format_in_tick_terms) {
|
bool format_in_tick_terms) {
|
||||||
var foreground = settings.foreground.rgb_brush();
|
var foreground = settings.foreground.rgb_brush();
|
||||||
//var background = new SolidColorBrush(settings.background.rgb_color());
|
//var background = new SolidColorBrush(settings.background.rgb_color());
|
||||||
var fprices = format_prices(dprices, wrt_price, format_in_tick_terms, row_height, settings, glyph_context, spec);
|
var fprices = format_prices(dprices, wrt_price, format_in_tick_terms, row_height, settings, glyph_context, tick);
|
||||||
using (var dc = price.RenderOpen())
|
using (var dc = price.RenderOpen())
|
||||||
using (_draw_with_clip(dc, settings, row_height, dprices.Count)) {
|
using (_draw_with_clip(dc, settings, row_height, dprices.Count)) {
|
||||||
//dc.DrawRectangle(background, null, new Rect(0, 0, settings.width, row_count * row_height));
|
//dc.DrawRectangle(background, null, new Rect(0, 0, settings.width, row_count * row_height));
|
||||||
@@ -178,11 +174,11 @@ namespace mbts.spark {
|
|||||||
IList<double> dprices,
|
IList<double> dprices,
|
||||||
double row_height,
|
double row_height,
|
||||||
LadderColumnSettings settings,
|
LadderColumnSettings settings,
|
||||||
ContractSpecificationImmutable spec,
|
RegionalTickFactors tick,
|
||||||
LadderSettings.PriceDisplayFormat price_display_format) {
|
LadderSettings.PriceDisplayFormat price_display_format) {
|
||||||
var foreground = settings.foreground.rgb_brush();
|
var foreground = settings.foreground.rgb_brush();
|
||||||
//var background = new SolidColorBrush(settings.background.rgb_color());
|
//var background = new SolidColorBrush(settings.background.rgb_color());
|
||||||
var fprices = format_prices(dprices, row_height, settings, glyph_context, spec, price_display_format);
|
var fprices = format_prices(dprices, row_height, settings, glyph_context, tick, price_display_format);
|
||||||
using (var dc = price.RenderOpen())
|
using (var dc = price.RenderOpen())
|
||||||
using (_draw_with_clip(dc, settings, row_height, dprices.Count)) {
|
using (_draw_with_clip(dc, settings, row_height, dprices.Count)) {
|
||||||
//dc.DrawRectangle(background, null, new Rect(0, 0, settings.width, row_count * row_height));
|
//dc.DrawRectangle(background, null, new Rect(0, 0, settings.width, row_count * row_height));
|
||||||
@@ -215,7 +211,7 @@ namespace mbts.spark {
|
|||||||
IList<double> prices,
|
IList<double> prices,
|
||||||
NativePriceSize[] rungs,
|
NativePriceSize[] rungs,
|
||||||
double row_height,
|
double row_height,
|
||||||
ContractSpecificationImmutable spec,
|
RegionalTickFactors spec,
|
||||||
LadderColumnSettings settings,
|
LadderColumnSettings settings,
|
||||||
Func<NativePriceSize, string> fmt,
|
Func<NativePriceSize, string> fmt,
|
||||||
bool lighten_market_cells,
|
bool lighten_market_cells,
|
||||||
@@ -248,17 +244,18 @@ namespace mbts.spark {
|
|||||||
direct_size: aggr.direct_size + rung.direct_size,
|
direct_size: aggr.direct_size + rung.direct_size,
|
||||||
implied_size: aggr.implied_size + rung.implied_size),
|
implied_size: aggr.implied_size + rung.implied_size),
|
||||||
rung => {
|
rung => {
|
||||||
//spec.round_to_tick(rung.price);
|
var ticks = spec.count_ticks(rung.price);
|
||||||
var ticks = spec.full_ticks_from_zero(rung.price);
|
|
||||||
return ticks.HasValue ? spec.tickup(0, ticks.Value) : rung.price;
|
return ticks.HasValue ? spec.tickup(0, ticks.Value) : rung.price;
|
||||||
});
|
});
|
||||||
foreach (var rung in row_tick_groups) {
|
foreach (var rung in row_tick_groups) {
|
||||||
//double price = spec.round_to_tick(rung.price);
|
//double price = spec.round_to_tick(rung.price);
|
||||||
var ticks = spec.full_ticks_from_zero(rung.price);
|
var ticks = spec.count_ticks(rung.price);
|
||||||
var price = ticks.HasValue ? spec.tickup(0, ticks.Value) : rung.price;
|
var price = ticks.HasValue ? spec.tickup(0, ticks.Value) : rung.price;
|
||||||
// prices are in descending order, so get diff from curr_price - price
|
// prices are in descending order, so get diff from curr_price - price
|
||||||
int tick_diff = spec.tickdiff_unchecked(curr_price, price);
|
var tick_diff = spec.tickdiff(curr_price, price).assert_value();
|
||||||
curr_index += tick_diff;
|
checked {
|
||||||
|
curr_index += (int)tick_diff;
|
||||||
|
}
|
||||||
curr_price = price;
|
curr_price = price;
|
||||||
if (curr_index >= 0 && curr_index < prices.Count) {
|
if (curr_index >= 0 && curr_index < prices.Count) {
|
||||||
if (market_cell_background_brush != null)
|
if (market_cell_background_brush != null)
|
||||||
@@ -278,7 +275,7 @@ namespace mbts.spark {
|
|||||||
IList<double> prices,
|
IList<double> prices,
|
||||||
IEnumerable<VolumeAtPriceLevelImmutable> data,
|
IEnumerable<VolumeAtPriceLevelImmutable> data,
|
||||||
double row_height,
|
double row_height,
|
||||||
ContractSpecificationImmutable spec,
|
RegionalTickFactors spec,
|
||||||
VolumeColumnSettings settings,
|
VolumeColumnSettings settings,
|
||||||
int last_index,
|
int last_index,
|
||||||
string last_size_and_direction,
|
string last_size_and_direction,
|
||||||
@@ -371,7 +368,7 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
public delegate void RenderCell<T>(DrawingContext dc, int row, T data_item);
|
public delegate void RenderCell<T>(DrawingContext dc, int row, T data_item);
|
||||||
|
|
||||||
static void _render_cells<T>(DrawingVisual dv, double row_height, IEnumerable<(double price, T value)> data, LadderColumnSettings settings, IList<double> prices, ContractSpecificationImmutable spec, RenderCell<T> render_cell) {
|
static void _render_cells<T>(DrawingVisual dv, double row_height, IEnumerable<(double price, T value)> data, LadderColumnSettings settings, IList<double> prices, RegionalTickFactors spec, RenderCell<T> render_cell) {
|
||||||
using (var dc = dv.RenderOpen())
|
using (var dc = dv.RenderOpen())
|
||||||
using (_draw_with_clip(dc, settings, row_height, prices.Count)) {
|
using (_draw_with_clip(dc, settings, row_height, prices.Count)) {
|
||||||
if (data.is_null_or_empty())
|
if (data.is_null_or_empty())
|
||||||
@@ -382,8 +379,11 @@ namespace mbts.spark {
|
|||||||
if (double.IsNaN(price))
|
if (double.IsNaN(price))
|
||||||
continue;
|
continue;
|
||||||
// prices are in descending order, so get diff from curr_price - price
|
// prices are in descending order, so get diff from curr_price - price
|
||||||
int tick_diff = spec.tickdiff(curr_price, price) ?? 0;
|
var tick_diff = spec.tickdiff(curr_price, price) ?? 0;
|
||||||
curr_index += tick_diff;
|
Log.assert(
|
||||||
|
tick_diff > (int.MaxValue - curr_index),
|
||||||
|
$"Unable to index ladder row for price {price}: tick count exceeds int.MaxValue");
|
||||||
|
curr_index += (int)tick_diff;
|
||||||
curr_price = price;
|
curr_price = price;
|
||||||
if (curr_index >= 0 && curr_index < prices.Count) {
|
if (curr_index >= 0 && curr_index < prices.Count) {
|
||||||
render_cell(dc, curr_index, value);
|
render_cell(dc, curr_index, value);
|
||||||
@@ -409,7 +409,7 @@ namespace mbts.spark {
|
|||||||
IList<double> prices,
|
IList<double> prices,
|
||||||
IEnumerable<(double price, uint piq)> pvp,
|
IEnumerable<(double price, uint piq)> pvp,
|
||||||
double row_height,
|
double row_height,
|
||||||
ContractSpecificationImmutable spec,
|
RegionalTickFactors spec,
|
||||||
LadderColumnSettings settings,
|
LadderColumnSettings settings,
|
||||||
Func<uint, string> fmt_value) {
|
Func<uint, string> fmt_value) {
|
||||||
//
|
//
|
||||||
@@ -425,8 +425,10 @@ namespace mbts.spark {
|
|||||||
foreach (var entry in pvp) {
|
foreach (var entry in pvp) {
|
||||||
double price = entry.price;
|
double price = entry.price;
|
||||||
// prices are in descending order, so get diff from curr_price - price
|
// prices are in descending order, so get diff from curr_price - price
|
||||||
int tick_diff = spec.tickdiff_unchecked(curr_price, price);
|
var tick_diff = spec.tickdiff(curr_price, price).assert_value();
|
||||||
curr_index += tick_diff;
|
checked {
|
||||||
|
curr_index += (int)tick_diff;
|
||||||
|
}
|
||||||
curr_price = price;
|
curr_price = price;
|
||||||
if (curr_index >= 0 && curr_index < prices.Count) {
|
if (curr_index >= 0 && curr_index < prices.Count) {
|
||||||
var gr = format_text(fmt_value(entry.piq), curr_index, row_height, settings, glyph_context);
|
var gr = format_text(fmt_value(entry.piq), curr_index, row_height, settings, glyph_context);
|
||||||
|
|||||||
@@ -31,10 +31,12 @@
|
|||||||
ItemsSource="{Binding rows_view}"
|
ItemsSource="{Binding rows_view}"
|
||||||
MinRowHeight="17"
|
MinRowHeight="17"
|
||||||
RowHeaderWidth="22"
|
RowHeaderWidth="22"
|
||||||
|
Background="{u:BTSColor ManualFills.background}"
|
||||||
>
|
>
|
||||||
<!--Row Header Style-->
|
<!--Row Header Style-->
|
||||||
<DataGrid.RowHeaderStyle>
|
<DataGrid.RowHeaderStyle>
|
||||||
<Style TargetType="DataGridRowHeader">
|
<Style TargetType="DataGridRowHeader">
|
||||||
|
<Setter Property="Background" Value="transparent"/>
|
||||||
<Setter Property="Content" Value="{Binding}"/>
|
<Setter Property="Content" Value="{Binding}"/>
|
||||||
<Setter Property="ContentTemplate">
|
<Setter Property="ContentTemplate">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
@@ -123,8 +125,12 @@
|
|||||||
<!--Row Style-->
|
<!--Row Style-->
|
||||||
<DataGrid.RowStyle>
|
<DataGrid.RowStyle>
|
||||||
<Style TargetType="DataGridRow">
|
<Style TargetType="DataGridRow">
|
||||||
|
<Setter Property="Background" Value="{u:BTSColor Grid.default_row_background}"/>
|
||||||
<Setter Property="IsSelected" Value="{Binding is_selected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
|
<Setter Property="IsSelected" Value="{Binding is_selected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
|
<Trigger Property="DataGridRow.AlternationIndex" Value="1">
|
||||||
|
<Setter Property="Background" Value="{u:BTSColor Grid.alternate_row_background}"/>
|
||||||
|
</Trigger>
|
||||||
<DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="True">
|
<DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="True">
|
||||||
<Setter Property="Background" Value="{StaticResource SelectedRowBackground}"/>
|
<Setter Property="Background" Value="{StaticResource SelectedRowBackground}"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ namespace Spark.Trading {
|
|||||||
meta.Value.Value.PriceDisplay : Security.Defaults.price_display_settingsi;
|
meta.Value.Value.PriceDisplay : Security.Defaults.price_display_settingsi;
|
||||||
if (security.HasValue) {
|
if (security.HasValue) {
|
||||||
rv = rv.with(
|
rv = rv.with(
|
||||||
tick_factors: security.spec_or_default().tick_factors().to_api_tick_factors());
|
tick_factors: security.Value.regional_ticks().low_tick.to_api_tick_factors());
|
||||||
}
|
}
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -769,7 +769,7 @@ namespace mbts.spark {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var price_display = row.contract_spec?.tick_factors()?.to_api_tick_display_settingsi();
|
var price_display = TickUtils.get_tick(row.security, price ?? 0).to_api_tick_display_settingsi();
|
||||||
var update_desc = OrderUtils.update_description(
|
var update_desc = OrderUtils.update_description(
|
||||||
row.order, price, quantity, price_display, row.quantity_display_settings);
|
row.order, price, quantity, price_display, row.quantity_display_settings);
|
||||||
Log.Ui.info(
|
Log.Ui.info(
|
||||||
|
|||||||
@@ -179,8 +179,7 @@ namespace mbts.spark {
|
|||||||
using var _ = detect_property_changes(
|
using var _ = detect_property_changes(
|
||||||
nameof(spec),
|
nameof(spec),
|
||||||
nameof(display_quantity_divisor),
|
nameof(display_quantity_divisor),
|
||||||
nameof(quantity_display),
|
nameof(quantity_display));
|
||||||
nameof(unit_quantity));
|
|
||||||
_security_md = value;
|
_security_md = value;
|
||||||
bbo.security_md = value;
|
bbo.security_md = value;
|
||||||
_payup_bid_cmd.RaiseCanExecuteChanged();
|
_payup_bid_cmd.RaiseCanExecuteChanged();
|
||||||
@@ -210,9 +209,6 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public double unit_quantity =>
|
|
||||||
(security?.ContractSpec)?.tick_factors()?.tick_unit_frac() ?? 1;
|
|
||||||
|
|
||||||
public AlgoDefinitionVM algo_vm { get; }
|
public AlgoDefinitionVM algo_vm { get; }
|
||||||
public IReadOnlyObservableCollection<AlgoParamRowVM> param_rows { get; }
|
public IReadOnlyObservableCollection<AlgoParamRowVM> param_rows { get; }
|
||||||
public BBOVM bbo { get; }
|
public BBOVM bbo { get; }
|
||||||
|
|||||||
@@ -58,5 +58,10 @@ namespace BCG {
|
|||||||
public static UInt32 get_ask_size(BBOPacket md) {
|
public static UInt32 get_ask_size(BBOPacket md) {
|
||||||
return md != null ? md._ask_size : (UInt32)0;
|
return md != null ? md._ask_size : (UInt32)0;
|
||||||
}
|
}
|
||||||
|
public static Tuple<double, UInt32> get_md(BBOPacket md, bool is_bid) {
|
||||||
|
double price = is_bid ? BBOPacket.get_bid_price(md) : BBOPacket.get_ask_price(md);
|
||||||
|
UInt32 sz = is_bid ? BBOPacket.get_bid_size(md) : BBOPacket.get_ask_size(md);
|
||||||
|
return Tuple.Create(price, sz);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -123,6 +123,15 @@ namespace BCG {
|
|||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region Orders
|
||||||
|
[System.ComponentModel.Category("Orders / Algo")]
|
||||||
|
[System.ComponentModel.DisplayName("Default Account")]
|
||||||
|
public string Account { get; set; }
|
||||||
|
[System.ComponentModel.Category("Orders / Algo")]
|
||||||
|
[System.ComponentModel.DisplayName("Default Qty")]
|
||||||
|
public Nullable<double> DefaultQty { get; set; }
|
||||||
|
#endregion
|
||||||
|
|
||||||
public NMSheetSettingLayout() {
|
public NMSheetSettingLayout() {
|
||||||
show_settings_header = false;
|
show_settings_header = false;
|
||||||
show_exp_navigator = false;
|
show_exp_navigator = false;
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ using mbts.spark.filters;
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
using bts.api.orderman;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
public partial class NMSheetControl : UserControl {
|
public partial class NMSheetControl : UserControl {
|
||||||
@@ -555,6 +556,17 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
private void _launch_order_entry_window(NMSheetTheoGrid.GridCell cell,
|
private void _launch_order_entry_window(NMSheetTheoGrid.GridCell cell,
|
||||||
OrderEntryWindow window_type) {
|
OrderEntryWindow window_type) {
|
||||||
|
Func<string, bts.AccountTuple> get_account = (string default_acc) => {
|
||||||
|
string account = _settings.setting_layout.Account;
|
||||||
|
if (String.IsNullOrEmpty(account)) {
|
||||||
|
account = default_acc;
|
||||||
|
}
|
||||||
|
Nullable<uint> id = _get_account_id(account);
|
||||||
|
if (!id.HasValue) {
|
||||||
|
id = 0;
|
||||||
|
}
|
||||||
|
return new bts.AccountTuple(id.Value, account);
|
||||||
|
};
|
||||||
uint key;
|
uint key;
|
||||||
var found = _sheet_data.get_security_key(cell.expiration,
|
var found = _sheet_data.get_security_key(cell.expiration,
|
||||||
cell.strike, cell.call_selected, out key);
|
cell.strike, cell.call_selected, out key);
|
||||||
@@ -566,7 +578,20 @@ namespace BCG {
|
|||||||
if (sc_data.sec_md_map.TryGetValue(key, out var smd)) {
|
if (sc_data.sec_md_map.TryGetValue(key, out var smd)) {
|
||||||
switch (window_type) {
|
switch (window_type) {
|
||||||
case OrderEntryWindow.Ticket:
|
case OrderEntryWindow.Ticket:
|
||||||
_threaded_bb.post(SparkTags.ShowOrderTicketFromSecurityTag, smd);
|
bool is_bid = NMSheetSettingColumnOrganization.get_column_info(cell.col).is_bid;
|
||||||
|
bts.AccountTuple acc_tup = get_account("SMALL");
|
||||||
|
Nullable<double> qty = _settings.setting_layout.DefaultQty;
|
||||||
|
OrderDefinition od = new OrderDefinition() {
|
||||||
|
SecurityKey = smd.id,
|
||||||
|
TimeInForce = TimeInForce.Gtc,
|
||||||
|
Account = acc_tup.name,
|
||||||
|
AccountId = acc_tup.id
|
||||||
|
};
|
||||||
|
BBOPacket bbo = _sheet_data.get_bbo(smd.id);
|
||||||
|
Tuple<double, UInt32> pr_sz = BBOPacket.get_md(bbo, is_bid);
|
||||||
|
UInt32 effective_qty = qty.HasValue ? Convert.ToUInt32(Math.Abs(qty.Value)) : pr_sz.Item2;
|
||||||
|
_threaded_bb.post(SparkTags.ShowOrderTicketTag,
|
||||||
|
(new OrderDefinitionImmutable(od), pr_sz.Item1, effective_qty));
|
||||||
break;
|
break;
|
||||||
case OrderEntryWindow.Ladder:
|
case OrderEntryWindow.Ladder:
|
||||||
_threaded_bb.post(SparkTags.ShowLadderTag, smd);
|
_threaded_bb.post(SparkTags.ShowLadderTag, smd);
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ using System.Reactive.Linq;
|
|||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
|
using RegionalTickFactors = user.settings.RegionalTickFactors;
|
||||||
|
|
||||||
class InlineOrderTicketProperties {
|
class InlineOrderTicketProperties {
|
||||||
public readonly InlineUserProperty<double> price;
|
public readonly InlineUserProperty<double> price;
|
||||||
public readonly InlineUserProperty<double> size;
|
public readonly InlineUserProperty<double> size;
|
||||||
@@ -102,6 +104,7 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
public SecurityImmutable security => _security.Value;
|
public SecurityImmutable security => _security.Value;
|
||||||
public double price { get; set; }
|
public double price { get; set; }
|
||||||
|
public RegionalTickFactors price_tick => security.regional_ticks();
|
||||||
public CalculatorLogic<double> size_calculator { get; }
|
public CalculatorLogic<double> size_calculator { get; }
|
||||||
public double display_quantity_divisor {
|
public double display_quantity_divisor {
|
||||||
get => _display_quantity_divisor;
|
get => _display_quantity_divisor;
|
||||||
|
|||||||
@@ -225,10 +225,7 @@ namespace bts.spark {
|
|||||||
var security = try_get_security(order.Def.SecurityKey);
|
var security = try_get_security(order.Def.SecurityKey);
|
||||||
var change_descs = new List<string>(1);
|
var change_descs = new List<string>(1);
|
||||||
|
|
||||||
TickDisplaySettingsImmutable? price_display =
|
var price_display = TickUtils.get_tick(security, price).to_api_tick_display_settingsi();
|
||||||
security.HasValue && security.Value.HasContractSpec ?
|
|
||||||
security.Value.ContractSpec.tick_factors().to_api_tick_display_settingsi() : null;
|
|
||||||
|
|
||||||
var price_qty_change_desc = OrderUtils.update_description(
|
var price_qty_change_desc = OrderUtils.update_description(
|
||||||
order, price, size, price_display);
|
order, price, size, price_display);
|
||||||
|
|
||||||
|
|||||||
@@ -74,7 +74,7 @@
|
|||||||
<usp:PriceEntryControl
|
<usp:PriceEntryControl
|
||||||
Grid.ColumnSpan="2"
|
Grid.ColumnSpan="2"
|
||||||
usp:OrderModificationControl.IsDirty="{Binding price_dirty, FallbackValue={x:Null}}"
|
usp:OrderModificationControl.IsDirty="{Binding price_dirty, FallbackValue={x:Null}}"
|
||||||
ContractSpec="{Binding security.ContractSpec}"
|
RegionalTick="{Binding price_tick}"
|
||||||
Focusable="false"
|
Focusable="false"
|
||||||
TickDefaultValue="{Binding current_price, Converter={StaticResource TickDefaultPriceConverter}, FallbackValue={u:Double 0}}"
|
TickDefaultValue="{Binding current_price, Converter={StaticResource TickDefaultPriceConverter}, FallbackValue={u:Double 0}}"
|
||||||
Value="{Binding price}"
|
Value="{Binding price}"
|
||||||
|
|||||||
@@ -254,17 +254,14 @@ namespace mbts.spark {
|
|||||||
$"{(order.HasDef ? order.Def.Side.ToString() : "(unknown-side)")} {(order.HasState ? ($@"{spec.format(order.State.Price)} @ {order.State.Quantity}") : "(unknown-price) @ (unknown-quantity)")}";
|
$"{(order.HasDef ? order.Def.Side.ToString() : "(unknown-side)")} {(order.HasState ? ($@"{spec.format(order.State.Price)} @ {order.State.Quantity}") : "(unknown-price) @ (unknown-quantity)")}";
|
||||||
|
|
||||||
public static string short_description(
|
public static string short_description(
|
||||||
SecurityImmutable security, Side side, double price, double quantity) =>
|
SecurityImmutable security, Side side, double price, double quantity) {
|
||||||
new StringBuilderEx(
|
var price_display = TickUtils.get_tick(security, price).to_api_tick_display_settingsi();
|
||||||
|
return new StringBuilderEx(
|
||||||
security.ToString(), " ",
|
security.ToString(), " ",
|
||||||
side.ToString(), " ",
|
side.ToString(), " ",
|
||||||
price_quantity_description(price, quantity, security.spec_or_default())
|
price_quantity_description(price, quantity, price_display)
|
||||||
).ToString();
|
).ToString();
|
||||||
|
}
|
||||||
public static string price_quantity_description(
|
|
||||||
double price, double quantity, ContractSpecificationImmutable spec) =>
|
|
||||||
price_quantity_description(
|
|
||||||
price, quantity, spec.tick_factors().to_api_tick_display_settingsi());
|
|
||||||
|
|
||||||
public static string price_quantity_description(
|
public static string price_quantity_description(
|
||||||
double price,
|
double price,
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ namespace mbts.analytics {
|
|||||||
timer.stop();
|
timer.stop();
|
||||||
Log.Ui.info($"PNLReportCalculator n_pos: {output.position_data.Count()} " +
|
Log.Ui.info($"PNLReportCalculator n_pos: {output.position_data.Count()} " +
|
||||||
$"n_day_trades: {output.day_trades.Count()} time(msecs): {timer.lastIntervalTime}");
|
$"n_day_trades: {output.day_trades.Count()} time(msecs): {timer.lastIntervalTime}");
|
||||||
_log_before_posting(output.position_data);
|
//_log_before_posting(output.position_data);
|
||||||
_bus.post(SparkTags.ReportBlackboardTags.PNL.PNLData, output);
|
_bus.post(SparkTags.ReportBlackboardTags.PNL.PNLData, output);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,21 +115,21 @@ namespace mbts.analytics {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void _handle_nonvol_data(VolSurfaceNonVolData vs_nonvol_data) {
|
private void _handle_nonvol_data(VolSurfaceNonVolData vs_nonvol_data) {
|
||||||
bts.Log.Gen.info(String.Format("SlideReportCalculator._handle_nonvol_data report {0}",
|
// bts.Log.Gen.info(String.Format("SlideReportCalculator._handle_nonvol_data report {0}",
|
||||||
_report.ReportName));
|
// _report.ReportName));
|
||||||
_vs_nonvol_data = vs_nonvol_data;
|
_vs_nonvol_data = vs_nonvol_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _handle_future_prices(
|
private void _handle_future_prices(
|
||||||
IReadOnlyDictionary<SecurityExpiration, FutureTheoStructure> future_prices_map) {
|
IReadOnlyDictionary<SecurityExpiration, FutureTheoStructure> future_prices_map) {
|
||||||
bts.Log.Gen.info(String.Format("SlideReportCalculator._handle_future_prices report {0}",
|
// bts.Log.Gen.Diag(String.Format("SlideReportCalculator._handle_future_prices report {0}",
|
||||||
_report.ReportName));
|
// _report.ReportName));
|
||||||
_future_prices_map = future_prices_map.ToDictionary(kv => kv.Key, kv => kv.Value.theo);
|
_future_prices_map = future_prices_map.ToDictionary(kv => kv.Key, kv => kv.Value.theo);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _handle_trades(IEnumerable<ITradeLogRow> trades) {
|
private void _handle_trades(IEnumerable<ITradeLogRow> trades) {
|
||||||
bts.Log.Gen.info(String.Format("SlideReportCalculator._handle_trades report {0}",
|
// bts.Log.Gen.info(String.Format("SlideReportCalculator._handle_trades report {0}",
|
||||||
_report.ReportName));
|
// _report.ReportName));
|
||||||
_all_trades = trades.Where(t => t.is_active);
|
_all_trades = trades.Where(t => t.is_active);
|
||||||
if (_report.CalcMode == Report.Types.ReportCalculationMode.PositionOrTheoChange) {
|
if (_report.CalcMode == Report.Types.ReportCalculationMode.PositionOrTheoChange) {
|
||||||
_compute_dirty = true;
|
_compute_dirty = true;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0-windows</TargetFramework>
|
<TargetFramework>net7.0-windows</TargetFramework>
|
||||||
<UseWPF>true</UseWPF>
|
<UseWPF>true</UseWPF>
|
||||||
<Authors>Blue Trading Systems</Authors>
|
<Authors>Blue Trading Systems</Authors>
|
||||||
<Company>Blue Trading Systems</Company>
|
<Company>Blue Trading Systems</Company>
|
||||||
@@ -34,7 +34,6 @@
|
|||||||
<PackageReference Include="System.Reactive.Interfaces" Version="5.0.0" />
|
<PackageReference Include="System.Reactive.Interfaces" Version="5.0.0" />
|
||||||
<PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
|
<PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
|
||||||
<PackageReference Include="System.Reactive.PlatformServices" Version="5.0.0" />
|
<PackageReference Include="System.Reactive.PlatformServices" Version="5.0.0" />
|
||||||
<PackageReference Include="System.Runtime.Experimental" Version="6.0.2" />
|
|
||||||
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
||||||
<ProjectReference Include="../spark_api/spark_api.csproj" />
|
<ProjectReference Include="../spark_api/spark_api.csproj" />
|
||||||
<ProjectReference Include="../spark_core/spark_core.csproj" />
|
<ProjectReference Include="../spark_core/spark_core.csproj" />
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ namespace bts.core {
|
|||||||
// TODO: for debugging purposes, remove it later
|
// TODO: for debugging purposes, remove it later
|
||||||
if (tag != mbts.spark.SparkTags.SparkTimer) {
|
if (tag != mbts.spark.SparkTags.SparkTimer) {
|
||||||
var tid = System.Threading.Thread.CurrentThread.ManagedThreadId;
|
var tid = System.Threading.Thread.CurrentThread.ManagedThreadId;
|
||||||
bts.Log.Ui.diag($"SimpleBus.post tag:{tag} tid:{tid}");
|
//bts.Log.Ui.diag($"SimpleBus.post tag:{tag} tid:{tid}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -45,7 +45,7 @@ namespace bts.core {
|
|||||||
|
|
||||||
public IObservable<T> subscribe<T>(ITag<T> tag) {
|
public IObservable<T> subscribe<T>(ITag<T> tag) {
|
||||||
var tid = System.Threading.Thread.CurrentThread.ManagedThreadId;
|
var tid = System.Threading.Thread.CurrentThread.ManagedThreadId;
|
||||||
bts.Log.Ui.info($"SimpleBus.post tag:{tag} tid:{tid}");
|
//bts.Log.Ui.info($"SimpleBus.subscribe tag:{tag} tid:{tid}");
|
||||||
return subject<T>(tag);
|
return subject<T>(tag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -169,7 +169,7 @@ namespace mbts.spark {
|
|||||||
public static ITag<int> CreateHeatmapTag { get; } = _mk_tag<int>();
|
public static ITag<int> CreateHeatmapTag { get; } = _mk_tag<int>();
|
||||||
|
|
||||||
// Publisher: VolSurfaceBlackboardManager
|
// Publisher: VolSurfaceBlackboardManager
|
||||||
// User: VoLSurfaceModule
|
// User: VolSurfaceModule
|
||||||
public static ITag<IDictionary<int, string>> VolSurfaceListTag { get; } =
|
public static ITag<IDictionary<int, string>> VolSurfaceListTag { get; } =
|
||||||
_mk_tag<IDictionary<int, string>>();
|
_mk_tag<IDictionary<int, string>>();
|
||||||
|
|
||||||
@@ -202,11 +202,17 @@ namespace mbts.spark {
|
|||||||
public static ITag<VolSurfaceCalculationRequest> VolSurfaceCalculationRequestTag(int vs_id) =>
|
public static ITag<VolSurfaceCalculationRequest> VolSurfaceCalculationRequestTag(int vs_id) =>
|
||||||
_mk_tag<VolSurfaceCalculationRequest, int>(vs_id);
|
_mk_tag<VolSurfaceCalculationRequest, int>(vs_id);
|
||||||
|
|
||||||
|
public static ITag<VolSurfaceCalculationRequest> VolSurfaceAutoCalculationRequestTag(int vs_id) =>
|
||||||
|
_mk_tag<VolSurfaceCalculationRequest, int>(vs_id);
|
||||||
|
|
||||||
// Publisher : SingleVolSurfaceRequestCalculator
|
// Publisher : SingleVolSurfaceRequestCalculator
|
||||||
// Data : VolSurfaceCalculationResponse
|
// Data : VolSurfaceCalculationResponse
|
||||||
public static ITag<VolSurfaceCalculationResponse> VolSurfaceCalculationResponseTag(int vs_id) =>
|
public static ITag<VolSurfaceCalculationResponse> VolSurfaceCalculationResponseTag(int vs_id) =>
|
||||||
_mk_tag<VolSurfaceCalculationResponse, int>(vs_id);
|
_mk_tag<VolSurfaceCalculationResponse, int>(vs_id);
|
||||||
|
|
||||||
|
public static ITag<VolSurfaceCalculationResponse> VolSurfaceAutoCalculationResponseTag(int vs_id) =>
|
||||||
|
_mk_tag<VolSurfaceCalculationResponse, int>(vs_id);
|
||||||
|
|
||||||
// When the UI intends to save the vol surface (data or input)
|
// When the UI intends to save the vol surface (data or input)
|
||||||
// Publisher: VolSurfaceDisplayModel
|
// Publisher: VolSurfaceDisplayModel
|
||||||
public static ITag<VolSurfaceInput> VolSurfaceCommitTag(int vs_id) =>
|
public static ITag<VolSurfaceInput> VolSurfaceCommitTag(int vs_id) =>
|
||||||
|
|||||||
@@ -591,9 +591,9 @@ namespace mbts.ui {
|
|||||||
|
|
||||||
// Disabled
|
// Disabled
|
||||||
public static BTSColor disabled_border => UI.input_disabled_border;
|
public static BTSColor disabled_border => UI.input_disabled_border;
|
||||||
public static BTSColor disabled_background => UI.input_disabled_background;
|
public static BTSColor disabled_background => Button.disabled_background;
|
||||||
public static BTSColor disabled_foreground => normal_foreground;
|
public static BTSColor disabled_foreground => Button.disabled_foreground;
|
||||||
public static BTSColor disabled_text => normal_text;
|
public static BTSColor disabled_text => Button.disabled_foreground;
|
||||||
public static BTSColor disabled_glyph => normal_glyph;
|
public static BTSColor disabled_glyph => normal_glyph;
|
||||||
public static BTSColor disabled_button_border => BTSCoreColors.transparent;
|
public static BTSColor disabled_button_border => BTSCoreColors.transparent;
|
||||||
public static BTSColor disabled_button_background => BTSCoreColors.transparent;
|
public static BTSColor disabled_button_background => BTSCoreColors.transparent;
|
||||||
@@ -647,8 +647,7 @@ namespace mbts.ui {
|
|||||||
public static BTSColor pressed_editable_button_background => pressed_button_background;
|
public static BTSColor pressed_editable_button_background => pressed_button_background;
|
||||||
public static BTSColor pressed_editable_button_border => pressed_button_border;
|
public static BTSColor pressed_editable_button_border => pressed_button_border;
|
||||||
|
|
||||||
public static BTSColor disabled_editable_background =>
|
public static BTSColor disabled_editable_background => Core.transparent;
|
||||||
editable_background.blend(disabled_background);
|
|
||||||
|
|
||||||
public static BTSColor disabled_editable_border =>
|
public static BTSColor disabled_editable_border =>
|
||||||
editable_border.blend(disabled_border);
|
editable_border.blend(disabled_border);
|
||||||
@@ -1042,6 +1041,21 @@ namespace mbts.ui {
|
|||||||
public static BTSColor foreground => UI.default_text;
|
public static BTSColor foreground => UI.default_text;
|
||||||
public static BTSColor footer_foreground => foreground;
|
public static BTSColor footer_foreground => foreground;
|
||||||
}
|
}
|
||||||
|
public static class ExecutionStrategy {
|
||||||
|
public static BTSColor expander_background => Core.transparent;//Grid.dark_column_background;
|
||||||
|
public static BTSColor expander_foreground => UI.default_text;
|
||||||
|
public static BTSColor data_grid_row_header_background => Core.transparent;
|
||||||
|
public static BTSColor data_grid_row_header_foreground => UI.default_text;
|
||||||
|
public static BTSColor data_grid_background => Grid.default_row_background;
|
||||||
|
public static BTSColor default_column_background => Grid.default_row_background;
|
||||||
|
public static BTSColor alternate_column_background => Grid.alternate_row_background;// 0xff494957;
|
||||||
|
public static BTSColor arrow_background => UI.default_text;
|
||||||
|
public static BTSColor arrow_background_selected => UI.alternate_text;
|
||||||
|
|
||||||
|
}
|
||||||
|
public static class ManualFills {
|
||||||
|
public static BTSColor background => UI.common_background;
|
||||||
|
}
|
||||||
public static class AlgoStudio {
|
public static class AlgoStudio {
|
||||||
public static BTSColor background => UI.default_background;
|
public static BTSColor background => UI.default_background;
|
||||||
public static BTSColor foreground => UI.default_foreground;
|
public static BTSColor foreground => UI.default_foreground;
|
||||||
|
|||||||
@@ -76,6 +76,11 @@
|
|||||||
<Color x:Key="ComboBox.Pressed.Editable.BackgroundColor">#707070</Color>
|
<Color x:Key="ComboBox.Pressed.Editable.BackgroundColor">#707070</Color>
|
||||||
<Color x:Key="ComboBox.Pressed.Editable.Button.BackgroundColor">#FFC4E0FC</Color>
|
<Color x:Key="ComboBox.Pressed.Editable.Button.BackgroundColor">#FFC4E0FC</Color>
|
||||||
|
|
||||||
|
<Color x:Key="ComboBox.Disabled.Editable.BackgroundColor">#FFE5E5E5</Color>
|
||||||
|
<Color x:Key="ComboBox.Disabled.Editable.BorderColor">#FFD9D9D9</Color>
|
||||||
|
<Color x:Key="ComboBox.Disabled.Editable.Button.BackgroundColor">#FFE5E5E5</Color>
|
||||||
|
<Color x:Key="ComboBox.Disabled.Editable.Button.BorderColor">#FFD9D9D9</Color>
|
||||||
|
|
||||||
<SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource ComboBox.Static.BackgroundColor}" />
|
<SolidColorBrush x:Key="ComboBox.Static.Background" Color="{StaticResource ComboBox.Static.BackgroundColor}" />
|
||||||
<SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource ComboBox.Static.ForegroundColor}" />
|
<SolidColorBrush x:Key="ComboBox.Static.Foreground" Color="{StaticResource ComboBox.Static.ForegroundColor}" />
|
||||||
<SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource ComboBox.Static.BorderColor}"/>
|
<SolidColorBrush x:Key="ComboBox.Static.Border" Color="{StaticResource ComboBox.Static.BorderColor}"/>
|
||||||
@@ -98,7 +103,7 @@
|
|||||||
<SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="{StaticResource ComboBoxDisabledBorderColor}"/>
|
<SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="{StaticResource ComboBoxDisabledBorderColor}"/>
|
||||||
<SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="{StaticResource ComboBox.Disabled.Editable.BackgroundColor}" />
|
<SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="{StaticResource ComboBox.Disabled.Editable.BackgroundColor}" />
|
||||||
<SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="{StaticResource ComboBox.Disabled.Editable.BorderColor}" />
|
<SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="{StaticResource ComboBox.Disabled.Editable.BorderColor}" />
|
||||||
<SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="{StaticResource ComboBox.Disabled.Editable.BackgroundColor}" />
|
<SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="{StaticResource ComboBox.Disabled.Editable.Button.BackgroundColor}" />
|
||||||
<SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="{StaticResource ComboBox.Disabled.Editable.Button.BorderColor}" />
|
<SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="{StaticResource ComboBox.Disabled.Editable.Button.BorderColor}" />
|
||||||
<SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="#FF606060"/>
|
<SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="#FF606060"/>
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
<Setter Property="Focusable" Value="False"/>
|
<Setter Property="Focusable" Value="False"/>
|
||||||
<Setter Property="IsTabStop" Value="False"/>
|
<Setter Property="IsTabStop" Value="False"/>
|
||||||
<Setter Property="OverridesDefaultStyle" Value="True"/>
|
<Setter Property="OverridesDefaultStyle" Value="True"/>
|
||||||
<Setter Property="Background" Value="{u:BTSColor ScrollBar.thumb_pressed}"/>
|
<Setter Property="Background" Value="{u:BTSColor UI.ScrollBar.thumb_pressed}"/>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="Thumb">
|
<ControlTemplate TargetType="Thumb">
|
||||||
@@ -224,18 +224,18 @@
|
|||||||
<VisualState Name="Normal"/>
|
<VisualState Name="Normal"/>
|
||||||
<VisualState Name="MouseOver">
|
<VisualState Name="MouseOver">
|
||||||
<Storyboard>
|
<Storyboard>
|
||||||
<ColorAnimation Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="{u:BTSColor ScrollBar.thumb_mouse_over}"/>
|
<ColorAnimation Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="{u:BTSColor UI.ScrollBar.thumb_mouse_over}"/>
|
||||||
</Storyboard>
|
</Storyboard>
|
||||||
</VisualState>
|
</VisualState>
|
||||||
<VisualState Name="Pressed">
|
<VisualState Name="Pressed">
|
||||||
<Storyboard>
|
<Storyboard>
|
||||||
<ColorAnimation Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="{u:BTSColor ScrollBar.thumb_pressed}"/>
|
<ColorAnimation Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="{u:BTSColor UI.ScrollBar.thumb_pressed}"/>
|
||||||
</Storyboard>
|
</Storyboard>
|
||||||
</VisualState>
|
</VisualState>
|
||||||
</VisualStateGroup>
|
</VisualStateGroup>
|
||||||
</VisualStateManager.VisualStateGroups>
|
</VisualStateManager.VisualStateGroups>
|
||||||
<Thumb.Background>
|
<Thumb.Background>
|
||||||
<SolidColorBrush Color="{u:BTSColor ScrollBar.thumb_static}"/>
|
<SolidColorBrush Color="{u:BTSColor UI.ScrollBar.thumb_static}"/>
|
||||||
</Thumb.Background>
|
</Thumb.Background>
|
||||||
</Thumb>
|
</Thumb>
|
||||||
</Track.Thumb>
|
</Track.Thumb>
|
||||||
@@ -380,18 +380,18 @@
|
|||||||
<VisualState Name="Normal"/>
|
<VisualState Name="Normal"/>
|
||||||
<VisualState Name="MouseOver">
|
<VisualState Name="MouseOver">
|
||||||
<Storyboard>
|
<Storyboard>
|
||||||
<ColorAnimation Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="{StaticResource u:BTSColor ScrollBar.thumb_mouse_over}"/>
|
<ColorAnimation Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="{StaticResource u:BTSColor UI.ScrollBar.thumb_mouse_over}"/>
|
||||||
</Storyboard>
|
</Storyboard>
|
||||||
</VisualState>
|
</VisualState>
|
||||||
<VisualState Name="Pressed">
|
<VisualState Name="Pressed">
|
||||||
<Storyboard>
|
<Storyboard>
|
||||||
<ColorAnimation Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="{u:BTSColor ScrollBar.thumb_presseds}"/>
|
<ColorAnimation Storyboard.TargetProperty="Background.Color" BeginTime="0" Duration="0" To="{u:BTSColor UI.ScrollBar.thumb_presseds}"/>
|
||||||
</Storyboard>
|
</Storyboard>
|
||||||
</VisualState>
|
</VisualState>
|
||||||
</VisualStateGroup>
|
</VisualStateGroup>
|
||||||
</VisualStateManager.VisualStateGroups>
|
</VisualStateManager.VisualStateGroups>
|
||||||
<Thumb.Background>
|
<Thumb.Background>
|
||||||
<SolidColorBrush Color="{u:BTSColor ScrollBar.thumb_static}"/>
|
<SolidColorBrush Color="{u:BTSColor UI.ScrollBar.thumb_static}"/>
|
||||||
</Thumb.Background>
|
</Thumb.Background>
|
||||||
</Thumb>
|
</Thumb>
|
||||||
</Track.Thumb>
|
</Track.Thumb>
|
||||||
|
|||||||
@@ -15,12 +15,16 @@ using System.Windows.Controls;
|
|||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
|
|
||||||
namespace mbts.ui.spark {
|
namespace mbts.ui.spark {
|
||||||
|
using RegionalTickFactors = user.settings.RegionalTickFactors;
|
||||||
|
using TickDisplaySettings = user.settings.TickDisplaySettings;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Interaction logic for PriceEntryControl.xaml
|
/// Interaction logic for PriceEntryControl.xaml
|
||||||
/// </summary>
|
/// </summary>
|
||||||
class PriceEntryControl : Control {
|
class PriceEntryControl : Control {
|
||||||
readonly PropertyUpdateGate _price_text_gate = new PropertyUpdateGate();
|
readonly PropertyUpdateGate _price_text_gate = new PropertyUpdateGate();
|
||||||
ContractSpecificationImmutable? _spec;
|
ContractSpecificationImmutable? _spec;
|
||||||
|
RegionalTickFactors _tick;
|
||||||
TextBox _text;
|
TextBox _text;
|
||||||
IDisposable _text_hooks;
|
IDisposable _text_hooks;
|
||||||
double? _raw_value;
|
double? _raw_value;
|
||||||
@@ -53,16 +57,17 @@ namespace mbts.ui.spark {
|
|||||||
(o, v) => o._update_text(v),
|
(o, v) => o._update_text(v),
|
||||||
(o, v) => {
|
(o, v) => {
|
||||||
o._raw_value = v;
|
o._raw_value = v;
|
||||||
if (!o._spec.HasValue || DoubleHelper.IsNaNOrInfinity(v))
|
if ((!o._spec.HasValue && o._tick is null) || DoubleHelper.IsNaNOrInfinity(v))
|
||||||
return v;
|
return v;
|
||||||
// Note: the decimal cast here is important bc double-rounding errors can cause the keyboard text to conflict with poorly rounded result, and negate Tick Up/Down commands.
|
// Note: the decimal cast here is important bc double-rounding errors can cause the keyboard text to conflict with poorly rounded result, and negate Tick Up/Down commands.
|
||||||
// This happens bc the tick up/down commands flush the current text before inc/decrementing.
|
// This happens bc the tick up/down commands flush the current text before inc/decrementing.
|
||||||
double tick = (double)o._spec.Value.round_to_tick((decimal)v);
|
var v_dec = (decimal)v;
|
||||||
if (MathUtils.epsilon_equals(tick, v)) {
|
var rounded = (double)(o._tick?.round_to_tick(v_dec) ?? o._spec.Value.round_to_tick(v_dec));
|
||||||
|
if (MathUtils.epsilon_equals(rounded, v)) {
|
||||||
// this value has already been rounded, don't make it re-enter the CoerceValueCallback delegate.
|
// this value has already been rounded, don't make it re-enter the CoerceValueCallback delegate.
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
return tick;
|
return rounded;
|
||||||
},
|
},
|
||||||
double.NaN);
|
double.NaN);
|
||||||
|
|
||||||
@@ -102,6 +107,26 @@ namespace mbts.ui.spark {
|
|||||||
public ContractSpecificationImmutable? ContractSpec { get => GetValue(ContractSpecProperty) as ContractSpecificationImmutable?; set => SetValue(ContractSpecProperty, value); }
|
public ContractSpecificationImmutable? ContractSpec { get => GetValue(ContractSpecProperty) as ContractSpecificationImmutable?; set => SetValue(ContractSpecProperty, value); }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region RegionalTick
|
||||||
|
public static readonly DependencyProperty RegionalTickProperty =
|
||||||
|
WPFHelper.create_dp<RegionalTickFactors, PriceEntryControl>(
|
||||||
|
nameof(RegionalTick),
|
||||||
|
(o, v) => {
|
||||||
|
o._tick = v;
|
||||||
|
if (o._raw_value.HasValue) {
|
||||||
|
o.SetCurrentValue(ValueProperty, o._raw_value.Value);
|
||||||
|
if (o.AlwaysReformatOnSpecChange)
|
||||||
|
o._update_text();
|
||||||
|
}
|
||||||
|
}, RegionalTickFactors.Default);
|
||||||
|
|
||||||
|
public RegionalTickFactors RegionalTick {
|
||||||
|
get => GetValue(RegionalTickProperty) as RegionalTickFactors;
|
||||||
|
set => SetValue(RegionalTickProperty, value);
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
/// TODO: verify that this control behaves correctly when <see cref="AlwaysReformatOnSpecChange"/> is true (ideally this prop will be removed, and this control will always behave is if the prop is true).
|
/// TODO: verify that this control behaves correctly when <see cref="AlwaysReformatOnSpecChange"/> is true (ideally this prop will be removed, and this control will always behave is if the prop is true).
|
||||||
/// Because this control is ubiquitious in our application, such verification will require careful, meticulous analysis.
|
/// Because this control is ubiquitious in our application, such verification will require careful, meticulous analysis.
|
||||||
/// Until such verification is complete, this boolean property will be used to trigger the behavior, so unsuspecting instances of this control will not be affected.
|
/// Until such verification is complete, this boolean property will be used to trigger the behavior, so unsuspecting instances of this control will not be affected.
|
||||||
@@ -126,6 +151,8 @@ namespace mbts.ui.spark {
|
|||||||
double v = Value;
|
double v = Value;
|
||||||
if (double.IsNaN(v)) {
|
if (double.IsNaN(v)) {
|
||||||
SetCurrentValue(ValueProperty, TickDefaultValue);
|
SetCurrentValue(ValueProperty, TickDefaultValue);
|
||||||
|
} else if (_tick is not null) {
|
||||||
|
SetCurrentValue(ValueProperty, _tick.tickup(v));
|
||||||
} else {
|
} else {
|
||||||
var spec = ContractSpec;
|
var spec = ContractSpec;
|
||||||
if (spec.HasValue) SetCurrentValue(ValueProperty, spec.Value.tickup(v));
|
if (spec.HasValue) SetCurrentValue(ValueProperty, spec.Value.tickup(v));
|
||||||
@@ -137,6 +164,8 @@ namespace mbts.ui.spark {
|
|||||||
double v = Value;
|
double v = Value;
|
||||||
if (double.IsNaN(v)) {
|
if (double.IsNaN(v)) {
|
||||||
SetCurrentValue(ValueProperty, TickDefaultValue);
|
SetCurrentValue(ValueProperty, TickDefaultValue);
|
||||||
|
} else if (_tick is not null) {
|
||||||
|
SetCurrentValue(ValueProperty, _tick.tickdown(v));
|
||||||
} else {
|
} else {
|
||||||
var spec = ContractSpec;
|
var spec = ContractSpec;
|
||||||
if (spec.HasValue) SetCurrentValue(ValueProperty, spec.Value.tickdown(v));
|
if (spec.HasValue) SetCurrentValue(ValueProperty, spec.Value.tickdown(v));
|
||||||
@@ -149,7 +178,15 @@ namespace mbts.ui.spark {
|
|||||||
|
|
||||||
void _update_text(double v) {
|
void _update_text(double v) {
|
||||||
if (_text != null)
|
if (_text != null)
|
||||||
_price_text_gate.try_update(() => _text.Text = _spec.HasValue ? _spec.Value.format(v, double.NaN, false, string.Empty) : v.ToString());
|
_price_text_gate.try_update(() => {
|
||||||
|
if (_tick is not null) {
|
||||||
|
var settings = TickDisplaySettings.Default;
|
||||||
|
settings.tick_factors = _tick.get_tick_for(v);
|
||||||
|
_text.Text = _tick.format(v, settings);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_text.Text = _spec.HasValue ? _spec.Value.format(v, double.NaN, false, string.Empty) : v.ToString();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void _update_value() =>
|
void _update_value() =>
|
||||||
|
|||||||
@@ -485,6 +485,10 @@
|
|||||||
Width="{TemplateBinding Width}"
|
Width="{TemplateBinding Width}"
|
||||||
MinWidth="{TemplateBinding MinWidth}"
|
MinWidth="{TemplateBinding MinWidth}"
|
||||||
MaxWidth="{TemplateBinding MaxWidth}"
|
MaxWidth="{TemplateBinding MaxWidth}"
|
||||||
|
TickUpCommand="{TemplateBinding TickUpCommand}"
|
||||||
|
TickUpCommandParameter="{TemplateBinding TickUpCommandParameter}"
|
||||||
|
TickDownCommand="{TemplateBinding TickDownCommand}"
|
||||||
|
TickDownCommandParameter="{TemplateBinding TickDownCommandParameter}"
|
||||||
>
|
>
|
||||||
<TextBox
|
<TextBox
|
||||||
Name="PART_TextBox"
|
Name="PART_TextBox"
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace mbts.ui.controls {
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
static class TickUpDownHelper {
|
static class TickUpDownHelper {
|
||||||
public const string
|
public const string
|
||||||
@@ -13,7 +14,7 @@ namespace mbts.ui.controls {
|
|||||||
|
|
||||||
public static string? format<T>(
|
public static string? format<T>(
|
||||||
T? new_value, string curr_text, TickDisplaySettingsImmutable? settings = null)
|
T? new_value, string curr_text, TickDisplaySettingsImmutable? settings = null)
|
||||||
where T : struct, IFloatingPoint<T> {
|
where T : struct, IFloatingPointIeee754<T> {
|
||||||
if (T.TryParse(curr_text, null, out var from_text)) {
|
if (T.TryParse(curr_text, null, out var from_text)) {
|
||||||
if (!from_text.Equals(new_value)) {
|
if (!from_text.Equals(new_value)) {
|
||||||
return format(new_value, settings);
|
return format(new_value, settings);
|
||||||
@@ -25,7 +26,7 @@ namespace mbts.ui.controls {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static string format<T>(T? value, TickDisplaySettingsImmutable? settings = null)
|
public static string format<T>(T? value, TickDisplaySettingsImmutable? settings = null)
|
||||||
where T : struct, IFloatingPoint<T> {
|
where T : struct, IFloatingPointIeee754<T> {
|
||||||
if (!value.HasValue) {
|
if (!value.HasValue) {
|
||||||
return string.Empty;
|
return string.Empty;
|
||||||
}
|
}
|
||||||
@@ -39,7 +40,7 @@ namespace mbts.ui.controls {
|
|||||||
string? text,
|
string? text,
|
||||||
[NotNullWhen(true)] out T? result,
|
[NotNullWhen(true)] out T? result,
|
||||||
TickDisplaySettingsImmutable? settings = null
|
TickDisplaySettingsImmutable? settings = null
|
||||||
) where T : IFloatingPoint<T> {
|
) where T : IFloatingPointIeee754<T> {
|
||||||
if (text is null) {
|
if (text is null) {
|
||||||
result = default;
|
result = default;
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#nullable enable
|
#nullable enable
|
||||||
namespace mbts.ui.controls {
|
namespace mbts.ui.controls {
|
||||||
using bts.api.domain;
|
using bts.api.domain;
|
||||||
|
using bts.utils;
|
||||||
|
|
||||||
using mbts.ui.extensions;
|
using mbts.ui.extensions;
|
||||||
using mbts.ui.utilities;
|
using mbts.ui.utilities;
|
||||||
@@ -11,6 +12,7 @@ namespace mbts.ui.controls {
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Numerics;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
@@ -227,6 +229,12 @@ namespace mbts.ui.controls {
|
|||||||
get => _explicit_props.value;
|
get => _explicit_props.value;
|
||||||
set => _explicit_props.value = value;
|
set => _explicit_props.value = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool _has_valid_bounds =>
|
||||||
|
Minimum < Maximum;
|
||||||
|
|
||||||
|
T _default_value =>
|
||||||
|
_has_valid_bounds ? T.Zero.within_range(Minimum, Maximum) : T.Zero;
|
||||||
|
|
||||||
public override void OnApplyTemplate() {
|
public override void OnApplyTemplate() {
|
||||||
Disposable.dispose(ref _text_hooks);
|
Disposable.dispose(ref _text_hooks);
|
||||||
@@ -271,7 +279,7 @@ namespace mbts.ui.controls {
|
|||||||
var v = _value_d;
|
var v = _value_d;
|
||||||
if (!v.HasValue) {
|
if (!v.HasValue) {
|
||||||
if (AllowNullTick) {
|
if (AllowNullTick) {
|
||||||
SetCurrentValue(ValueProperty, T.Zero);
|
SetCurrentValue(ValueProperty, _default_value);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -279,6 +287,10 @@ namespace mbts.ui.controls {
|
|||||||
TickUpDownHelper.nullable_tick_up(v, _increment_d, out var result_d, _maximum_d) :
|
TickUpDownHelper.nullable_tick_up(v, _increment_d, out var result_d, _maximum_d) :
|
||||||
TickUpDownHelper.nullable_tick_down(v, _increment_d, out result_d, _minimum_d)) {
|
TickUpDownHelper.nullable_tick_down(v, _increment_d, out result_d, _minimum_d)) {
|
||||||
var result = NumericCastOutConverter<T>.convert(result_d.assert_value());
|
var result = NumericCastOutConverter<T>.convert(result_d.assert_value());
|
||||||
|
// Enforce min/max bounds (if bounds are valid)
|
||||||
|
if (_has_valid_bounds) {
|
||||||
|
result = result.within_range(Minimum, Maximum);
|
||||||
|
}
|
||||||
SetCurrentValue(ValueProperty, result);
|
SetCurrentValue(ValueProperty, result);
|
||||||
CoerceValue(ValueProperty);
|
CoerceValue(ValueProperty);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,13 +3,14 @@ using System.Collections;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Threading;
|
||||||
using System.Windows.Data;
|
using System.Windows.Data;
|
||||||
|
|
||||||
namespace mbts.ui.converters {
|
namespace mbts.ui.converters {
|
||||||
class DictionaryLookupConverter : IMultiValueConverter {
|
class DictionaryLookupConverter : IMultiValueConverter {
|
||||||
[ThreadStatic]
|
|
||||||
Dictionary<Type, Lookup> _type_impls_backing;
|
Dictionary<Type, Lookup> _type_impls_backing;
|
||||||
Dictionary<Type, Lookup> _type_impls => _type_impls_backing ?? (_type_impls_backing = new Dictionary<Type, Lookup>());
|
Dictionary<Type, Lookup> _type_impls =>
|
||||||
|
Interlocked.CompareExchange(ref _type_impls_backing, new(), null);
|
||||||
|
|
||||||
delegate bool Lookup(object source, object key, out object result);
|
delegate bool Lookup(object source, object key, out object result);
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ using System.Globalization;
|
|||||||
using System.Windows.Data;
|
using System.Windows.Data;
|
||||||
|
|
||||||
namespace mbts.ui.converters {
|
namespace mbts.ui.converters {
|
||||||
|
using RegionalTickFactors = user.settings.RegionalTickFactors;
|
||||||
|
|
||||||
class TickDisplayConverter : IMultiValueConverter {
|
class TickDisplayConverter : IMultiValueConverter {
|
||||||
public static TickDisplayConverter Instance => new();
|
public static TickDisplayConverter Instance => new();
|
||||||
|
|
||||||
@@ -24,10 +26,13 @@ namespace mbts.ui.converters {
|
|||||||
if (values.Length == 2 && values[1] is bts.api.domain.TickDisplaySettingsImmutable tdsi) {
|
if (values.Length == 2 && values[1] is bts.api.domain.TickDisplaySettingsImmutable tdsi) {
|
||||||
return tdsi.to_tick_display_settings().format(price);
|
return tdsi.to_tick_display_settings().format(price);
|
||||||
}
|
}
|
||||||
var spec = get_val<ContractSpecificationImmutable?>(values, 1) ??
|
var spec = get_val<ContractSpecificationImmutable?>(values, 1);
|
||||||
Security.Defaults.ContractSpecificationImmutable;
|
|
||||||
var settings = get_val<mbts.user.settings.TickDisplaySettings>(values, 2);
|
var settings = get_val<mbts.user.settings.TickDisplaySettings>(values, 2);
|
||||||
return spec.format(price, settings);
|
if (spec.HasValue) {
|
||||||
|
return spec.Value.format(price, settings);
|
||||||
|
}
|
||||||
|
var rtick = get_val<RegionalTickFactors>(values, 1) ?? RegionalTickFactors.Default;
|
||||||
|
return rtick.format(price, settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) =>
|
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) =>
|
||||||
|
|||||||
@@ -34,7 +34,8 @@
|
|||||||
</Style>
|
</Style>
|
||||||
<Style x:Key="DisabledPlaceholderComboBox" TargetType="ComboBox">
|
<Style x:Key="DisabledPlaceholderComboBox" TargetType="ComboBox">
|
||||||
<Setter Property="IsEnabled" Value="False"/>
|
<Setter Property="IsEnabled" Value="False"/>
|
||||||
<Setter Property="Foreground" Value="Gray"/>
|
<Setter Property="Foreground" Value="{u:BTSColor UI.ComboBox.disabled_foreground}"/>
|
||||||
|
<Setter Property="Background" Value="{u:BTSColor UI.ComboBox.disabled_button_background}"/>
|
||||||
<Setter Property="SelectedIndex" Value="0"/>
|
<Setter Property="SelectedIndex" Value="0"/>
|
||||||
<Setter Property="ItemsSource">
|
<Setter Property="ItemsSource">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
|
|||||||
@@ -386,9 +386,9 @@
|
|||||||
<ControlTemplate x:Key="DataGridRowDefaultTemplate" TargetType="DataGridRow">
|
<ControlTemplate x:Key="DataGridRowDefaultTemplate" TargetType="DataGridRow">
|
||||||
<Border
|
<Border
|
||||||
x:Name="DGR_Border"
|
x:Name="DGR_Border"
|
||||||
|
Background="{TemplateBinding Background}"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
Background="{TemplateBinding Background}"
|
|
||||||
SnapsToDevicePixels="True">
|
SnapsToDevicePixels="True">
|
||||||
<u:StateManager.Groups>
|
<u:StateManager.Groups>
|
||||||
<u:StateGroupsManager AttachToMembers="True">
|
<u:StateGroupsManager AttachToMembers="True">
|
||||||
@@ -408,7 +408,9 @@
|
|||||||
<Storyboard>
|
<Storyboard>
|
||||||
<ObjectAnimationUsingKeyFrames
|
<ObjectAnimationUsingKeyFrames
|
||||||
Storyboard.TargetName="DGR_Border" Storyboard.TargetProperty="Background">
|
Storyboard.TargetName="DGR_Border" Storyboard.TargetProperty="Background">
|
||||||
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSColor Grid.alternate_row_background}" />
|
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSColor ExecutionStrategy.default_column_background}" />
|
||||||
|
<!-- <DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSColor Core.red}" /> -->
|
||||||
|
<!-- <DiscreteObjectKeyFrame KeyTime="1" Value="{u:BTSColor Core.blue}" /> -->
|
||||||
</ObjectAnimationUsingKeyFrames>
|
</ObjectAnimationUsingKeyFrames>
|
||||||
</Storyboard>
|
</Storyboard>
|
||||||
</VisualState>
|
</VisualState>
|
||||||
@@ -425,7 +427,8 @@
|
|||||||
HeadersVisibility,
|
HeadersVisibility,
|
||||||
ConverterParameter={x:Static DataGridHeadersVisibility.Row},
|
ConverterParameter={x:Static DataGridHeadersVisibility.Row},
|
||||||
Converter={x:Static DataGrid.HeadersVisibilityConverter},
|
Converter={x:Static DataGrid.HeadersVisibilityConverter},
|
||||||
RelativeSource={RelativeSource AncestorType=DataGrid}}" />
|
RelativeSource={RelativeSource AncestorType=DataGrid}}"
|
||||||
|
Background="transparent"/>
|
||||||
<DataGridCellsPresenter
|
<DataGridCellsPresenter
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
ItemsPanel="{TemplateBinding ItemsPanel}"
|
ItemsPanel="{TemplateBinding ItemsPanel}"
|
||||||
@@ -451,7 +454,7 @@
|
|||||||
<Style TargetType="{x:Type DataGrid}">
|
<Style TargetType="{x:Type DataGrid}">
|
||||||
<Setter Property="UseLayoutRounding" Value="True" />
|
<Setter Property="UseLayoutRounding" Value="True" />
|
||||||
<Setter Property="ColumnHeaderStyle" Value="{StaticResource {x:Type DataGridColumnHeader}}" />
|
<Setter Property="ColumnHeaderStyle" Value="{StaticResource {x:Type DataGridColumnHeader}}" />
|
||||||
<Setter Property="Background" Value="{uc:BTSColor Name=UI.default_background}" />
|
<Setter Property="Background" Value="{uc:BTSColor Name=Core.transparent}" />
|
||||||
<Setter Property="AlternationCount" Value="2" />
|
<Setter Property="AlternationCount" Value="2" />
|
||||||
<Setter Property="RowStyle" Value="{StaticResource {x:Type DataGridRow}}" />
|
<Setter Property="RowStyle" Value="{StaticResource {x:Type DataGridRow}}" />
|
||||||
<Setter Property="AutoGenerateColumns" Value="False" />
|
<Setter Property="AutoGenerateColumns" Value="False" />
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
using Spark.Core.Disposables;
|
using Spark.Core.Disposables;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Numerics;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ using Spark.Core.Disposables;
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Numerics;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
|
|
||||||
namespace mbts.ui {
|
namespace mbts.ui {
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
#nullable enable
|
#nullable enable
|
||||||
namespace mbts {
|
namespace mbts {
|
||||||
|
using bts;
|
||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.api.domain;
|
using bts.api.domain;
|
||||||
|
using bts.utils;
|
||||||
|
|
||||||
using mbts.co2;
|
using mbts.co2;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
public readonly struct SecurityMD : IEquatable<SecurityMD> {
|
public readonly struct SecurityMD : IEquatable<SecurityMD> {
|
||||||
public static readonly Func<SecurityMD, uint> key_fn = smd => smd.security.Id;
|
public static readonly Func<SecurityMD, uint> key_fn = smd => smd.security.Id;
|
||||||
@@ -14,21 +19,28 @@ namespace mbts {
|
|||||||
SecurityImmutable security,
|
SecurityImmutable security,
|
||||||
IMDConsumerHandle md,
|
IMDConsumerHandle md,
|
||||||
TickDisplaySettingsImmutable? price_display = null,
|
TickDisplaySettingsImmutable? price_display = null,
|
||||||
TickDisplaySettingsImmutable? quantity_display = null) {
|
TickDisplaySettingsImmutable? quantity_display = null,
|
||||||
|
IEnumerable<TickDisplayRuleImmutable>? price_display_rules = null) {
|
||||||
this.security = security;
|
this.security = security;
|
||||||
this.md = md;
|
this.md = md;
|
||||||
this.price_display = price_display ?? Security.Defaults.price_display_settingsi;
|
this.price_display = price_display ?? Security.Defaults.price_display_settingsi;
|
||||||
this.quantity_display = quantity_display ??
|
this.quantity_display = quantity_display ??
|
||||||
Security.Defaults.quantity_display_settingsi;
|
Security.Defaults.quantity_display_settingsi;
|
||||||
unit_quantity = 1;
|
this.price_display_rules = price_display_rules
|
||||||
|
.empty_if_null()
|
||||||
|
.OrderBy(r => r.MaxValue)
|
||||||
|
.ToImmutableList();
|
||||||
|
// Validate new 'price rules' config (be strict...this is a hotfix to prod)
|
||||||
|
Log.assert(this.price_display_rules.All(r => r.MaxValue.is_real()));
|
||||||
|
Log.assert(this.price_display_rules.Select(r => r.MaxValue).IsDistinct());
|
||||||
}
|
}
|
||||||
|
|
||||||
public SecurityImmutable security { get; }
|
public SecurityImmutable security { get; }
|
||||||
public uint id => security.Id;
|
public uint id => security.Id;
|
||||||
public IMDConsumerHandle md { get; }
|
public IMDConsumerHandle md { get; }
|
||||||
public double unit_quantity { get; }
|
|
||||||
public TickDisplaySettingsImmutable price_display { get; }
|
public TickDisplaySettingsImmutable price_display { get; }
|
||||||
public TickDisplaySettingsImmutable quantity_display { get; }
|
public TickDisplaySettingsImmutable quantity_display { get; }
|
||||||
|
public ImmutableList<TickDisplayRuleImmutable> price_display_rules { get; }
|
||||||
|
|
||||||
public override int GetHashCode() =>
|
public override int GetHashCode() =>
|
||||||
(int)security.Id;
|
(int)security.Id;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace Spark.Core.Data {
|
|||||||
using bts;
|
using bts;
|
||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.api.domain;
|
using bts.api.domain;
|
||||||
|
using bts.collections;
|
||||||
|
|
||||||
using mbts;
|
using mbts;
|
||||||
using mbts.config;
|
using mbts.config;
|
||||||
@@ -55,7 +56,21 @@ namespace Spark.Core.Data {
|
|||||||
}
|
}
|
||||||
// Can't possibly be null (the delegate above already checked for this)
|
// Can't possibly be null (the delegate above already checked for this)
|
||||||
raw_meta = Log.notnull(raw_meta);
|
raw_meta = Log.notnull(raw_meta);
|
||||||
return convert_raw_metadata(raw_meta);
|
var meta = convert_raw_metadata(raw_meta);
|
||||||
|
if (sec.ContractCase == Security.ContractOneofCase.Spread
|
||||||
|
&& meta.HasValue
|
||||||
|
&& meta.Value.PriceRules.AtLeast(2)) {
|
||||||
|
// This is a hack to force Deribit Combos to have uniform ticks
|
||||||
|
var rules = meta.Value.PriceRules
|
||||||
|
.Where(r => r.HasTickDisplay && r.TickDisplay.HasTickFactors);
|
||||||
|
if (rules.TryGetMinElement(
|
||||||
|
r => r.TickDisplay.TickFactors.tick_unit_frac(), out var min_tick_rule)) {
|
||||||
|
var mutable_meta = meta.Value.CloneToMutable();
|
||||||
|
mutable_meta.PriceRules.SetItems(new[] { min_tick_rule.CloneToMutable() });
|
||||||
|
meta = mutable_meta.immutable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return meta;
|
||||||
});
|
});
|
||||||
|
|
||||||
SecurityMetadataImmutable? convert_raw_metadata(SecurityMetadataItem raw_meta) {
|
SecurityMetadataImmutable? convert_raw_metadata(SecurityMetadataItem raw_meta) {
|
||||||
@@ -66,8 +81,8 @@ namespace Spark.Core.Data {
|
|||||||
/// Don't mutate the actual object stored in <see cref="_security_metadata"/>
|
/// Don't mutate the actual object stored in <see cref="_security_metadata"/>
|
||||||
var meta = raw_meta.Value.Clone();
|
var meta = raw_meta.Value.Clone();
|
||||||
meta.PriceDisplay ??= Security.Defaults.price_display_settings;
|
meta.PriceDisplay ??= Security.Defaults.price_display_settings;
|
||||||
meta.PriceDisplay.TickFactors = sec.spec_or_default()
|
// meta.PriceDisplay.TickFactors = sec.spec_or_default()
|
||||||
.tick_factors().to_api_tick_factorsi().CloneToMutable();
|
// .tick_factors().to_api_tick_factorsi().CloneToMutable();
|
||||||
return new(meta);
|
return new(meta);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,9 @@ namespace mbts.user.settings {
|
|||||||
_low_tick_inclusive_end = low_tick_inclusive_end;
|
_low_tick_inclusive_end = low_tick_inclusive_end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static RegionalTickFactors Default =>
|
||||||
|
new(new(10000, 1), new(10000, 1), double.MaxValue);
|
||||||
|
|
||||||
public TickFactors low_tick => _low_tick;
|
public TickFactors low_tick => _low_tick;
|
||||||
public TickFactors high_tick => _high_tick;
|
public TickFactors high_tick => _high_tick;
|
||||||
public double low_tick_inclusive_end => _low_tick_inclusive_end;
|
public double low_tick_inclusive_end => _low_tick_inclusive_end;
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ namespace mbts {
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
public static class TickExtensions {
|
public static class TickExtensions {
|
||||||
static string _nan_text => TickDisplaySettings.Default.nan_text;
|
static string _nan_text => TickDisplaySettings.Default.nan_text;
|
||||||
@@ -54,9 +55,16 @@ namespace mbts {
|
|||||||
this TickFactors tick_factors) =>
|
this TickFactors tick_factors) =>
|
||||||
new(tick_factors.to_api_tick_display_settings());
|
new(tick_factors.to_api_tick_display_settings());
|
||||||
|
|
||||||
public static bool is_valid(this TickFactors tick) =>
|
public static bool is_valid(this TickFactors tick) {
|
||||||
(tick.tick_unit > 0 && tick.tick_unit <= (tick.tick_base * 0.5)) ||
|
if (!tick.tick_unit.is_real_positive() && !tick.tick_base.is_real_positive()) {
|
||||||
tick.tick_unit == tick.tick_base;
|
return false;
|
||||||
|
}
|
||||||
|
var ticks_per_base = tick.tick_base / tick.tick_unit;
|
||||||
|
if (ticks_per_base.is_int()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return tick.tick_unit > tick.tick_base && tick.tick_base == 1;
|
||||||
|
}
|
||||||
|
|
||||||
public static bool is_valid(this RegionalTickFactors regional_tick) =>
|
public static bool is_valid(this RegionalTickFactors regional_tick) =>
|
||||||
regional_tick.low_tick.is_valid() && regional_tick.high_tick.is_valid();
|
regional_tick.low_tick.is_valid() && regional_tick.high_tick.is_valid();
|
||||||
@@ -64,6 +72,10 @@ namespace mbts {
|
|||||||
public static bool is_integer(this TickFactors tick) =>
|
public static bool is_integer(this TickFactors tick) =>
|
||||||
tick.tick_unit == tick.tick_base;
|
tick.tick_unit == tick.tick_base;
|
||||||
|
|
||||||
|
public static TickFactors tick_factors(this RegionalTickFactors regional_tick, double value) =>
|
||||||
|
value > regional_tick.low_tick_inclusive_end ?
|
||||||
|
regional_tick.high_tick : regional_tick.low_tick;
|
||||||
|
|
||||||
public static double tick_unit_frac(this TickFactors tick) =>
|
public static double tick_unit_frac(this TickFactors tick) =>
|
||||||
tick.tick_unit / tick.tick_base;
|
tick.tick_unit / tick.tick_base;
|
||||||
|
|
||||||
@@ -75,6 +87,21 @@ namespace mbts {
|
|||||||
|
|
||||||
public static double reduced_base(this TickFactors tick) => MathUtils.factor_out(tick.tick_base, 10);
|
public static double reduced_base(this TickFactors tick) => MathUtils.factor_out(tick.tick_base, 10);
|
||||||
|
|
||||||
|
public static bool tick_equals(this RegionalTickFactors regional_tick, double x, double y) {
|
||||||
|
if (x.is_nan()) {
|
||||||
|
return y.is_nan();
|
||||||
|
}
|
||||||
|
if (y.is_nan()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
var xtick = regional_tick.tick_factors(x);
|
||||||
|
var ytick = regional_tick.tick_factors(y);
|
||||||
|
return xtick is not null
|
||||||
|
&& ytick is not null
|
||||||
|
&& xtick.Equals(ytick)
|
||||||
|
&& xtick.tick_equals(x, y);
|
||||||
|
}
|
||||||
|
|
||||||
public static bool tick_equals(this TickFactors tick, double x, double y) {
|
public static bool tick_equals(this TickFactors tick, double x, double y) {
|
||||||
if (x.is_nan()) {
|
if (x.is_nan()) {
|
||||||
return y.is_nan();
|
return y.is_nan();
|
||||||
@@ -91,38 +118,46 @@ namespace mbts {
|
|||||||
}
|
}
|
||||||
var x_units = MathUtils.round_fractional_units(x, tick.tick_unit_frac<T>());
|
var x_units = MathUtils.round_fractional_units(x, tick.tick_unit_frac<T>());
|
||||||
var y_units = MathUtils.round_fractional_units(y, tick.tick_unit_frac<T>());
|
var y_units = MathUtils.round_fractional_units(y, tick.tick_unit_frac<T>());
|
||||||
return NumericCastConverter<T, int>.convert(x_units) ==
|
return NumericCastConverter<T, long>.convert(x_units) ==
|
||||||
NumericCastConverter<T, int>.convert(y_units);
|
NumericCastConverter<T, long>.convert(y_units);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IEqualityComparer<T> tick_equality_comparer<T>(this TickFactors tick)
|
public static IEqualityComparer<T> tick_equality_comparer<T>(this TickFactors tick)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPoint<T> =>
|
||||||
EqualityComparer.Create<T>(
|
EqualityComparer.Create<T>(
|
||||||
(a, b) => tick_equals(tick, a, b),
|
(a, b) => tick_equals(tick, a, b),
|
||||||
x => NumericCastConverter<T, int>.convert(MathUtils.round_fractional_units(x, tick.tick_unit_frac<T>())));
|
x => NumericCastConverter<T, int>.convert(
|
||||||
|
MathUtils.round_fractional_units(x, tick.tick_unit_frac<T>())));
|
||||||
|
|
||||||
public static IEqualityComparer<double> tick_equality_comparer(this TickFactors tick) =>
|
public static IEqualityComparer<double> tick_equality_comparer(this TickFactors tick) =>
|
||||||
EqualityComparer.Create<double>(
|
EqualityComparer.Create<double>(
|
||||||
(a, b) => tick_equals(tick, a, b),
|
(a, b) => tick_equals(tick, a, b),
|
||||||
x => (int)MathUtils.round_fractional_units(x, tick.tick_unit_frac()));
|
x => (int)MathUtils.round_fractional_units(x, tick.tick_unit_frac()));
|
||||||
|
|
||||||
|
public static TickFactors get_tick_for(this RegionalTickFactors rtick, double value) =>
|
||||||
|
value > rtick.low_tick_inclusive_end ? rtick.high_tick : rtick.low_tick;
|
||||||
|
|
||||||
public static string format_without_decimal_part(this TickFactors tick, double value) =>
|
public static string format_without_decimal_part(this TickFactors tick, double value) =>
|
||||||
format(tick, value, double.NaN, false, _nan_text, true);
|
format(tick, value, double.NaN, false, _nan_text, true);
|
||||||
|
|
||||||
public static string format<T>(this TickFactors tick, T value) where T : IFloatingPoint<T> =>
|
public static string format<T>(this TickFactors tick, T value) where T : IFloatingPointIeee754<T> =>
|
||||||
format(tick, value, T.NaN, false, _nan_text);
|
format(tick, value, T.NaN, false, _nan_text);
|
||||||
|
|
||||||
|
public static string format<T>(this RegionalTickFactors regional_tick, T value, bool show_commas)
|
||||||
|
where T : IFloatingPointIeee754<T> =>
|
||||||
|
format(regional_tick, value, T.NaN, show_commas, _nan_text);
|
||||||
|
|
||||||
public static string format<T>(this TickFactors tick, T value, bool show_commas)
|
public static string format<T>(this TickFactors tick, T value, bool show_commas)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
format(tick, value, T.NaN, show_commas, _nan_text);
|
format(tick, value, T.NaN, show_commas, _nan_text);
|
||||||
|
|
||||||
public static string format<T>(this TickDisplaySettings settings, T value)
|
public static string format<T>(this TickDisplaySettings settings, T value)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
format(settings.tick_factors, value, settings);
|
format(settings.tick_factors, value, settings);
|
||||||
|
|
||||||
public static string format<T>(
|
public static string format<T>(
|
||||||
this bts.api.domain.TickDisplaySettingsImmutable settings, T value)
|
this bts.api.domain.TickDisplaySettingsImmutable settings, T value)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
settings.to_tick_display_settings().format(value);
|
settings.to_tick_display_settings().format(value);
|
||||||
|
|
||||||
public static string format<T>(this TickFactors tick, T value, TickDisplaySettings settings)
|
public static string format<T>(this TickFactors tick, T value, TickDisplaySettings settings)
|
||||||
@@ -142,6 +177,19 @@ namespace mbts {
|
|||||||
value, settings.display_multiplier.as_type<double, T>(), settings.show_commas);
|
value, settings.display_multiplier.as_type<double, T>(), settings.show_commas);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string format<T>(
|
||||||
|
this RegionalTickFactors regional_tick,
|
||||||
|
T value,
|
||||||
|
T display_multiplier,
|
||||||
|
bool show_commas,
|
||||||
|
string nan_text,
|
||||||
|
bool show_decimal_part = true
|
||||||
|
) where T : IFloatingPointIeee754<T> {
|
||||||
|
var value_d = NumericCastConverter<T, double>.convert(value);
|
||||||
|
return regional_tick.tick_factors(value_d)
|
||||||
|
.format(value, display_multiplier, show_commas, nan_text, show_decimal_part);
|
||||||
|
}
|
||||||
|
|
||||||
public static string format<T>(
|
public static string format<T>(
|
||||||
this TickFactors tick,
|
this TickFactors tick,
|
||||||
T value,
|
T value,
|
||||||
@@ -149,7 +197,7 @@ namespace mbts {
|
|||||||
bool show_commas,
|
bool show_commas,
|
||||||
string nan_text,
|
string nan_text,
|
||||||
bool show_decimal_part = true)
|
bool show_decimal_part = true)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
tick.format(
|
tick.format(
|
||||||
value,
|
value,
|
||||||
TickDisplaySettings.Default.with(
|
TickDisplaySettings.Default.with(
|
||||||
@@ -196,7 +244,7 @@ namespace mbts {
|
|||||||
parse(display_settings.tick_factors, text, display_settings);
|
parse(display_settings.tick_factors, text, display_settings);
|
||||||
|
|
||||||
public static T parse<T>(this TickDisplaySettings display_settings, string text)
|
public static T parse<T>(this TickDisplaySettings display_settings, string text)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
parse<T>(display_settings.tick_factors, text, display_settings);
|
parse<T>(display_settings.tick_factors, text, display_settings);
|
||||||
#nullable disable
|
#nullable disable
|
||||||
|
|
||||||
@@ -204,7 +252,7 @@ namespace mbts {
|
|||||||
parse<double>(tick, text, display_settings);
|
parse<double>(tick, text, display_settings);
|
||||||
|
|
||||||
public static T parse<T>(this TickFactors tick, string text, TickDisplaySettings display_settings)
|
public static T parse<T>(this TickFactors tick, string text, TickDisplaySettings display_settings)
|
||||||
where T : IFloatingPoint<T> {
|
where T : IFloatingPointIeee754<T> {
|
||||||
if (display_settings is null) {
|
if (display_settings is null) {
|
||||||
return parse(tick, text, T.NaN, _nan_text);
|
return parse(tick, text, T.NaN, _nan_text);
|
||||||
}
|
}
|
||||||
@@ -213,7 +261,9 @@ namespace mbts {
|
|||||||
return parse(tick, text, display_multiplier, nan_text);
|
return parse(tick, text, display_multiplier, nan_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static T parse<T>(this TickFactors tick, string text, T display_multiplier, string nan_text) where T : IFloatingPoint<T> =>
|
public static T parse<T>(
|
||||||
|
this TickFactors tick, string text, T display_multiplier, string nan_text)
|
||||||
|
where T : IFloatingPointIeee754<T> =>
|
||||||
tick?.is_valid() ?? false ?
|
tick?.is_valid() ?? false ?
|
||||||
_parse(tick, text, display_multiplier, nan_text) :
|
_parse(tick, text, display_multiplier, nan_text) :
|
||||||
_parse_no_tick(text, display_multiplier, nan_text);
|
_parse_no_tick(text, display_multiplier, nan_text);
|
||||||
@@ -223,38 +273,49 @@ namespace mbts {
|
|||||||
string text,
|
string text,
|
||||||
T display_multiplier,
|
T display_multiplier,
|
||||||
string nan_text
|
string nan_text
|
||||||
) where T : IFloatingPoint<T> =>
|
) where T : IFloatingPointIeee754<T> =>
|
||||||
regional_tick.is_valid() ?
|
regional_tick.is_valid() ?
|
||||||
_parse(regional_tick, text, display_multiplier, nan_text) :
|
_parse(regional_tick, text, display_multiplier, nan_text) :
|
||||||
_parse_no_tick(text, display_multiplier, nan_text);
|
_parse_no_tick(text, display_multiplier, nan_text);
|
||||||
|
|
||||||
public static T tick<T>(this TickFactors tick, T value, int count)
|
public static T tick<T>(this TickFactors tick, T value, long count)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
count < 0 ? tick.tickdown(value, (uint)-count) : tick.tickup(value, (uint)count);
|
count < 0 ? tick.tickdown(value, (uint)-count) : tick.tickup(value, (ulong)count);
|
||||||
|
|
||||||
public static T tick<T>(this bts.api.domain.TickFactorsImmutable tick, T value, int count)
|
public static T tick<T>(this bts.api.domain.TickFactorsImmutable tick, T value, long count)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
tick.to_tick_factors().tick(value, count);
|
tick.to_tick_factors().tick(value, count);
|
||||||
|
|
||||||
public static T tick<T>(
|
public static T tick<T>(
|
||||||
this bts.api.domain.TickDisplaySettingsImmutable settings, T value, int count)
|
this bts.api.domain.TickDisplaySettingsImmutable settings, T value, long count)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
settings.HasTickFactors ?
|
settings.HasTickFactors ?
|
||||||
settings.TickFactors.tick(value, count) :
|
settings.TickFactors.tick(value, count) :
|
||||||
throw new ArgumentException(
|
throw new ArgumentException(
|
||||||
"Can't tick because 'settings.HasTickFactors' is false", nameof(settings));
|
"Can't tick because 'settings.HasTickFactors' is false", nameof(settings));
|
||||||
|
|
||||||
public static T tickup<T>(this TickFactors tick, T input, uint count = 1)
|
public static double tick(
|
||||||
where T : IFloatingPoint<T> =>
|
this RegionalTickFactors regional_tick, double input, long count) =>
|
||||||
|
tick<double>(regional_tick, input, count);
|
||||||
|
|
||||||
|
public static T tick<T>(
|
||||||
|
this RegionalTickFactors regional_tick, T input, long count)
|
||||||
|
where T : IFloatingPointIeee754<T> =>
|
||||||
|
count > 0 ?
|
||||||
|
tickup(regional_tick, input, (ulong)count) :
|
||||||
|
tickdown(regional_tick, input, (ulong)-count);
|
||||||
|
|
||||||
|
public static T tickup<T>(this TickFactors tick, T input, ulong count = 1)
|
||||||
|
where T : IFloatingPointIeee754<T> =>
|
||||||
tickup(tick, input, count, TickUtils.precision_const<T>());
|
tickup(tick, input, count, TickUtils.precision_const<T>());
|
||||||
|
|
||||||
public static T tickup<T>(this TickFactors tick, T input, uint count, T precision)
|
public static T tickup<T>(this TickFactors tick, T input, ulong count, T precision)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
tickup<T, NumericCastOutConverter<T>>(tick, input, count, precision);
|
tickup<T, NumericCastOutConverter<T>>(tick, input, count, precision);
|
||||||
|
|
||||||
public static T tickup<T, TFromUInt32>(this TickFactors tick, T input, uint count, T precision)
|
public static T tickup<T, TFromUInt64>(this TickFactors tick, T input, ulong count, T precision)
|
||||||
where T : IFloatingPoint<T>
|
where T : IFloatingPointIeee754<T>
|
||||||
where TFromUInt32 : IConverter<uint, T> {
|
where TFromUInt64 : IConverter<ulong, T> {
|
||||||
if (!precision.is_real_positive()) {
|
if (!precision.is_real_positive()) {
|
||||||
throw new ArgumentException("Must be a real positive number.", nameof(precision));
|
throw new ArgumentException("Must be a real positive number.", nameof(precision));
|
||||||
}
|
}
|
||||||
@@ -262,24 +323,39 @@ namespace mbts {
|
|||||||
return input;
|
return input;
|
||||||
}
|
}
|
||||||
var tuf = tick.tick_unit_frac<T>();
|
var tuf = tick.tick_unit_frac<T>();
|
||||||
var ieeer = T.IEEERemainder(input, tuf);
|
var ieeer = T.Ieee754Remainder(input, tuf);
|
||||||
input -= ieeer;
|
input -= ieeer;
|
||||||
if (ieeer < -precision) {
|
if (ieeer < -precision) {
|
||||||
count--;
|
count--;
|
||||||
}
|
}
|
||||||
var result = input + tuf * TFromUInt32.convert(count);
|
var result = input + tuf * TFromUInt64.convert(count);
|
||||||
return _round_tick(tuf, result);
|
return _round_tick(tuf, result);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static T tickup<T>(this RegionalTickFactors regional_tick, T input) where T : IFloatingPoint<T> =>
|
public static double tickup(
|
||||||
|
this RegionalTickFactors regional_tick, double input, long count = 1) =>
|
||||||
|
count switch {
|
||||||
|
> 0 => tickup<double>(regional_tick, input, (ulong)count),
|
||||||
|
< 0 => tickdown<double>(regional_tick, input, (ulong)-count),
|
||||||
|
0 => input,
|
||||||
|
};
|
||||||
|
|
||||||
|
public static double tickup(
|
||||||
|
this RegionalTickFactors regional_tick, double input, ulong count) =>
|
||||||
|
tickup<double>(regional_tick, input, count);
|
||||||
|
|
||||||
|
public static T tickup<T>(
|
||||||
|
this RegionalTickFactors regional_tick, T input) where T : IFloatingPointIeee754<T> =>
|
||||||
regional_tick.tickup(input, 1);
|
regional_tick.tickup(input, 1);
|
||||||
|
|
||||||
public static T tickup<T>(this RegionalTickFactors regional_tick, T input, uint count) where T : IFloatingPoint<T> =>
|
public static T tickup<T>(
|
||||||
|
this RegionalTickFactors regional_tick, T input, ulong count)
|
||||||
|
where T : IFloatingPointIeee754<T> =>
|
||||||
regional_tick.tickup(input, count, TickUtils.precision_const<T>());
|
regional_tick.tickup(input, count, TickUtils.precision_const<T>());
|
||||||
|
|
||||||
public static T tickup<T>(
|
public static T tickup<T>(
|
||||||
this RegionalTickFactors regional_tick, T input, uint count, T precision)
|
this RegionalTickFactors regional_tick, T input, ulong count, T precision)
|
||||||
where T : IFloatingPoint<T> {
|
where T : IFloatingPointIeee754<T> {
|
||||||
if (!precision.is_real_positive()) {
|
if (!precision.is_real_positive()) {
|
||||||
throw new ArgumentException("Must be a real positive number.", nameof(precision));
|
throw new ArgumentException("Must be a real positive number.", nameof(precision));
|
||||||
}
|
}
|
||||||
@@ -292,68 +368,81 @@ namespace mbts {
|
|||||||
T ltie = regional_tick.low_tick_inclusive_end.as_type<double, T>();
|
T ltie = regional_tick.low_tick_inclusive_end.as_type<double, T>();
|
||||||
if (input < ltie) {
|
if (input < ltie) {
|
||||||
tuf = regional_tick.low_tick.tick_unit_frac<T>();
|
tuf = regional_tick.low_tick.tick_unit_frac<T>();
|
||||||
var ieeer = T.IEEERemainder(input, tuf);
|
var ieeer = T.Ieee754Remainder(input, tuf);
|
||||||
input -= ieeer;
|
input -= ieeer;
|
||||||
if (ieeer < -precision) count--;
|
if (ieeer < -precision) count--;
|
||||||
val = input + tuf * count.as_type<uint, T>();
|
val = input + tuf * count.as_type<ulong, T>();
|
||||||
if (val > ltie) {
|
if (val > ltie) {
|
||||||
count -= MathUtils.round_up((ltie - input) / tuf, precision).as_type<T, uint>();
|
count -= MathUtils.round_up((ltie - input) / tuf, precision).as_type<T, ulong>();
|
||||||
tuf = regional_tick.high_tick.tick_unit_frac<T>();
|
tuf = regional_tick.high_tick.tick_unit_frac<T>();
|
||||||
val = ltie + tuf * count.as_type<uint, T>();
|
val = ltie + tuf * count.as_type<ulong, T>();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
tuf = regional_tick.high_tick.tick_unit_frac<T>();
|
tuf = regional_tick.high_tick.tick_unit_frac<T>();
|
||||||
var ieeer = T.IEEERemainder(input, tuf);
|
var ieeer = T.Ieee754Remainder(input, tuf);
|
||||||
input -= ieeer;
|
input -= ieeer;
|
||||||
if (ieeer < -precision) count--;
|
if (ieeer < -precision) count--;
|
||||||
val = input + tuf * count.as_type<uint, T>();
|
val = input + tuf * count.as_type<ulong, T>();
|
||||||
}
|
}
|
||||||
return _round_tick(tuf, val);
|
return _round_tick(tuf, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static T tickdown<T>(this TickFactors tick, T input, uint count = 1)
|
public static T tickdown<T>(this TickFactors tick, T input, ulong count = 1)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
tickdown(tick, input, count, TickUtils.precision_const<T>());
|
tickdown(tick, input, count, TickUtils.precision_const<T>());
|
||||||
|
|
||||||
public static T tickdown<T>(this TickFactors tick, T input, uint count, T precision)
|
public static T tickdown<T>(this TickFactors tick, T input, ulong count, T precision)
|
||||||
where T : IFloatingPoint<T> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
tickdown<T, NumericCastOutConverter<T>>(tick, input, count, precision);
|
tickdown<T, NumericCastOutConverter<T>>(tick, input, count, precision);
|
||||||
|
|
||||||
public static T tickdown<T, TFromUInt32>(this TickFactors tick, T input, uint count, T precision)
|
public static T tickdown<T, TFromUInt64>(this TickFactors tick, T input, ulong count, T precision)
|
||||||
where T : IFloatingPoint<T>
|
where T : IFloatingPointIeee754<T>
|
||||||
where TFromUInt32 : IConverter<uint, T> {
|
where TFromUInt64 : IConverter<ulong, T> {
|
||||||
if (!input.is_real()) {
|
if (!input.is_real()) {
|
||||||
return input;
|
return input;
|
||||||
}
|
}
|
||||||
var tuf = tick.tick_unit_frac<T>();
|
var tuf = tick.tick_unit_frac<T>();
|
||||||
var ieeer = T.IEEERemainder(input, tuf);
|
var ieeer = T.Ieee754Remainder(input, tuf);
|
||||||
input -= ieeer;
|
input -= ieeer;
|
||||||
if (ieeer > precision) {
|
if (ieeer > precision) {
|
||||||
count--;
|
count--;
|
||||||
}
|
}
|
||||||
var result = input - tuf * TFromUInt32.convert(count);
|
var result = input - tuf * TFromUInt64.convert(count);
|
||||||
return _round_tick(tuf, result);
|
return _round_tick(tuf, result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static double tickdown(
|
||||||
|
this RegionalTickFactors regional_tick, double input, long count = 1) =>
|
||||||
|
count switch {
|
||||||
|
> 0 => tickdown<double>(regional_tick, input, (ulong)count),
|
||||||
|
< 0 => tickup<double>(regional_tick, input, (ulong)count),
|
||||||
|
0 => input,
|
||||||
|
};
|
||||||
|
|
||||||
|
public static double tickdown(
|
||||||
|
this RegionalTickFactors regional_tick, double input, ulong count) =>
|
||||||
|
tickdown<double>(regional_tick, input, count);
|
||||||
|
|
||||||
public static T tickdown<T>(this RegionalTickFactors regional_tick, T input)
|
public static T tickdown<T>(this RegionalTickFactors regional_tick, T input)
|
||||||
where T : IFloatingPoint<T>, IComparisonOperators<T, double> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
regional_tick.tickdown(input, 1);
|
regional_tick.tickdown(input, 1);
|
||||||
|
|
||||||
public static T tickdown<T>(this RegionalTickFactors regional_tick, T input, uint count)
|
public static T tickdown<T>(this RegionalTickFactors regional_tick, T input, ulong count)
|
||||||
where T : IFloatingPoint<T>, IComparisonOperators<T, double> =>
|
where T : IFloatingPointIeee754<T> =>
|
||||||
tickdown(regional_tick, input, count, TickUtils.precision_const<T>());
|
tickdown(regional_tick, input, count, TickUtils.precision_const<T>());
|
||||||
|
|
||||||
public static T tickdown<T>(
|
public static T tickdown<T>(
|
||||||
this RegionalTickFactors regional_tick, T input, uint count, T precision) where T : IFloatingPoint<T> =>
|
this RegionalTickFactors regional_tick, T input, ulong count, T precision)
|
||||||
|
where T : IFloatingPointIeee754<T> =>
|
||||||
tickdown<T, NumericCastOutConverter<T>, NumericCastOutConverter<T>, NumericCastInConverter<T>>(
|
tickdown<T, NumericCastOutConverter<T>, NumericCastOutConverter<T>, NumericCastInConverter<T>>(
|
||||||
regional_tick, input, count, precision);
|
regional_tick, input, count, precision);
|
||||||
|
|
||||||
public static T tickdown<T, TFromUInt32, TFromDouble, TToUInt16>(
|
public static T tickdown<T, TFromUInt32, TFromDouble, TToUInt16>(
|
||||||
this RegionalTickFactors regional_tick, T input, uint count, T precision)
|
this RegionalTickFactors regional_tick, T input, ulong count, T precision)
|
||||||
where T : IFloatingPoint<T>
|
where T : IFloatingPointIeee754<T>
|
||||||
where TFromDouble : IConverter<double, T>
|
where TFromDouble : IConverter<double, T>
|
||||||
where TFromUInt32 : IConverter<uint, T>
|
where TFromUInt32 : IConverter<ulong, T>
|
||||||
where TToUInt16 : IConverter<T, uint> {
|
where TToUInt16 : IConverter<T, ulong> {
|
||||||
if (!precision.is_real_positive()) {
|
if (!precision.is_real_positive()) {
|
||||||
throw new ArgumentException("Must be a real positive number.", nameof(precision));
|
throw new ArgumentException("Must be a real positive number.", nameof(precision));
|
||||||
}
|
}
|
||||||
@@ -365,7 +454,7 @@ namespace mbts {
|
|||||||
T low_tick_inclusive_end = TFromDouble.convert(regional_tick.low_tick_inclusive_end);
|
T low_tick_inclusive_end = TFromDouble.convert(regional_tick.low_tick_inclusive_end);
|
||||||
if (input > low_tick_inclusive_end) {
|
if (input > low_tick_inclusive_end) {
|
||||||
tuf = regional_tick.high_tick.tick_unit_frac<T>();
|
tuf = regional_tick.high_tick.tick_unit_frac<T>();
|
||||||
var ieeer = T.IEEERemainder(input, tuf);
|
var ieeer = T.Ieee754Remainder(input, tuf);
|
||||||
input -= ieeer;
|
input -= ieeer;
|
||||||
if (ieeer > precision) count--;
|
if (ieeer > precision) count--;
|
||||||
val = input - tuf * TFromDouble.convert(count);
|
val = input - tuf * TFromDouble.convert(count);
|
||||||
@@ -377,7 +466,7 @@ namespace mbts {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
tuf = regional_tick.low_tick.tick_unit_frac<T>();
|
tuf = regional_tick.low_tick.tick_unit_frac<T>();
|
||||||
var ieeer = T.IEEERemainder(input, tuf);
|
var ieeer = T.Ieee754Remainder(input, tuf);
|
||||||
input -= ieeer;
|
input -= ieeer;
|
||||||
if (ieeer > precision) count--;
|
if (ieeer > precision) count--;
|
||||||
val = input - tuf * TFromDouble.convert(count);
|
val = input - tuf * TFromDouble.convert(count);
|
||||||
@@ -416,16 +505,6 @@ namespace mbts {
|
|||||||
CashPerPoint = 1
|
CashPerPoint = 1
|
||||||
};
|
};
|
||||||
|
|
||||||
public static bool try_get_tickdiff(this RegionalTickFactors regional_tick, double minuend, double subtrahend, out int n_low, out int n_high) {
|
|
||||||
if (DoubleHelper.IsNaNOrInfinity(minuend) || DoubleHelper.IsNaNOrInfinity(subtrahend)) {
|
|
||||||
n_low = default;
|
|
||||||
n_high = default;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
(n_low, n_high) = tickdiff_unchecked(regional_tick, minuend, subtrahend);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Computes the difference, in tick units, between <paramref name="minuend"/> and <paramref name="subtrahend"/>
|
/// Computes the difference, in tick units, between <paramref name="minuend"/> and <paramref name="subtrahend"/>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -434,31 +513,14 @@ namespace mbts {
|
|||||||
/// </remarks>
|
/// </remarks>
|
||||||
/// <param name="minuend">The minuend</param>
|
/// <param name="minuend">The minuend</param>
|
||||||
/// <param name="subtrahend">The subtrahend</param>
|
/// <param name="subtrahend">The subtrahend</param>
|
||||||
internal static (int n_low, int n_high) tickdiff_unchecked(this RegionalTickFactors regional_tick, double minuend, double subtrahend) {
|
public static long? tickdiff(this RegionalTickFactors regional_tick, double minuend, double subtrahend) {
|
||||||
Log.assert(minuend.is_real() && subtrahend.is_real());
|
if (!minuend.is_real() || !subtrahend.is_real()) {
|
||||||
|
return null;
|
||||||
double ltie = regional_tick.low_tick_inclusive_end;
|
|
||||||
double raw_diff = minuend - subtrahend;
|
|
||||||
|
|
||||||
if (minuend < ltie) {
|
|
||||||
if (subtrahend < ltie) {
|
|
||||||
return ((int)MathUtils.round_fractional_units(raw_diff, regional_tick.low_tick.tick_unit_frac()), 0);
|
|
||||||
}
|
|
||||||
double low_diff = ltie - minuend;
|
|
||||||
double high_diff = raw_diff - low_diff;
|
|
||||||
int n_low = (int)MathUtils.round_fractional_units(low_diff, regional_tick.low_tick.tick_unit_frac());
|
|
||||||
int n_high = (int)MathUtils.round_fractional_units(high_diff, regional_tick.high_tick.tick_unit_frac());
|
|
||||||
return (n_low, n_high);
|
|
||||||
}
|
}
|
||||||
|
var minuend_n = TickUtils.count_ticks(regional_tick, minuend);
|
||||||
if (subtrahend < ltie) {
|
var subtrahend_n = TickUtils.count_ticks(regional_tick, subtrahend);
|
||||||
double high_diff = minuend - ltie;
|
var n = minuend_n - subtrahend_n;
|
||||||
double low_diff = raw_diff - high_diff;
|
return n;
|
||||||
int n_low = (int)MathUtils.round_fractional_units(low_diff, regional_tick.high_tick.tick_unit_frac());
|
|
||||||
int n_high = (int)MathUtils.round_fractional_units(high_diff, regional_tick.high_tick.tick_unit_frac());
|
|
||||||
return (n_low, n_high);
|
|
||||||
}
|
|
||||||
return (0, (int)MathUtils.round_fractional_units(raw_diff, regional_tick.high_tick.tick_unit_frac()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double round(this TickFactors tick, double input) =>
|
public static double round(this TickFactors tick, double input) =>
|
||||||
@@ -483,7 +545,7 @@ namespace mbts {
|
|||||||
return display_digits(tick.tick_base);
|
return display_digits(tick.tick_base);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int display_digits<T>(T tick_base) where T : IFloatingPoint<T> {
|
public static int display_digits<T>(T tick_base) where T : IFloatingPoint<T>, ILogarithmicFunctions<T> {
|
||||||
var log_tick_base = T.Log10(tick_base);
|
var log_tick_base = T.Log10(tick_base);
|
||||||
var floor = T.Floor(log_tick_base);
|
var floor = T.Floor(log_tick_base);
|
||||||
var dec = log_tick_base - floor;
|
var dec = log_tick_base - floor;
|
||||||
@@ -495,19 +557,23 @@ namespace mbts {
|
|||||||
new(tick_base ?? tick_factors.tick_base, tick_unit ?? tick_factors.tick_unit);
|
new(tick_base ?? tick_factors.tick_base, tick_unit ?? tick_factors.tick_unit);
|
||||||
|
|
||||||
static char _separator(TickFactors tick) {
|
static char _separator(TickFactors tick) {
|
||||||
|
if (tick.tick_base == 1 && tick.tick_unit > tick.tick_base &&
|
||||||
|
MathUtils.is_int(tick.tick_unit / tick.tick_base)) {
|
||||||
|
return '.';
|
||||||
|
}
|
||||||
double tb_log10 = Math.Log10(tick.tick_base);
|
double tb_log10 = Math.Log10(tick.tick_base);
|
||||||
return tb_log10 >= 1 && tb_log10 % 1 == 0 ? '.' : '-';
|
return tb_log10 >= 1 && tb_log10 % 1 == 0 ? '.' : '-';
|
||||||
}
|
}
|
||||||
|
|
||||||
static string _format_no_tick<T>(T value, T display_multiplier, bool show_commas)
|
static string _format_no_tick<T>(T value, T display_multiplier, bool show_commas)
|
||||||
where T : IFloatingPoint<T> {
|
where T : INumberBase<T> {
|
||||||
if (!display_multiplier.is_nan()) {
|
if (!display_multiplier.is_nan()) {
|
||||||
value *= display_multiplier;
|
value *= display_multiplier;
|
||||||
}
|
}
|
||||||
return value.ToString(show_commas ? "#,0" : "0", null);
|
return value.ToString(show_commas ? "#,0" : "0", null);
|
||||||
}
|
}
|
||||||
|
|
||||||
static T _parse_no_tick<T>(string text, T display_multiplier, string nan_text) where T : IFloatingPoint<T> {
|
static T _parse_no_tick<T>(string text, T display_multiplier, string nan_text) where T : IFloatingPointIeee754<T> {
|
||||||
if (text == nan_text) {
|
if (text == nan_text) {
|
||||||
return T.NaN;
|
return T.NaN;
|
||||||
}
|
}
|
||||||
@@ -515,7 +581,7 @@ namespace mbts {
|
|||||||
result.safe_divide(display_multiplier) : T.NaN;
|
result.safe_divide(display_multiplier) : T.NaN;
|
||||||
}
|
}
|
||||||
|
|
||||||
static T _get_integer_part<T>(string integer_text) where T : IFloatingPoint<T> {
|
static T _get_integer_part<T>(string integer_text) where T : IFloatingPointIeee754<T> {
|
||||||
if (integer_text.is_null_or_white_space()) {
|
if (integer_text.is_null_or_white_space()) {
|
||||||
return T.Zero;
|
return T.Zero;
|
||||||
}
|
}
|
||||||
@@ -524,7 +590,7 @@ namespace mbts {
|
|||||||
result : T.NaN;
|
result : T.NaN;
|
||||||
}
|
}
|
||||||
|
|
||||||
static T _get_numerator_part<T>(string numerator_text, T tick_base) where T : IFloatingPoint<T> {
|
static T _get_numerator_part<T>(string numerator_text, T tick_base) where T : IFloatingPointIeee754<T> {
|
||||||
if (string.IsNullOrEmpty(numerator_text)) {
|
if (string.IsNullOrEmpty(numerator_text)) {
|
||||||
return T.Zero;
|
return T.Zero;
|
||||||
}
|
}
|
||||||
@@ -554,7 +620,7 @@ namespace mbts {
|
|||||||
|
|
||||||
static T _parse<T>(
|
static T _parse<T>(
|
||||||
RegionalTickFactors regional_tick, string text, T display_multiplier, string nan_text)
|
RegionalTickFactors regional_tick, string text, T display_multiplier, string nan_text)
|
||||||
where T : IFloatingPoint<T> {
|
where T : IFloatingPointIeee754<T> {
|
||||||
T result = _parse(regional_tick.low_tick, text, display_multiplier, nan_text);
|
T result = _parse(regional_tick.low_tick, text, display_multiplier, nan_text);
|
||||||
|
|
||||||
T ltie = regional_tick.low_tick_inclusive_end.as_type<double, T>()
|
T ltie = regional_tick.low_tick_inclusive_end.as_type<double, T>()
|
||||||
@@ -566,7 +632,7 @@ namespace mbts {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static T _parse<T>(TickFactors tick, string text, T display_multiplier, string nan_text)
|
static T _parse<T>(TickFactors tick, string text, T display_multiplier, string nan_text)
|
||||||
where T : IFloatingPoint<T> {
|
where T : IFloatingPointIeee754<T> {
|
||||||
if (text.is_null_or_white_space() || text == nan_text) {
|
if (text.is_null_or_white_space() || text == nan_text) {
|
||||||
return T.NaN;
|
return T.NaN;
|
||||||
}
|
}
|
||||||
@@ -584,7 +650,7 @@ namespace mbts {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static T _parse<T>(TickFactors tick, T integer_part, string numerator_part_text)
|
static T _parse<T>(TickFactors tick, T integer_part, string numerator_part_text)
|
||||||
where T : IFloatingPoint<T> {
|
where T : IFloatingPointIeee754<T> {
|
||||||
T tick_base = tick.tick_base.as_type<double, T>();
|
T tick_base = tick.tick_base.as_type<double, T>();
|
||||||
T numerator_part = _get_numerator_part(numerator_part_text, tick_base);
|
T numerator_part = _get_numerator_part(numerator_part_text, tick_base);
|
||||||
return integer_part + numerator_part / tick_base;
|
return integer_part + numerator_part / tick_base;
|
||||||
@@ -657,7 +723,7 @@ namespace mbts {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static T _round_tick<T>(T tick_unit_frac, T input) where T : IFloatingPoint<T> =>
|
static T _round_tick<T>(T tick_unit_frac, T input) where T : IFloatingPointIeee754<T> =>
|
||||||
input - T.IEEERemainder(input, tick_unit_frac);
|
input - T.Ieee754Remainder(input, tick_unit_frac);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,34 +1,62 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.utils;
|
using bts.utils;
|
||||||
|
|
||||||
using mbts;
|
using mbts;
|
||||||
|
using mbts.spark;
|
||||||
using mbts.user.settings;
|
using mbts.user.settings;
|
||||||
|
|
||||||
|
using Spark.Core.Data;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
namespace bts.data.ticks {
|
namespace bts.data.ticks {
|
||||||
class TickFactorsFactory {
|
class TickFactorsFactory {
|
||||||
static readonly RegionalTickFactors _default_rtf = new RegionalTickFactors(new TickFactors(1000, 1), new TickFactors(1000, 1), double.MaxValue);
|
static readonly RegionalTickFactors _default_rtf = new RegionalTickFactors(new TickFactors(1000, 1), new TickFactors(1000, 1), double.MaxValue);
|
||||||
readonly Dictionary<SpecKey, RegionalTickFactors> _exchange_ticks = new Dictionary<SpecKey, RegionalTickFactors>();
|
readonly Dictionary<uint, RegionalTickFactors> _sec_ticks = new();
|
||||||
|
readonly Dictionary<SpecKey, RegionalTickFactors> _spec_ticks = new();
|
||||||
|
|
||||||
public RegionalTickFactors default_rtf => _default_rtf;
|
public RegionalTickFactors default_rtf => _default_rtf;
|
||||||
|
|
||||||
public RegionalTickFactors get(ContractSpecification spec) =>
|
public RegionalTickFactors get(ContractSpecification spec) =>
|
||||||
_exchange_ticks.GetOrAdd(new SpecKey(spec), _create_rtf);
|
_spec_ticks.GetOrAdd(new SpecKey(spec), _create_rtf);
|
||||||
|
|
||||||
public RegionalTickFactors get(ContractSpecificationImmutable spec) =>
|
public RegionalTickFactors get(ContractSpecificationImmutable spec) =>
|
||||||
_exchange_ticks.GetOrAdd(new SpecKey(spec), _create_rtf);
|
_spec_ticks.GetOrAdd(new SpecKey(spec), _create_rtf);
|
||||||
|
|
||||||
public RegionalTickFactors get(SecurityImmutable security) =>
|
|
||||||
security.HasContractSpec ? get(security.ContractSpec) : _default_rtf;
|
|
||||||
|
|
||||||
public RegionalTickFactors get(SecurityImmutable? security) =>
|
public RegionalTickFactors get(SecurityImmutable? security) =>
|
||||||
security.HasValue ? get(security.Value) : _default_rtf;
|
security.HasValue ?
|
||||||
|
_sec_ticks.GetOrAdd(security.Value.Id, _ => _create_rtf(security.Value)) :
|
||||||
|
_default_rtf;
|
||||||
|
|
||||||
|
static RegionalTickFactors _create_rtf(SecurityImmutable? security) {
|
||||||
|
var meta = SecurityMetadataStore.instance.get(security.Value);
|
||||||
|
return meta?.PriceRules?.Any() ?? false ?
|
||||||
|
_create_rtf(meta.Value.PriceRules.ToList()) :
|
||||||
|
_create_rtf(new SpecKey(security.Value.spec_or_default()));
|
||||||
|
}
|
||||||
|
|
||||||
|
static RegionalTickFactors _create_rtf(
|
||||||
|
IList<api.domain.TickDisplayRuleImmutable> rules) {
|
||||||
|
if (rules.is_null_or_empty()) {
|
||||||
|
throw new ArgumentException("Rules is null or empty", nameof(rules));
|
||||||
|
}
|
||||||
|
if (rules.Count > 2) {
|
||||||
|
throw new ArgumentException("Rules cannot have more than 2 items (backwards compatibility)");
|
||||||
|
}
|
||||||
|
var low_tick = rules[0].TickDisplay.TickFactors;
|
||||||
|
var high_tick_idx = rules.Count > 1 ? 1 : 0;
|
||||||
|
var high_tick = rules[high_tick_idx].TickDisplay.TickFactors;
|
||||||
|
var low_tick_end = rules.Count > 1 ? rules[0].MaxValue : double.MaxValue;
|
||||||
|
return new(low_tick.to_tick_factors(), high_tick.to_tick_factors(), low_tick_end);
|
||||||
|
}
|
||||||
|
|
||||||
static RegionalTickFactors _create_rtf(SpecKey key) {
|
static RegionalTickFactors _create_rtf(SpecKey key) {
|
||||||
double tick_base = key.denominator;
|
double tick_base = key.denominator;
|
||||||
if (tick_base == 0) {
|
if (tick_base == 0) {
|
||||||
// indicates tick is a decimal
|
// Tick in pennies if units are < 1 (i.e., fractional)
|
||||||
tick_base = 100;
|
tick_base = key.low_tick > 1 && key.high_tick > 1 ? 1 : 100;
|
||||||
}
|
}
|
||||||
return _create_rtf(key.low_tick, key.high_tick, key.price_break, tick_base, key.display_digits);
|
return _create_rtf(key.low_tick, key.high_tick, key.price_break, tick_base, key.display_digits);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,17 @@
|
|||||||
|
using bts;
|
||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.data.ticks;
|
using bts.data.ticks;
|
||||||
using bts.utils;
|
using bts.utils;
|
||||||
using mbts.co2;
|
|
||||||
using mbts.user.settings;
|
using mbts.user.settings;
|
||||||
|
|
||||||
using Spark.Core;
|
using Spark.Core;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics.Contracts;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
static class TickUtils {
|
static class TickUtils {
|
||||||
@@ -35,6 +38,9 @@ namespace mbts.spark {
|
|||||||
public static IComparer<double> price_comparer(this ContractSpecificationImmutable spec) =>
|
public static IComparer<double> price_comparer(this ContractSpecificationImmutable spec) =>
|
||||||
MathUtils.epsilon_comparer.wrap<double, double>(p => spec.round_to_tick(p));
|
MathUtils.epsilon_comparer.wrap<double, double>(p => spec.round_to_tick(p));
|
||||||
|
|
||||||
|
public static IComparer<double> price_comparer(this RegionalTickFactors rtick) =>
|
||||||
|
MathUtils.epsilon_comparer.wrap<double, double>(p => rtick.round_to_tick(p));
|
||||||
|
|
||||||
public static double ticksize(this ContractSpecificationImmutable spec, double price) {
|
public static double ticksize(this ContractSpecificationImmutable spec, double price) {
|
||||||
if (!spec.LowTick.is_real_positive()) {
|
if (!spec.LowTick.is_real_positive()) {
|
||||||
return spec.HighTick;
|
return spec.HighTick;
|
||||||
@@ -47,8 +53,23 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static double ticksize(this RegionalTickFactors rtick, double price) {
|
||||||
|
var low_tick = rtick.low_tick.tick_unit_frac();
|
||||||
|
var high_tick = rtick.high_tick.tick_unit_frac();
|
||||||
|
var price_break = rtick.low_tick_inclusive_end;
|
||||||
|
if (!low_tick.is_real_positive()) {
|
||||||
|
return high_tick;
|
||||||
|
} else if (!high_tick.is_real_positive()) {
|
||||||
|
return low_tick;
|
||||||
|
} else if (!price.is_real() || !price_break.is_real()) {
|
||||||
|
return low_tick;
|
||||||
|
} else {
|
||||||
|
return price > price_break ? high_tick : low_tick;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static string format(this ContractSpecificationImmutable spec, double price, bool in_tick_terms) =>
|
public static string format(this ContractSpecificationImmutable spec, double price, bool in_tick_terms) =>
|
||||||
in_tick_terms ?
|
in_tick_terms ?
|
||||||
_get(spec).format_without_decimal_part(price / spec.ticksize(price)) :
|
_get(spec).format_without_decimal_part(price / spec.ticksize(price)) :
|
||||||
_get(spec).format(price);
|
_get(spec).format(price);
|
||||||
|
|
||||||
@@ -86,18 +107,13 @@ namespace mbts.spark {
|
|||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int? tickdiff(this ContractSpecificationImmutable spec, double x, double y) {
|
public static long? tickdiff(this ContractSpecificationImmutable spec, double x, double y) =>
|
||||||
if (get_regional_ticks(spec).try_get_tickdiff(x, y, out int n_low, out int n_high))
|
get_regional_ticks(spec).tickdiff(x, y);
|
||||||
return n_low + n_high;
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int tickdiff_unchecked(this ContractSpecificationImmutable spec, double x, double y) {
|
public static long? tickdiff(this SecurityImmutable sec, double x, double y) =>
|
||||||
(int n_low, int n_high) = get_regional_ticks(spec).tickdiff_unchecked(x, y);
|
get_regional_ticks(sec).tickdiff(x, y);
|
||||||
return n_low + n_high;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static double mid_tick(ContractSpecificationImmutable spec, double bid, double ask) {
|
public static double mid_tick(RegionalTickFactors spec, double bid, double ask) {
|
||||||
double raw_mid;
|
double raw_mid;
|
||||||
if (double.IsNaN(bid)) {
|
if (double.IsNaN(bid)) {
|
||||||
if (double.IsNaN(ask)) return double.NaN;
|
if (double.IsNaN(ask)) return double.NaN;
|
||||||
@@ -113,8 +129,8 @@ namespace mbts.spark {
|
|||||||
raw_mid - (raw_mid % tick_size);
|
raw_mid - (raw_mid % tick_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static TickFactors deduce_ticks(IEnumerable<ContractSpecification> contract_specs) {
|
public static TickFactors deduce_ticks(IEnumerable<SecurityImmutable> securities) {
|
||||||
var ticks = new HashSet<TickFactors>(contract_specs.Select(_get).SelectMany(rtf => new[] { rtf.low_tick, rtf.high_tick }));
|
var ticks = new HashSet<TickFactors>(securities.Select(_get).SelectMany(rtf => new[] { rtf.low_tick, rtf.high_tick }));
|
||||||
switch (ticks.Count) {
|
switch (ticks.Count) {
|
||||||
case 0: return _exchange_ticks.default_rtf.low_tick;
|
case 0: return _exchange_ticks.default_rtf.low_tick;
|
||||||
case 1: return ticks.First();
|
case 1: return ticks.First();
|
||||||
@@ -125,30 +141,27 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RegionalTickFactors get_tick_factors(ContractSpecificationImmutable spec) =>
|
public static TickFactors tick_factors(this SecurityImmutable sec) =>
|
||||||
_get(spec);
|
_get(sec).low_tick;
|
||||||
|
|
||||||
public static TickFactors tick_factors(this ContractSpecificationImmutable spec) =>
|
|
||||||
_get(spec).low_tick;
|
|
||||||
|
|
||||||
public static double tickup(this ContractSpecificationImmutable spec, double value) =>
|
public static double tickup(this ContractSpecificationImmutable spec, double value) =>
|
||||||
_get(spec).tickup(value);
|
_get(spec).tickup(value);
|
||||||
|
|
||||||
public static double tickup(this ContractSpecificationImmutable spec, double value, int count) {
|
public static double tickup(this ContractSpecificationImmutable spec, double value, long count) {
|
||||||
uint bl = 3;
|
uint bl = 3;
|
||||||
var res = value * bl;
|
var res = value * bl;
|
||||||
if (count == 0) return value;
|
if (count == 0) return value;
|
||||||
if (count < 0) return _get(spec).tickdown(value, (uint)(-count));
|
if (count < 0) return _get(spec).tickdown(value, (ulong)-count);
|
||||||
else return _get(spec).tickup(value, (uint)count);
|
else return _get(spec).tickup(value, (ulong)count);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double tickdown(this ContractSpecificationImmutable spec, double value) =>
|
public static double tickdown(this ContractSpecificationImmutable spec, double value) =>
|
||||||
_get(spec).tickdown(value);
|
_get(spec).tickdown(value);
|
||||||
|
|
||||||
public static double tickdown(this ContractSpecificationImmutable spec, double value, int count) {
|
public static double tickdown(this ContractSpecificationImmutable spec, double value, long count) {
|
||||||
if (count == 0) return value;
|
if (count == 0) return value;
|
||||||
if (count < 0) return _get(spec).tickup(value, (uint)(-count));
|
if (count < 0) return _get(spec).tickup(value, (ulong)-count);
|
||||||
else return _get(spec).tickdown(value, (uint)count);
|
else return _get(spec).tickdown(value, (ulong)count);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool tick_equals<T>(
|
public static bool tick_equals<T>(
|
||||||
@@ -167,7 +180,7 @@ namespace mbts.spark {
|
|||||||
x => (int)MathUtils.round_fractional_units(x, contract.LowTick));
|
x => (int)MathUtils.round_fractional_units(x, contract.LowTick));
|
||||||
|
|
||||||
public static IEqualityComparer<T> tick_equality_comparer<T>(
|
public static IEqualityComparer<T> tick_equality_comparer<T>(
|
||||||
this ContractSpecificationImmutable contract) where T : IFloatingPoint<T> =>
|
this ContractSpecificationImmutable contract) where T : IFloatingPoint<T> =>
|
||||||
EqualityComparer.Create<T>(
|
EqualityComparer.Create<T>(
|
||||||
(a, b) => tick_equals(contract, a, b),
|
(a, b) => tick_equals(contract, a, b),
|
||||||
x => (int)MathUtils.round_fractional_units(
|
x => (int)MathUtils.round_fractional_units(
|
||||||
@@ -176,85 +189,107 @@ namespace mbts.spark {
|
|||||||
public static int compare_tick_fallback_to_double(this ContractSpecificationImmutable contract, double x, double y) =>
|
public static int compare_tick_fallback_to_double(this ContractSpecificationImmutable contract, double x, double y) =>
|
||||||
tick_equals(contract, x, y) ? 0 : x.CompareTo(y);
|
tick_equals(contract, x, y) ? 0 : x.CompareTo(y);
|
||||||
|
|
||||||
public static double round_to_tick(this ContractSpecificationImmutable spec, double value) {
|
public static double round_to_tick(this ContractSpecificationImmutable spec, double value) =>
|
||||||
|
round_to_tick(spec.ticksize(value), value);
|
||||||
|
|
||||||
|
public static decimal round_to_tick(this ContractSpecificationImmutable spec, decimal value) =>
|
||||||
|
round_to_tick((decimal)spec.ticksize((double)value), value);
|
||||||
|
|
||||||
|
public static double round_to_tick(this RegionalTickFactors rtick, double value) =>
|
||||||
|
round_to_tick(rtick.ticksize(value), value);
|
||||||
|
|
||||||
|
public static decimal round_to_tick(this RegionalTickFactors rtick, decimal value) =>
|
||||||
|
round_to_tick((decimal)rtick.ticksize((double)value), value);
|
||||||
|
|
||||||
|
public static double round_to_tick(double tick_size, double value) {
|
||||||
double intpart = (long)value;
|
double intpart = (long)value;
|
||||||
double floatpart = value % 1;
|
double floatpart = value % 1;
|
||||||
double tick = spec.ticksize(value);
|
floatpart = ((int)Math.Round(floatpart / tick_size)) * tick_size;
|
||||||
floatpart = ((int)Math.Round(floatpart / tick)) * tick;
|
|
||||||
return intpart + floatpart;
|
return intpart + floatpart;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static decimal round_to_tick(this ContractSpecificationImmutable spec, decimal value) {
|
public static decimal round_to_tick(decimal tick_size, decimal value) {
|
||||||
decimal intpart = (long)value;
|
decimal intpart = (long)value;
|
||||||
decimal floatpart = value % 1;
|
decimal floatpart = value % 1;
|
||||||
decimal tick = (decimal)spec.ticksize((double)value);
|
floatpart = ((int)(floatpart / tick_size)) * tick_size;
|
||||||
floatpart = ((int)(floatpart / tick)) * tick;
|
|
||||||
return intpart + floatpart;
|
return intpart + floatpart;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int? full_ticks_from_zero(this ContractSpecificationImmutable spec, double value) =>
|
public static long? count_ticks(this RegionalTickFactors rtick, double value) {
|
||||||
full_ticks_from(spec, 0, value);
|
if (!rtick.is_valid()) {
|
||||||
|
|
||||||
public static int? full_ticks_from(this ContractSpecificationImmutable spec, double origin, double value) {
|
|
||||||
if (!value.is_real() || !origin.is_real())
|
|
||||||
return null;
|
return null;
|
||||||
if (value < origin) {
|
|
||||||
if (spec.LowTick.is_real_positive()) {
|
|
||||||
if (spec.HighTick.is_real_positive() && spec.PriceBreak < origin && spec.PriceBreak > value) {
|
|
||||||
var ticks_to_break = MathUtils.round_up((spec.PriceBreak - origin) / spec.HighTick, _precision_const);
|
|
||||||
var low_ticks_remainder = MathUtils.round_up((value - spec.PriceBreak) / spec.LowTick, _precision_const);
|
|
||||||
return (int)(ticks_to_break + low_ticks_remainder);
|
|
||||||
} else {
|
|
||||||
return (int)MathUtils.round_up((value - origin) / spec.LowTick, _precision_const);
|
|
||||||
}
|
|
||||||
} else if (spec.HighTick.is_real_positive()) {
|
|
||||||
return (int)MathUtils.round_up((value - origin) / spec.HighTick, _precision_const);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (spec.HighTick.is_real_positive()) {
|
|
||||||
if (spec.LowTick.is_real_positive() && spec.PriceBreak > origin && spec.PriceBreak < value) {
|
|
||||||
var ticks_to_break = MathUtils.round_down((spec.PriceBreak - origin) / spec.LowTick, _precision_const);
|
|
||||||
var high_ticks_remainder = MathUtils.round_down((value - spec.PriceBreak) / spec.HighTick, _precision_const);
|
|
||||||
return (int)(ticks_to_break + high_ticks_remainder);
|
|
||||||
} else {
|
|
||||||
return (int)MathUtils.round_down(value / spec.HighTick, _precision_const);
|
|
||||||
}
|
|
||||||
} else if (spec.LowTick.is_real_positive()) {
|
|
||||||
return (int)MathUtils.round_down(value / spec.LowTick, _precision_const);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return null;
|
var n = _count_ticks(
|
||||||
|
rtick.low_tick.tick_unit_frac(),
|
||||||
|
rtick.low_tick_inclusive_end,
|
||||||
|
rtick.high_tick.tick_unit_frac(),
|
||||||
|
0,
|
||||||
|
value);
|
||||||
|
var orig_n = n;
|
||||||
|
// Enforce proper rounding
|
||||||
|
var rounded_val = rtick.round_to_tick(value);
|
||||||
|
var half_tick = rtick.get_tick_for(value).tick_unit_frac() / 2;
|
||||||
|
if (n < 0 && (value - rounded_val) > half_tick) {
|
||||||
|
++n;
|
||||||
|
} else if (n > 0 && (rounded_val - value) > half_tick) {
|
||||||
|
--n;
|
||||||
|
}
|
||||||
|
Log.assert(n == orig_n);
|
||||||
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RegionalTickFactors get_regional_ticks(ContractSpecificationImmutable? spec) =>
|
public static RegionalTickFactors get_regional_ticks(ContractSpecificationImmutable? spec) =>
|
||||||
spec.HasValue ? _get(spec.Value) : _exchange_ticks.default_rtf;
|
spec.HasValue ? _get(spec.Value) : _exchange_ticks.default_rtf;
|
||||||
|
|
||||||
public static RegionalTickFactors get_regional_ticks(SecurityImmutable security) =>
|
public static RegionalTickFactors regional_ticks(this SecurityImmutable security) =>
|
||||||
get_regional_ticks(security.spec_or_default());
|
_exchange_ticks.get(security);
|
||||||
|
|
||||||
public static ContractSpecificationImmutable multiply_tick_size(ContractSpecificationImmutable spec, uint factor) {
|
public static RegionalTickFactors get_regional_ticks(SecurityImmutable? security) =>
|
||||||
factor = fit_ticks_per_row_to_dollars(spec, factor);
|
_exchange_ticks.get(security);
|
||||||
return spec.with(low_tick: spec.LowTick * factor, high_tick: spec.HighTick * factor);
|
|
||||||
|
public static TickFactors get_tick(SecurityImmutable? security, double value) {
|
||||||
|
var rtick = get_regional_ticks(security);
|
||||||
|
var tick = rtick.low_tick_inclusive_end > value ? rtick.high_tick : rtick.low_tick;
|
||||||
|
return tick;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double normalize_price(ContractSpecificationImmutable spec, double price) {
|
public static RegionalTickFactors multiply_tick_size(RegionalTickFactors spec, uint factor) {
|
||||||
var ticks = spec.full_ticks_from_zero(price);
|
factor = _fit_ticks_per_row_to_dollars(spec, factor) ?? 1;
|
||||||
return ticks.HasValue ? spec.tickup(0, ticks.Value) : price;
|
return new(
|
||||||
|
new(spec.low_tick.tick_base, spec.low_tick.tick_unit * factor),
|
||||||
|
new(spec.high_tick.tick_base, spec.high_tick.tick_unit * factor),
|
||||||
|
spec.low_tick_inclusive_end);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static double normalize_price(ContractSpecificationImmutable? spec, double price) {
|
public static double normalize_price(RegionalTickFactors rtick, double price) {
|
||||||
return spec.HasValue ? normalize_price(spec.Value, price) : price;
|
if (!price.is_real()) {
|
||||||
|
return price;
|
||||||
|
}
|
||||||
|
var ticks = rtick.count_ticks(price);
|
||||||
|
if (!ticks.HasValue) {
|
||||||
|
return price;
|
||||||
|
}
|
||||||
|
var normalized = rtick.tick(0, ticks.Value);
|
||||||
|
var tick = price > rtick.low_tick_inclusive_end ? rtick.high_tick : rtick.low_tick;
|
||||||
|
// Diff should always be < 1/2 tick
|
||||||
|
Log.assert((normalized - price).abs() < tick.tick_unit_frac() * 0.5);
|
||||||
|
return normalized;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static uint fit_ticks_per_row_to_dollars(ContractSpecificationImmutable spec, uint ticks_per_row) =>
|
public static uint fit_ticks_per_row_to_dollars(SecurityImmutable sec, uint ticks_per_row) =>
|
||||||
_fit_ticks_per_row_to_dollars(spec, ticks_per_row) ?? 1;
|
_fit_ticks_per_row_to_dollars(sec, ticks_per_row) ?? 1;
|
||||||
|
|
||||||
static uint? _fit_ticks_per_row_to_dollars(ContractSpecificationImmutable spec, uint ticks_per_row) {
|
public static uint fit_ticks_per_row_to_dollars(RegionalTickFactors rtick, uint ticks_per_row) =>
|
||||||
|
_fit_ticks_per_row_to_dollars(rtick, ticks_per_row) ?? 1;
|
||||||
|
|
||||||
|
static uint? _fit_ticks_per_row_to_dollars(SecurityImmutable sec, uint ticks_per_row) =>
|
||||||
|
_fit_ticks_per_row_to_dollars(sec.regional_ticks(), ticks_per_row);
|
||||||
|
|
||||||
|
static uint? _fit_ticks_per_row_to_dollars(RegionalTickFactors tf, uint ticks_per_row) {
|
||||||
if (ticks_per_row == 0)
|
if (ticks_per_row == 0)
|
||||||
return null;
|
return null;
|
||||||
// it is assumed that low tick will be the same as high tick;
|
// it is assumed that low tick will be the same as high tick;
|
||||||
// however, best to double check - return null if this isn't the case (let the caller decide what to do).
|
// however, best to double check - return null if this isn't the case (let the caller decide what to do).
|
||||||
var tf = get_tick_factors(spec);
|
|
||||||
if (!tf.low_tick.Equals(tf.high_tick) || !tf.is_valid() || tf.low_tick.is_integer())
|
if (!tf.low_tick.Equals(tf.high_tick) || !tf.is_valid() || tf.low_tick.is_integer())
|
||||||
return null;
|
return null;
|
||||||
var ticks_per_dollar = (uint)(tf.low_tick.tick_base / tf.low_tick.tick_unit);
|
var ticks_per_dollar = (uint)(tf.low_tick.tick_base / tf.low_tick.tick_unit);
|
||||||
@@ -282,7 +317,61 @@ namespace mbts.spark {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
static RegionalTickFactors _get(ContractSpecification spec) => _exchange_ticks.get(spec);
|
static long? _count_ticks(
|
||||||
|
double low_tick, double price_break, double high_tick, double from, double to) {
|
||||||
|
if (!from.is_real() || !to.is_real()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
var has_low = low_tick.is_real_positive();
|
||||||
|
var has_high = high_tick.is_real_positive();
|
||||||
|
if (!has_low) {
|
||||||
|
if (!has_high) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
low_tick = high_tick;
|
||||||
|
} else if (!has_high) {
|
||||||
|
high_tick = low_tick;
|
||||||
|
}
|
||||||
|
if (price_break.is_nan()) {
|
||||||
|
// Take price_break out of play
|
||||||
|
price_break = double.PositiveInfinity;
|
||||||
|
}
|
||||||
|
// Allow core impl to assume: 'from <= to'
|
||||||
|
(from, to) = (from, to).ordered(out var negate);
|
||||||
|
var n_ticks = _count_asc_ticks(low_tick, high_tick, from, to, price_break);
|
||||||
|
return negate ? -n_ticks : n_ticks;
|
||||||
|
}
|
||||||
|
|
||||||
|
static long _count_asc_ticks(
|
||||||
|
double low_tick, double high_tick, double from, double to, double price_break) {
|
||||||
|
Contract.Requires(from <= to);
|
||||||
|
Contract.Requires(low_tick.is_real_positive() && high_tick.is_real_positive());
|
||||||
|
Log.assert(from <= to);
|
||||||
|
checked {
|
||||||
|
if (to <= price_break) {
|
||||||
|
// All ticks are below price_break
|
||||||
|
return count_single_tick_sz(low_tick, from, to);
|
||||||
|
}
|
||||||
|
if (from >= price_break) {
|
||||||
|
// All ticks are above price_break
|
||||||
|
return count_single_tick_sz(high_tick, from, to);
|
||||||
|
}
|
||||||
|
// Ticks cross the price break. Compute low and high ticks separately
|
||||||
|
var low_ticks = count_single_tick_sz(low_tick, from, price_break);
|
||||||
|
var high_ticks = count_single_tick_sz(high_tick, price_break, to);
|
||||||
|
var total_ticks = low_ticks + high_ticks;
|
||||||
|
return total_ticks;
|
||||||
|
|
||||||
|
static long count_single_tick_sz(
|
||||||
|
double tick_sz, double from, double to) {
|
||||||
|
var from_n = (long)MathUtils.round_fractional_units(from, tick_sz);
|
||||||
|
var to_n = (long)MathUtils.round_fractional_units(to, tick_sz);
|
||||||
|
return to_n - from_n;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static RegionalTickFactors _get(SecurityImmutable sec) => _exchange_ticks.get(sec);
|
||||||
static RegionalTickFactors _get(ContractSpecificationImmutable spec) => _exchange_ticks.get(spec);
|
static RegionalTickFactors _get(ContractSpecificationImmutable spec) => _exchange_ticks.get(spec);
|
||||||
|
|
||||||
public static class CompareUtils {
|
public static class CompareUtils {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<Authors>Blue Trading Systems</Authors>
|
<Authors>Blue Trading Systems</Authors>
|
||||||
<Company>Blue Trading Systems</Company>
|
<Company>Blue Trading Systems</Company>
|
||||||
<Description />
|
<Description />
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
<PlatformTarget>x64</PlatformTarget>
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<WarningsAsErrors />
|
<WarningsAsErrors />
|
||||||
|
<NoWarn>8981</NoWarn>
|
||||||
<Version>$(major).$(minor).$(patch)</Version>
|
<Version>$(major).$(minor).$(patch)</Version>
|
||||||
<Version Condition="'$(version)'=='..'">0.0.0</Version>
|
<Version Condition="'$(version)'=='..'">0.0.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
@@ -20,7 +21,6 @@
|
|||||||
<PackageReference Include="Google.Protobuf" Version="3.21.4" />
|
<PackageReference Include="Google.Protobuf" Version="3.21.4" />
|
||||||
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
|
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
|
||||||
<PackageReference Include="System.Reactive" Version="5.0.0" />
|
<PackageReference Include="System.Reactive" Version="5.0.0" />
|
||||||
<PackageReference Include="System.Runtime.Experimental" Version="6.0.2" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<Platforms>x64</Platforms>
|
<Platforms>x64</Platforms>
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
|
|||||||
@@ -61,9 +61,6 @@ namespace System.Collections.Generic {
|
|||||||
public static IDictionary<TKey, TValue> as_idictionary<TKey, TValue>(this Dictionary<TKey, TValue> dictionary) =>
|
public static IDictionary<TKey, TValue> as_idictionary<TKey, TValue>(this Dictionary<TKey, TValue> dictionary) =>
|
||||||
dictionary;
|
dictionary;
|
||||||
|
|
||||||
public static IReadOnlyDictionary<TKey, TValue> AsReadOnly<TKey, TValue>(this IDictionary<TKey, TValue> dictionary) =>
|
|
||||||
new ReadOnlyDictionary<TKey, TValue>(dictionary);
|
|
||||||
|
|
||||||
public static void Difference<TKey, TValue>(this IDictionary<TKey, TValue> left,
|
public static void Difference<TKey, TValue>(this IDictionary<TKey, TValue> left,
|
||||||
IDictionary<TKey, TValue> right,
|
IDictionary<TKey, TValue> right,
|
||||||
out IEnumerable<KeyValuePair<TKey, TValue>> exclusive_left,
|
out IEnumerable<KeyValuePair<TKey, TValue>> exclusive_left,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace System.Collections.Generic {
|
|||||||
using System.Diagnostics.CodeAnalysis;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.Diagnostics.Contracts;
|
using System.Diagnostics.Contracts;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Numerics;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Runtime.Versioning;
|
using System.Runtime.Versioning;
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace bts.reactive {
|
namespace Spark.Core.Reactive {
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
public static class ObserverExtensions {
|
public static class ObserverExtensions {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
namespace bts.reactive {
|
namespace Spark.Core.Reactive {
|
||||||
using System;
|
using System;
|
||||||
using System.Reactive;
|
using System.Reactive;
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@ namespace bts.reactive {
|
|||||||
throw new ArgumentNullException(nameof(selector));
|
throw new ArgumentNullException(nameof(selector));
|
||||||
}
|
}
|
||||||
|
|
||||||
return new AnonymousObserver<TOuter>(outer_val => observer.OnNext(selector(outer_val)), observer.OnError, observer.OnCompleted);
|
return new SelectorObserver<TOuter, TInner>(observer, selector);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
#nullable enable
|
||||||
|
|
||||||
|
namespace Spark.Core.Reactive {
|
||||||
|
using System;
|
||||||
|
|
||||||
|
public static class SelectorObserver {
|
||||||
|
public static SelectorObserverBuilder<T> builder<T>(IObserver<T> observer) =>
|
||||||
|
new(observer);
|
||||||
|
}
|
||||||
|
|
||||||
|
public class SelectorObserver<T, TResult> : IObserver<T> {
|
||||||
|
readonly IObserver<TResult> _observer;
|
||||||
|
readonly Func<T, TResult> _selector;
|
||||||
|
|
||||||
|
public SelectorObserver(IObserver<TResult> observer, Func<T, TResult> selector) {
|
||||||
|
_observer = observer;
|
||||||
|
_selector = selector;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnCompleted() =>
|
||||||
|
_observer.OnCompleted();
|
||||||
|
|
||||||
|
public void OnError(Exception error) =>
|
||||||
|
_observer.OnError(error);
|
||||||
|
|
||||||
|
public void OnNext(T value) =>
|
||||||
|
_observer.OnNext(_selector(value));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
#nullable enable
|
||||||
|
|
||||||
|
namespace Spark.Core.Reactive {
|
||||||
|
using System;
|
||||||
|
|
||||||
|
public class SelectorObserverBuilder<TResult> {
|
||||||
|
readonly IObserver<TResult> _observer;
|
||||||
|
|
||||||
|
public SelectorObserverBuilder(IObserver<TResult> observer) =>
|
||||||
|
_observer = observer;
|
||||||
|
|
||||||
|
public SelectorObserver<T, TResult> wrap<T>(Func<T, TResult> selector) =>
|
||||||
|
new(_observer, selector);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
<Platforms>x64</Platforms>
|
<Platforms>x64</Platforms>
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
@@ -15,7 +15,6 @@
|
|||||||
<PackageReference Include="Google.Protobuf" Version="3.21.4" />
|
<PackageReference Include="Google.Protobuf" Version="3.21.4" />
|
||||||
<PackageReference Include="System.Reactive" Version="5.0.0" />
|
<PackageReference Include="System.Reactive" Version="5.0.0" />
|
||||||
<PackageReference Include="protobuf-net" Version="3.1.17" />
|
<PackageReference Include="protobuf-net" Version="3.1.17" />
|
||||||
<PackageReference Include="System.Runtime.Experimental" Version="6.0.2" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
namespace mbts.utils {
|
namespace mbts.utils {
|
||||||
static class ExceptionAssert {
|
static class ExceptionAssert {
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
namespace bts.utils {
|
namespace bts.utils {
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
public static class TupleExtensions {
|
public static class TupleExtensions {
|
||||||
public static (T1, T2, T3, T4) with<T1, T2, T3, T4>(this (T1, T2) tuple, T3 value3, T4 value4) =>
|
public static (T1, T2, T3, T4) with<T1, T2, T3, T4>(this (T1, T2) tuple, T3 value3, T4 value4) =>
|
||||||
@@ -36,5 +38,20 @@
|
|||||||
|
|
||||||
public static bool none(this (bool, bool, bool, bool) tuple) =>
|
public static bool none(this (bool, bool, bool, bool) tuple) =>
|
||||||
!tuple.any();
|
!tuple.any();
|
||||||
|
|
||||||
|
public static T sum<T>(this (T, T) vals) where T : IAdditionOperators<T, T, T> =>
|
||||||
|
vals.Item1 + vals.Item2;
|
||||||
|
|
||||||
|
public static (T, T) ordered<T>(this (T, T) vals, IComparer<T> comparer = null) where T : IComparable<T> {
|
||||||
|
comparer ??= Comparer<T>.Default;
|
||||||
|
return comparer.Compare(vals.Item1, vals.Item2) < 0 ?
|
||||||
|
(vals.Item2, vals.Item1) : vals;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static (T, T) ordered<T>(this (T, T) vals, out bool negated, IComparer<T> comparer = null) where T : IComparable<T> {
|
||||||
|
comparer ??= Comparer<T>.Default;
|
||||||
|
return (negated = comparer.Compare(vals.Item1, vals.Item2) > 0) ?
|
||||||
|
(vals.Item2, vals.Item1) : vals;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,6 +5,7 @@ namespace bts.utils {
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
public static class MathUtils {
|
public static class MathUtils {
|
||||||
public const double EPSILON = 1E-12;
|
public const double EPSILON = 1E-12;
|
||||||
@@ -14,7 +15,7 @@ namespace bts.utils {
|
|||||||
public static readonly IComparer<double> epsilon_comparer = new ErrorMarginComparer<double>(EPSILON);
|
public static readonly IComparer<double> epsilon_comparer = new ErrorMarginComparer<double>(EPSILON);
|
||||||
|
|
||||||
public static T abs_diff<T>(T x, T y)
|
public static T abs_diff<T>(T x, T y)
|
||||||
where T : ISubtractionOperators<T, T, T>, IComparisonOperators<T, T> =>
|
where T : ISubtractionOperators<T, T, T>, IComparisonOperators<T, T, bool> =>
|
||||||
x > y ? (x - y) : (y - x);
|
x > y ? (x - y) : (y - x);
|
||||||
|
|
||||||
public static IComparer<double> error_margin_comparer(double error_margin) =>
|
public static IComparer<double> error_margin_comparer(double error_margin) =>
|
||||||
@@ -36,14 +37,14 @@ namespace bts.utils {
|
|||||||
epsilon_equals(x, y, NormalNumericOps<T>.epsilon);
|
epsilon_equals(x, y, NormalNumericOps<T>.epsilon);
|
||||||
|
|
||||||
public static bool epsilon_equals<T>(T x, T y, T epsilon)
|
public static bool epsilon_equals<T>(T x, T y, T epsilon)
|
||||||
where T : ISubtractionOperators<T, T, T>, IComparisonOperators<T, T> =>
|
where T : ISubtractionOperators<T, T, T>, IComparisonOperators<T, T, bool> =>
|
||||||
abs_diff(x, y) < epsilon;
|
abs_diff(x, y) < epsilon;
|
||||||
|
|
||||||
public static bool marginal_equals(double x, double y) =>
|
public static bool marginal_equals(double x, double y) =>
|
||||||
marginal_equals(x, y, EPSILON);
|
marginal_equals(x, y, EPSILON);
|
||||||
|
|
||||||
public static bool marginal_equals<T>(T x, T y, T margin)
|
public static bool marginal_equals<T>(T x, T y, T margin)
|
||||||
where T : ISubtractionOperators<T, T, T>, IComparisonOperators<T, T> =>
|
where T : ISubtractionOperators<T, T, T>, IComparisonOperators<T, T, bool> =>
|
||||||
(x > y ? (x - y) : (y - x)) < margin;
|
(x > y ? (x - y) : (y - x)) < margin;
|
||||||
|
|
||||||
public static bool is_nan<T>(T value) where T : INumber<T> =>
|
public static bool is_nan<T>(T value) where T : INumber<T> =>
|
||||||
@@ -132,7 +133,7 @@ namespace bts.utils {
|
|||||||
public static T nan_diff<T>(T a, T b) where T : IFloatingPoint<T> =>
|
public static T nan_diff<T>(T a, T b) where T : IFloatingPoint<T> =>
|
||||||
T.IsNaN(a) ? -b : T.IsNaN(b) ? a : a - b;
|
T.IsNaN(a) ? -b : T.IsNaN(b) ? a : a - b;
|
||||||
|
|
||||||
public static bool is_within_range<T>(T value, T min, T max) where T : IComparisonOperators<T, T> =>
|
public static bool is_within_range<T>(T value, T min, T max) where T : IComparisonOperators<T, T, bool> =>
|
||||||
value >= min && value <= max;
|
value >= min && value <= max;
|
||||||
|
|
||||||
public static T weighted_average<T>(T x, T x_weight, T y, T y_weight) where T : IFloatingPoint<T> {
|
public static T weighted_average<T>(T x, T x_weight, T y, T y_weight) where T : IFloatingPoint<T> {
|
||||||
@@ -145,7 +146,7 @@ namespace bts.utils {
|
|||||||
return x + (y - x) * (x_weight / (x_weight + y_weight));
|
return x + (y - x) * (x_weight / (x_weight + y_weight));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static T within_range<T>(T value, T min, T max) where T : IComparisonOperators<T, T> {
|
public static T within_range<T>(T value, T min, T max) where T : IComparisonOperators<T, T, bool> {
|
||||||
if (value < min) {
|
if (value < min) {
|
||||||
return min;
|
return min;
|
||||||
}
|
}
|
||||||
@@ -156,7 +157,7 @@ namespace bts.utils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static T within_range<T>(
|
public static T within_range<T>(
|
||||||
T value, T? min = null, T? max = null) where T : struct, IComparisonOperators<T, T> {
|
T value, T? min = null, T? max = null) where T : struct, IComparisonOperators<T, T, bool> {
|
||||||
if (min.HasValue && value < min.Value) {
|
if (min.HasValue && value < min.Value) {
|
||||||
return min.Value;
|
return min.Value;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ namespace Spark.Core {
|
|||||||
using bts;
|
using bts;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
public class NumericCastConverter :
|
public class NumericCastConverter :
|
||||||
IConverter<int, int>,
|
IConverter<int, int>,
|
||||||
@@ -213,7 +214,7 @@ namespace Spark.Core {
|
|||||||
IConverter<T, double>,
|
IConverter<T, double>,
|
||||||
IConverter<T, float>,
|
IConverter<T, float>,
|
||||||
IConverter<T, decimal>
|
IConverter<T, decimal>
|
||||||
where T : INumber<T> {
|
where T : INumberBase<T> {
|
||||||
|
|
||||||
static readonly Func<T, short> _to_int16;
|
static readonly Func<T, short> _to_int16;
|
||||||
static readonly Func<T, ushort> _to_uint16;
|
static readonly Func<T, ushort> _to_uint16;
|
||||||
@@ -342,7 +343,9 @@ namespace Spark.Core {
|
|||||||
static decimal IConverter<T, decimal>.convert(T value) => _to_decimal(value);
|
static decimal IConverter<T, decimal>.convert(T value) => _to_decimal(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class NumericCastConverter<TIn, TOut> : IConverter<TIn, TOut> where TIn : INumber<TIn> where TOut : INumber<TOut> {
|
public class NumericCastConverter<TIn, TOut> : IConverter<TIn, TOut>
|
||||||
|
where TIn : INumberBase<TIn>
|
||||||
|
where TOut : INumberBase<TOut> {
|
||||||
static readonly Func<TIn, TOut> _convert;
|
static readonly Func<TIn, TOut> _convert;
|
||||||
|
|
||||||
static NumericCastConverter() {
|
static NumericCastConverter() {
|
||||||
|
|||||||
@@ -3,44 +3,45 @@ namespace bts.utils {
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Numerics;
|
||||||
|
|
||||||
public static class NumericExtensions {
|
public static class NumericExtensions {
|
||||||
public static TOut as_type<TOut>(this short value) where TOut : INumber<TOut> =>
|
public static TOut as_type<TOut>(this short value) where TOut : INumberBase<TOut> =>
|
||||||
as_type<short, TOut>(value);
|
as_type<short, TOut>(value);
|
||||||
|
|
||||||
public static TOut as_type<TOut>(this ushort value) where TOut : INumber<TOut> =>
|
public static TOut as_type<TOut>(this ushort value) where TOut : INumberBase<TOut> =>
|
||||||
as_type<ushort, TOut>(value);
|
as_type<ushort, TOut>(value);
|
||||||
|
|
||||||
public static TOut as_type<TOut>(this int value) where TOut : INumber<TOut> =>
|
public static TOut as_type<TOut>(this int value) where TOut : INumberBase<TOut> =>
|
||||||
as_type<int, TOut>(value);
|
as_type<int, TOut>(value);
|
||||||
|
|
||||||
public static TOut as_type<TOut>(this uint value) where TOut : INumber<TOut> =>
|
public static TOut as_type<TOut>(this uint value) where TOut : INumberBase<TOut> =>
|
||||||
as_type<uint, TOut>(value);
|
as_type<uint, TOut>(value);
|
||||||
|
|
||||||
public static TOut as_type<TOut>(this long value) where TOut : INumber<TOut> =>
|
public static TOut as_type<TOut>(this long value) where TOut : INumberBase<TOut> =>
|
||||||
as_type<long, TOut>(value);
|
as_type<long, TOut>(value);
|
||||||
|
|
||||||
public static TOut as_type<TOut>(this ulong value) where TOut : INumber<TOut> =>
|
public static TOut as_type<TOut>(this ulong value) where TOut : INumberBase<TOut> =>
|
||||||
as_type<ulong, TOut>(value);
|
as_type<ulong, TOut>(value);
|
||||||
|
|
||||||
public static TOut as_type<TOut>(this float value) where TOut : INumber<TOut> =>
|
public static TOut as_type<TOut>(this float value) where TOut : INumberBase<TOut> =>
|
||||||
as_type<float, TOut>(value);
|
as_type<float, TOut>(value);
|
||||||
|
|
||||||
public static TOut as_type<TOut>(this double value) where TOut : INumber<TOut> =>
|
public static TOut as_type<TOut>(this double value) where TOut : INumberBase<TOut> =>
|
||||||
as_type<double, TOut>(value);
|
as_type<double, TOut>(value);
|
||||||
|
|
||||||
public static TOut as_type<TIn, TOut>(this TIn value)
|
public static TOut as_type<TIn, TOut>(this TIn value)
|
||||||
where TIn : INumber<TIn>
|
where TIn : INumberBase<TIn>
|
||||||
where TOut : INumber<TOut> =>
|
where TOut : INumberBase<TOut> =>
|
||||||
NumericCastConverter<TIn, TOut>.convert(value);
|
NumericCastConverter<TIn, TOut>.convert(value);
|
||||||
|
|
||||||
public static T abs<T>(this T value) where T : INumber<T> =>
|
public static T abs<T>(this T value) where T : INumberBase<T> =>
|
||||||
T.Abs(value);
|
T.Abs(value);
|
||||||
|
|
||||||
public static bool is_nan<T>(this T value) where T : IFloatingPoint<T> =>
|
public static bool is_nan<T>(this T value) where T : INumberBase<T> =>
|
||||||
T.IsNaN(value);
|
T.IsNaN(value);
|
||||||
|
|
||||||
public static T if_nan<T>(this T d, T if_nan) where T : IFloatingPoint<T> =>
|
public static T if_nan<T>(this T d, T if_nan) where T : INumberBase<T> =>
|
||||||
d.is_nan() ? if_nan : d;
|
d.is_nan() ? if_nan : d;
|
||||||
|
|
||||||
public static bool is_int<T>(this T value) where T : IFloatingPoint<T> =>
|
public static bool is_int<T>(this T value) where T : IFloatingPoint<T> =>
|
||||||
@@ -71,15 +72,15 @@ namespace bts.utils {
|
|||||||
MathUtils.marginal_equals(x, y, margin);
|
MathUtils.marginal_equals(x, y, margin);
|
||||||
|
|
||||||
public static bool is_within_range<T>(
|
public static bool is_within_range<T>(
|
||||||
this T value, T min, T max) where T : IComparisonOperators<T, T> =>
|
this T value, T min, T max) where T : IComparisonOperators<T, T, bool> =>
|
||||||
MathUtils.is_within_range(value, min, max);
|
MathUtils.is_within_range(value, min, max);
|
||||||
|
|
||||||
public static T within_range<T>(
|
public static T within_range<T>(
|
||||||
this T value, T min, T max) where T : IComparisonOperators<T, T> =>
|
this T value, T min, T max) where T : IComparisonOperators<T, T, bool> =>
|
||||||
MathUtils.within_range(value, min, max);
|
MathUtils.within_range(value, min, max);
|
||||||
|
|
||||||
public static T within_range<T>(
|
public static T within_range<T>(
|
||||||
this T value, T? min = null, T? max = null) where T : struct, IComparisonOperators<T, T> =>
|
this T value, T? min = null, T? max = null) where T : struct, IComparisonOperators<T, T, bool> =>
|
||||||
MathUtils.within_range(value, min, max);
|
MathUtils.within_range(value, min, max);
|
||||||
|
|
||||||
public static bool is_real<T>(this T value) where T : IFloatingPoint<T> =>
|
public static bool is_real<T>(this T value) where T : IFloatingPoint<T> =>
|
||||||
@@ -118,7 +119,7 @@ namespace bts.utils {
|
|||||||
/// If only <paramref name="b"/> is real, returns <paramref name="b"/>.
|
/// If only <paramref name="b"/> is real, returns <paramref name="b"/>.
|
||||||
/// If neither term is real, returns NaN.
|
/// If neither term is real, returns NaN.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
public static T add_real<T>(this T a, T b) where T : IFloatingPoint<T> =>
|
public static T add_real<T>(this T a, T b) where T : IFloatingPointIeee754<T> =>
|
||||||
new[] { a, b }.sum_real(true);
|
new[] { a, b }.sum_real(true);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -129,7 +130,7 @@ namespace bts.utils {
|
|||||||
/// If only <paramref name="b"/> is real, returns -<paramref name="b"/>
|
/// If only <paramref name="b"/> is real, returns -<paramref name="b"/>
|
||||||
/// If neither term is real, returns NaN.
|
/// If neither term is real, returns NaN.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
public static T subtract_real<T>(this T a, T b) where T : IFloatingPoint<T> =>
|
public static T subtract_real<T>(this T a, T b) where T : IFloatingPointIeee754<T> =>
|
||||||
new[] { a, -b }.sum_real(true);
|
new[] { a, -b }.sum_real(true);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -187,7 +188,7 @@ namespace bts.utils {
|
|||||||
/// contains no real numbers
|
/// contains no real numbers
|
||||||
/// </param>
|
/// </param>
|
||||||
public static T sum_real<T>(this IEnumerable<T> values, bool nan_if_none = false)
|
public static T sum_real<T>(this IEnumerable<T> values, bool nan_if_none = false)
|
||||||
where T : IFloatingPoint<T> {
|
where T : IFloatingPointIeee754<T> {
|
||||||
return nan_if_none ? nan_if_none_impl() : normal_impl();
|
return nan_if_none ? nan_if_none_impl() : normal_impl();
|
||||||
|
|
||||||
T normal_impl() {
|
T normal_impl() {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<GeneratePackageOnBuild Condition="$(Configuration) == 'Release' or $(Configuration) == 'Release'">true</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild Condition="$(Configuration) == 'Release' or $(Configuration) == 'Release'">true</GeneratePackageOnBuild>
|
||||||
<PackageOutputPath>$(OutputPath)\net6.0</PackageOutputPath>
|
<PackageOutputPath>$(OutputPath)\net7.0</PackageOutputPath>
|
||||||
<IncludeSource>true</IncludeSource>
|
<IncludeSource>true</IncludeSource>
|
||||||
<IncludeSymbols>true</IncludeSymbols>
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
|
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
|
||||||
@@ -40,19 +40,19 @@
|
|||||||
<Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences" Condition=" '$(SparkRoot)' != '' ">
|
<Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences" Condition=" '$(SparkRoot)' != '' ">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
|
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
|
||||||
<BuildOutputInPackage Include="$(OutputPath)..\net6.0\libspark.dll" />
|
<BuildOutputInPackage Include="$(OutputPath)..\net7.0\libspark.dll" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<!-- deployed sdk build net6.0 -->
|
<!-- deployed sdk build net7.0 -->
|
||||||
<ItemGroup Condition=" '$(SparkRoot)' == '' and '$(TargetFramework)' == 'net6.0'">
|
<ItemGroup Condition=" '$(SparkRoot)' == '' and '$(TargetFramework)' == 'net7.0'">
|
||||||
<Reference Include="spark_api">
|
<Reference Include="spark_api">
|
||||||
<HintPath>..\..\lib\net6.0\spark_api.dll</HintPath>
|
<HintPath>..\..\lib\net7.0\spark_api.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Target Name="copy_lib_deployed" AfterTargets="PostBuildEvent" Condition=" '$(SparkRoot)' == '' ">
|
<Target Name="copy_lib_deployed" AfterTargets="PostBuildEvent" Condition=" '$(SparkRoot)' == '' ">
|
||||||
<Copy SourceFiles="..\..\lib\net6.0\libspark.dll" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
|
<Copy SourceFiles="..\..\lib\net7.0\libspark.dll" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -3,12 +3,17 @@ using bts.resources;
|
|||||||
using bts.test;
|
using bts.test;
|
||||||
using bts.utils;
|
using bts.utils;
|
||||||
using bts.utils.proto;
|
using bts.utils.proto;
|
||||||
|
|
||||||
|
using mbts;
|
||||||
using mbts.spark;
|
using mbts.spark;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
||||||
namespace bts.tests.security {
|
namespace bts.tests.security {
|
||||||
|
using RegionalTickFactors = mbts.user.settings.RegionalTickFactors;
|
||||||
|
|
||||||
static class TickTestHelper {
|
static class TickTestHelper {
|
||||||
public static IEnumerable<double> generate_test_prices(double tick_size, int radius = 200, double origin_price = 0) {
|
public static IEnumerable<double> generate_test_prices(double tick_size, int radius = 200, double origin_price = 0) {
|
||||||
Assert.That(radius > 0);
|
Assert.That(radius > 0);
|
||||||
@@ -29,54 +34,98 @@ namespace bts.tests.security {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IEnumerable<double> generate_test_prices(IEnumerable<double> price_base_set, IEnumerable<double> adjustments) =>
|
public static IEnumerable<double> generate_test_prices(IEnumerable<double> price_base_set, IEnumerable<double> adjustments) {
|
||||||
price_base_set.Concat(
|
price_base_set = price_base_set.Where(p => p < long.MaxValue && p > long.MinValue);
|
||||||
adjustments.SelectMany(a => price_base_set.Select(p => p + a)));
|
return price_base_set.Concat(
|
||||||
|
adjustments.SelectMany(
|
||||||
|
a => price_base_set
|
||||||
|
.Where(p => a > 0 ?
|
||||||
|
(long.MaxValue - p > a) :
|
||||||
|
(long.MinValue + a) < a)
|
||||||
|
.Select(p => p + a)));
|
||||||
|
}
|
||||||
|
|
||||||
public static IEnumerable<ContractSpecificationImmutable> read_contract_specs(string file_path) =>
|
public static IEnumerable<ContractSpecificationImmutable> read_contract_specs(string file_path) =>
|
||||||
StreamHelper.ReadProtos<ContractSpecification>(ResourceHelper.LoadResource(file_path)).Select(s => new ContractSpecificationImmutable(s));
|
StreamHelper.ReadProtos<ContractSpecification>(ResourceHelper.LoadResource(file_path)).Select(s => new ContractSpecificationImmutable(s));
|
||||||
|
|
||||||
public static int? full_ticks_from_zero(ContractSpecificationImmutable tick, double value) {
|
public static long? full_ticks_from_zero(ContractSpecificationImmutable tick, double value) =>
|
||||||
|
count_ticks(tick.LowTick, tick.HighTick, tick.PriceBreak, value);
|
||||||
|
|
||||||
|
public static long? count_ticks(RegionalTickFactors tick, double value) =>
|
||||||
|
count_ticks(
|
||||||
|
tick.low_tick.tick_unit / tick.low_tick.tick_base,
|
||||||
|
tick.high_tick.tick_unit / tick.high_tick.tick_base,
|
||||||
|
tick.low_tick_inclusive_end,
|
||||||
|
value);
|
||||||
|
|
||||||
|
public static long? count_ticks(double low_tick_sz, double high_tick_sz, double price_break, double value) {
|
||||||
if (!value.is_real())
|
if (!value.is_real())
|
||||||
return null;
|
return null;
|
||||||
if (MathUtils.marginal_equals(value, 0, TickUtils.precision_const<double>()))
|
if (MathUtils.marginal_equals(value, 0, TickUtils.precision_const<double>()))
|
||||||
return 0;
|
return 0;
|
||||||
bool low_tick_valid = tick.LowTick.is_real_positive();
|
bool low_tick_valid = low_tick_sz.is_real_positive();
|
||||||
bool high_tick_valid = tick.HighTick.is_real_positive();
|
bool high_tick_valid = high_tick_sz.is_real_positive();
|
||||||
if (low_tick_valid) {
|
if (!low_tick_valid || !high_tick_valid) {
|
||||||
if (high_tick_valid) {
|
if (high_tick_valid) {
|
||||||
if (value < 0) {
|
return count_ticks(value, high_tick_sz);
|
||||||
if (tick.PriceBreak > value) {
|
|
||||||
if (tick.PriceBreak >= 0) {
|
|
||||||
return (int)MathUtils.round_up(value / tick.LowTick, TickUtils.precision_const<double>());
|
|
||||||
} else {
|
|
||||||
var high_ticks = (int)MathUtils.round_up(tick.PriceBreak / tick.HighTick, TickUtils.precision_const<double>());
|
|
||||||
var low_ticks = (int)MathUtils.round_up((value - tick.PriceBreak) / tick.LowTick, TickUtils.precision_const<double>());
|
|
||||||
return high_ticks + low_ticks;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return (int)MathUtils.round_up(value / (tick.PriceBreak.is_real() ? tick.HighTick : tick.LowTick), TickUtils.precision_const<double>());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (tick.PriceBreak < value) {
|
|
||||||
if (tick.PriceBreak <= 0) {
|
|
||||||
return (int)MathUtils.round_down(value / tick.HighTick, TickUtils.precision_const<double>());
|
|
||||||
} else {
|
|
||||||
var low_ticks = (int)MathUtils.round_down(tick.PriceBreak / tick.LowTick, TickUtils.precision_const<double>());
|
|
||||||
var high_ticks = (int)MathUtils.round_down((value - tick.PriceBreak) / tick.HighTick, TickUtils.precision_const<double>());
|
|
||||||
return low_ticks + high_ticks;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return (int)MathUtils.round_down(value / (tick.PriceBreak.is_real() ? tick.LowTick : tick.HighTick), TickUtils.precision_const<double>());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return (int)MathUtils.round_down_abs(value / tick.LowTick, TickUtils.precision_const<double>());
|
|
||||||
}
|
}
|
||||||
} else if (high_tick_valid) {
|
return low_tick_valid ? count_ticks(value, low_tick_sz) : null;
|
||||||
return (int)MathUtils.round_down_abs(value / tick.HighTick, TickUtils.precision_const<double>());
|
}
|
||||||
} else {
|
|
||||||
return null;
|
// Both low and high ticks are valid
|
||||||
|
if (!price_break.is_real()) {
|
||||||
|
// Default to low_tick_sz if price_break isn't a factor
|
||||||
|
return count_ticks(value, low_tick_sz);
|
||||||
|
}
|
||||||
|
if (value < 0) {
|
||||||
|
if (price_break <= value) {
|
||||||
|
// price_break <= value < 0
|
||||||
|
return count_ticks(value, high_tick_sz);
|
||||||
|
}
|
||||||
|
if (price_break >= 0) {
|
||||||
|
// value < 0 <= price_break
|
||||||
|
return count_ticks(value, low_tick_sz);
|
||||||
|
}
|
||||||
|
// value < price_break < 0
|
||||||
|
return count_ticks(price_break, high_tick_sz)
|
||||||
|
+ count_ticks(value - price_break, low_tick_sz);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (price_break < value) {
|
||||||
|
if (price_break <= 0) {
|
||||||
|
// price_break <= 0 < value
|
||||||
|
return count_ticks(value, high_tick_sz);
|
||||||
|
}
|
||||||
|
// 0 < price_break < value
|
||||||
|
return count_ticks(price_break, low_tick_sz)
|
||||||
|
+ count_ticks(value - price_break, high_tick_sz);
|
||||||
|
}
|
||||||
|
// 0 < value <= price_break
|
||||||
|
return count_ticks(value, low_tick_sz);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static long count_ticks(double value, double tick_sz) {
|
||||||
|
Log.assert(tick_sz.is_real_positive());
|
||||||
|
Log.assert(value.is_real());
|
||||||
|
return value < 0 ?
|
||||||
|
-count_positive_ticks(-value, tick_sz) :
|
||||||
|
count_positive_ticks(value, tick_sz);
|
||||||
|
|
||||||
|
static long count_positive_ticks(double value, double tick_sz) {
|
||||||
|
Log.assert(tick_sz.is_real_positive());
|
||||||
|
Log.assert(value.is_real_positive());
|
||||||
|
if (value == 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
var n = (long)Math.Floor(value / tick_sz);
|
||||||
|
Log.assert(n >= 0);
|
||||||
|
var rounded_val = n * tick_sz;
|
||||||
|
var diff = value - rounded_val;
|
||||||
|
Log.assert(diff >= 0);
|
||||||
|
if (diff >= tick_sz / 2) {
|
||||||
|
n++;
|
||||||
|
}
|
||||||
|
return n;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,6 +160,21 @@ namespace bts.tests.security {
|
|||||||
return partial_tick;
|
return partial_tick;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Determines if the first tick in the specified direction should be a partial tick (to correct a rounding discrepency).
|
||||||
|
/// If this is so, it asserts that ticking up/down once in that direction corrects the rounding discrepency as expected.
|
||||||
|
/// </summary>
|
||||||
|
public static int check_partial_tick(
|
||||||
|
RegionalTickFactors tick, double value, double rounded_value, bool ticking_up) {
|
||||||
|
var partial_tick = count_partial_tick(value, rounded_value, ticking_up);
|
||||||
|
if (partial_tick != 0)
|
||||||
|
Assert.That(MathUtils.marginal_equals(
|
||||||
|
tick.tickup(value, ticking_up ? partial_tick : -partial_tick),
|
||||||
|
rounded_value,
|
||||||
|
TickUtils.precision_const<double>()));
|
||||||
|
return partial_tick;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Determines if the first tick in the specified direction should be a partial tick (to correct a rounding discrepency).
|
/// Determines if the first tick in the specified direction should be a partial tick (to correct a rounding discrepency).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.test;
|
using bts.test;
|
||||||
using bts.utils;
|
using bts.utils;
|
||||||
|
|
||||||
using mbts;
|
using mbts;
|
||||||
using mbts.spark;
|
using mbts.spark;
|
||||||
using mbts.user.settings;
|
using mbts.user.settings;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -30,7 +32,7 @@ namespace bts.tests.security {
|
|||||||
// Hide leading zeros (with positive tick)
|
// Hide leading zeros (with positive tick)
|
||||||
res = tf.format(1.25, settings.with(pad_with_leading_zeros: false));
|
res = tf.format(1.25, settings.with(pad_with_leading_zeros: false));
|
||||||
Assert.IsTrue(res == "1.25");
|
Assert.IsTrue(res == "1.25");
|
||||||
|
|
||||||
// Test with a non-decimal tick type: quarters of quarters of eigths
|
// Test with a non-decimal tick type: quarters of quarters of eigths
|
||||||
tf = new TickFactors(3200, 25);
|
tf = new TickFactors(3200, 25);
|
||||||
// Show leading zeros
|
// Show leading zeros
|
||||||
@@ -47,7 +49,7 @@ namespace bts.tests.security {
|
|||||||
res = tf.format(1D + 100.0 / 3200.0, settings.with(pad_with_leading_zeros: false));
|
res = tf.format(1D + 100.0 / 3200.0, settings.with(pad_with_leading_zeros: false));
|
||||||
Assert.IsTrue(res == "1-100");
|
Assert.IsTrue(res == "1-100");
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void test_show_zero_integer() {
|
public void test_show_zero_integer() {
|
||||||
var settings = TickDisplaySettings.Default;
|
var settings = TickDisplaySettings.Default;
|
||||||
@@ -79,44 +81,44 @@ namespace bts.tests.security {
|
|||||||
// The 'show_zero_integer' setting should bear no effect.
|
// The 'show_zero_integer' setting should bear no effect.
|
||||||
res = tf.format(-1.25, settings.with(show_zero_integer: false));
|
res = tf.format(-1.25, settings.with(show_zero_integer: false));
|
||||||
Assert.IsTrue(res == "-1.25");
|
Assert.IsTrue(res == "-1.25");
|
||||||
|
|
||||||
// Test with a non-decimal tick type: quarters of quarters of eigths
|
// Test with a non-decimal tick type: quarters of quarters of eigths
|
||||||
tf = new TickFactors(3200, 25);
|
tf = new TickFactors(3200, 25);
|
||||||
// Hide zero integer (with positive tick)
|
// Hide zero integer (with positive tick)
|
||||||
res = tf.format(25.0/3200.0, settings.with(show_zero_integer: false));
|
res = tf.format(25.0 / 3200.0, settings.with(show_zero_integer: false));
|
||||||
Assert.IsTrue(res == "0025");
|
Assert.IsTrue(res == "0025");
|
||||||
// Hide zero integer (with positive integer, non-zero tick).
|
// Hide zero integer (with positive integer, non-zero tick).
|
||||||
// The 'show_zero_integer' setting should bear no effect.
|
// The 'show_zero_integer' setting should bear no effect.
|
||||||
res = tf.format(1 + 25.0/3200.0, settings.with(show_zero_integer: false));
|
res = tf.format(1 + 25.0 / 3200.0, settings.with(show_zero_integer: false));
|
||||||
Assert.IsTrue(res == "1-0025");
|
Assert.IsTrue(res == "1-0025");
|
||||||
|
|
||||||
// Hide zero integer (with negative tick)
|
// Hide zero integer (with negative tick)
|
||||||
res = tf.format(-25.0/3200.0, settings.with(show_zero_integer: false));
|
res = tf.format(-25.0 / 3200.0, settings.with(show_zero_integer: false));
|
||||||
Assert.IsTrue(res == "-0025");
|
Assert.IsTrue(res == "-0025");
|
||||||
// Hide zero integer (with negative tick, non-zero integer).
|
// Hide zero integer (with negative tick, non-zero integer).
|
||||||
// The 'show_zero_integer' setting should bear no effect.
|
// The 'show_zero_integer' setting should bear no effect.
|
||||||
res = tf.format(-1 - 25.0/3200.0, settings.with(show_zero_integer: false));
|
res = tf.format(-1 - 25.0 / 3200.0, settings.with(show_zero_integer: false));
|
||||||
Assert.IsTrue(res == "-1-0025");
|
Assert.IsTrue(res == "-1-0025");
|
||||||
|
|
||||||
// Hide zero integer (with negative tick), and hide leading zeros
|
// Hide zero integer (with negative tick), and hide leading zeros
|
||||||
res = tf.format(-25.0/3200.0, settings.with(show_zero_integer: false, pad_with_leading_zeros: false));
|
res = tf.format(-25.0 / 3200.0, settings.with(show_zero_integer: false, pad_with_leading_zeros: false));
|
||||||
Assert.IsTrue(res == "-25");
|
Assert.IsTrue(res == "-25");
|
||||||
// Hide zero integer (with negative integer, non-zero tick), and hide leading zeros.
|
// Hide zero integer (with negative integer, non-zero tick), and hide leading zeros.
|
||||||
// The 'show_zero_integer' setting should bear no effect.
|
// The 'show_zero_integer' setting should bear no effect.
|
||||||
res = tf.format(-1 - 25.0/3200.0, settings.with(show_zero_integer: false, pad_with_leading_zeros: false));
|
res = tf.format(-1 - 25.0 / 3200.0, settings.with(show_zero_integer: false, pad_with_leading_zeros: false));
|
||||||
Assert.IsTrue(res == "-1-25");
|
Assert.IsTrue(res == "-1-25");
|
||||||
|
|
||||||
// Hide zero integer (with negative tick)
|
// Hide zero integer (with negative tick)
|
||||||
res = tf.format(-25.0/3200.0, settings.with(show_zero_integer: false));
|
res = tf.format(-25.0 / 3200.0, settings.with(show_zero_integer: false));
|
||||||
// This isn't pretty, but it's logical: a negative number,
|
// This isn't pretty, but it's logical: a negative number,
|
||||||
// greater than -1, in tick form.
|
// greater than -1, in tick form.
|
||||||
Assert.IsTrue(res == "-0025");
|
Assert.IsTrue(res == "-0025");
|
||||||
// Hide zero integer (with negative tick), and hide leading zeros
|
// Hide zero integer (with negative tick), and hide leading zeros
|
||||||
res = tf.format(-25.0/3200.0, settings.with(show_zero_integer: false, pad_with_leading_zeros: false));
|
res = tf.format(-25.0 / 3200.0, settings.with(show_zero_integer: false, pad_with_leading_zeros: false));
|
||||||
// Should be the same as above, except without the leading zeros in the tick part.
|
// Should be the same as above, except without the leading zeros in the tick part.
|
||||||
Assert.IsTrue(res == "-25");
|
Assert.IsTrue(res == "-25");
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void test_tick_increment() {
|
public void test_tick_increment() {
|
||||||
var from_sec_files = SecurityFiles.all().SelectMany(SecurityTestHelper.read_securities).Select(s => s.ContractSpec);
|
var from_sec_files = SecurityFiles.all().SelectMany(SecurityTestHelper.read_securities).Select(s => s.ContractSpec);
|
||||||
@@ -146,26 +148,29 @@ namespace bts.tests.security {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _test_tick_increment(ContractSpecificationImmutable tick, IEnumerable<double> prices) {
|
void _test_tick_increment(ContractSpecificationImmutable tick, IEnumerable<double> prices) {
|
||||||
Assert.That(!(tick.LowTick < 0));
|
_test_tick_increment(TickUtils.get_regional_ticks(tick), prices);
|
||||||
Assert.That(!(tick.HighTick < 0));
|
}
|
||||||
|
|
||||||
|
void _test_tick_increment(RegionalTickFactors tick, IEnumerable<double> prices) {
|
||||||
|
var low_tick_sz = tick.low_tick.tick_unit_frac();
|
||||||
|
var high_tick_sz = tick.high_tick.tick_unit_frac();
|
||||||
|
Assert.That(!(low_tick_sz < 0));
|
||||||
|
Assert.That(!(high_tick_sz < 0));
|
||||||
|
var price_break = tick.low_tick_inclusive_end;
|
||||||
foreach (var p in prices) {
|
foreach (var p in prices) {
|
||||||
var expected_ticks_from_zero = TickTestHelper.full_ticks_from_zero(tick, p);
|
var expected_ticks_from_zero = TickTestHelper.count_ticks(tick, p);
|
||||||
var actual_ticks_from_zero = TickUtils.full_ticks_from_zero(tick, p);
|
var actual_ticks_from_zero = TickUtils.count_ticks(tick, p);
|
||||||
if (expected_ticks_from_zero != actual_ticks_from_zero) {
|
|
||||||
expected_ticks_from_zero = TickTestHelper.full_ticks_from_zero(tick, p);
|
|
||||||
actual_ticks_from_zero = TickUtils.full_ticks_from_zero(tick, p);
|
|
||||||
}
|
|
||||||
Assert.That(expected_ticks_from_zero == actual_ticks_from_zero,
|
Assert.That(expected_ticks_from_zero == actual_ticks_from_zero,
|
||||||
$"Expected ticks from zero to be '{expected_ticks_from_zero}', actually '{actual_ticks_from_zero}' " +
|
$"Expected ticks from zero to be '{expected_ticks_from_zero}', actually '{actual_ticks_from_zero}' " +
|
||||||
$"(low/high/pricebreak: {tick.LowTick}/{tick.HighTick}/{tick.PriceBreak}, price: {p}).");
|
$"(low/high/pricebreak: {tick.low_tick}/{tick.high_tick}/{price_break}, price: {p}).");
|
||||||
if (expected_ticks_from_zero.HasValue) {
|
if (expected_ticks_from_zero.HasValue) {
|
||||||
Assert.That(p.is_real());
|
Assert.That(p.is_real());
|
||||||
_test_tick_increment(tick, p - 1, p);
|
_test_tick_increment(tick, p - 1, p);
|
||||||
if (tick.PriceBreak.is_real() && tick.PriceBreak != double.MaxValue && tick.PriceBreak != double.MinValue) {
|
if (price_break.is_real() && price_break != double.MaxValue && price_break != double.MinValue) {
|
||||||
// test both sides of the break with a few adjustments
|
// test both sides of the break with a few adjustments
|
||||||
foreach (var adjustment in new[] { 1, tick.LowTick, tick.HighTick }) {
|
foreach (var adjustment in new[] { 1, low_tick_sz, high_tick_sz }) {
|
||||||
_test_tick_increment(tick, p, tick.PriceBreak + adjustment);
|
_test_tick_increment(tick, p, price_break + adjustment);
|
||||||
_test_tick_increment(tick, p, tick.PriceBreak - adjustment);
|
_test_tick_increment(tick, p, price_break - adjustment);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -190,6 +195,50 @@ namespace bts.tests.security {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _test_tick_increment(RegionalTickFactors tick, double from, double to) {
|
||||||
|
if (!from.is_real() || !to.is_real())
|
||||||
|
return;
|
||||||
|
var (min, max) = MathUtils.get_outliers(from, to);
|
||||||
|
var price_break = tick.low_tick_inclusive_end;
|
||||||
|
var low_tick_sz = tick.low_tick.tick_unit / tick.low_tick.tick_base;
|
||||||
|
var high_tick_sz = tick.high_tick.tick_unit / tick.high_tick.tick_base;
|
||||||
|
if (price_break.is_real()) {
|
||||||
|
if (min >= price_break) {
|
||||||
|
_test_tick_increment(tick, high_tick_sz, min, max);
|
||||||
|
} else if (max <= price_break) {
|
||||||
|
_test_tick_increment(tick, low_tick_sz, min, max);
|
||||||
|
} else {
|
||||||
|
_test_tick_increment_across_break(tick, min, max);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
_test_tick_increment(tick, low_tick_sz, min, max);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _test_tick_increment_across_break(RegionalTickFactors tick, double min, double max) {
|
||||||
|
var price_break = tick.low_tick_inclusive_end;
|
||||||
|
var low_tick_sz = tick.low_tick.tick_unit / tick.low_tick.tick_base;
|
||||||
|
var high_tick_sz = tick.high_tick.tick_unit / tick.high_tick.tick_base;
|
||||||
|
Assert.That(min < price_break);
|
||||||
|
Assert.That(max > price_break);
|
||||||
|
// 2 tick counts are used to determine the number of ticks between min and max,
|
||||||
|
// 1) number of ticks from min to the price break
|
||||||
|
// 2) number of ticks from the price break to max
|
||||||
|
// if either min/max is beyond epsilon away from a real tick,
|
||||||
|
// a partial tick is used to correct the rounding error.
|
||||||
|
Assert.That(TickTestHelper.round_ticks(low_tick_sz, price_break - min, out var rounded_min, out var min_ticks_to_break));
|
||||||
|
Assert.That(TickTestHelper.round_ticks(high_tick_sz, max - price_break, out var rounded_max, out var max_ticks_to_break));
|
||||||
|
rounded_min = price_break - rounded_min;
|
||||||
|
rounded_max = price_break + rounded_max;
|
||||||
|
int min_partial_tick = TickTestHelper.check_partial_tick(tick, min, rounded_min, true);
|
||||||
|
int max_partial_tick = TickTestHelper.check_partial_tick(tick, max, rounded_max, false);
|
||||||
|
// assert that ticking up/down between min/max behaves expectedly.
|
||||||
|
var batch_tick_up_result = tick.tickup(min, min_ticks_to_break + max_ticks_to_break + min_partial_tick);
|
||||||
|
Assert.That(MathUtils.marginal_equals(batch_tick_up_result, rounded_max, TickUtils.precision_const<double>()));
|
||||||
|
var batch_tick_down_result = tick.tickdown(max, min_ticks_to_break + max_ticks_to_break + max_partial_tick);
|
||||||
|
Assert.That(MathUtils.marginal_equals(batch_tick_down_result, rounded_min, TickUtils.precision_const<double>()));
|
||||||
|
}
|
||||||
|
|
||||||
void _test_tick_increment_across_break(ContractSpecificationImmutable spec, double min, double max) {
|
void _test_tick_increment_across_break(ContractSpecificationImmutable spec, double min, double max) {
|
||||||
Assert.That(min < spec.PriceBreak);
|
Assert.That(min < spec.PriceBreak);
|
||||||
Assert.That(max > spec.PriceBreak);
|
Assert.That(max > spec.PriceBreak);
|
||||||
@@ -222,5 +271,19 @@ namespace bts.tests.security {
|
|||||||
Assert.That(MathUtils.marginal_equals(rounded_max, spec.tickup(min, full_ticks + min_partial_tick), TickUtils.precision_const<double>()));
|
Assert.That(MathUtils.marginal_equals(rounded_max, spec.tickup(min, full_ticks + min_partial_tick), TickUtils.precision_const<double>()));
|
||||||
Assert.That(MathUtils.marginal_equals(rounded_min, spec.tickup(max, -(full_ticks + max_partial_tick)), TickUtils.precision_const<double>()));
|
Assert.That(MathUtils.marginal_equals(rounded_min, spec.tickup(max, -(full_ticks + max_partial_tick)), TickUtils.precision_const<double>()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _test_tick_increment(RegionalTickFactors tick, double tick_size, double min, double max) {
|
||||||
|
// min round/partial tick
|
||||||
|
Assert.That(TickTestHelper.round_ticks(tick_size, min, out var rounded_min, out var rounded_min_ticks));
|
||||||
|
var min_partial_tick = TickTestHelper.check_partial_tick(tick, min, rounded_min, true);
|
||||||
|
// max round/partial tick
|
||||||
|
Assert.That(TickTestHelper.round_ticks(tick_size, max, out var rounded_max, out var rounded_max_ticks));
|
||||||
|
var max_partial_tick = TickTestHelper.check_partial_tick(tick, max, rounded_max, false);
|
||||||
|
var full_ticks = rounded_max_ticks - rounded_min_ticks;
|
||||||
|
Assert.That(MathUtils.marginal_equals(rounded_max, tick.tickup(min, full_ticks + min_partial_tick), TickUtils.precision_const<double>()));
|
||||||
|
if (!MathUtils.marginal_equals(rounded_min, tick.tickup(max, -(full_ticks + max_partial_tick)), TickUtils.precision_const<double>())) {
|
||||||
|
Assert.That(MathUtils.marginal_equals(rounded_min, tick.tickup(max, -(full_ticks + max_partial_tick)), TickUtils.precision_const<double>()));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<Platforms>x64</Platforms>
|
<Platforms>x64</Platforms>
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
Loaded 100 of 166 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user