From 52c64593cfa4d956d1f2d269f345bfa3e590bf73 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 10 Oct 2017 16:38:24 -0400 Subject: [PATCH 1/3] name changes --- .../spreader_orders/SpreaderOrder.cpp | 14 +++---- .../orderman/spreader_orders/SpreaderOrder.h | 2 +- src/server/sparkd/spreader/SimpleSpreader.cpp | 12 +++--- src/server/sparkd/spreader/SimpleSpreader.h | 2 +- .../spreader/SpreaderOrderUpdateMessage.h | 40 +++++++++++++------ 5 files changed, 42 insertions(+), 28 deletions(-) diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp index 4f9d9cf36..1f56b1061 100644 --- a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.cpp @@ -252,7 +252,7 @@ void SpreaderOrder::on_time(TimeStamp const&) void SpreaderOrder::on_child_update(OrderKey orderkey, api::orderman::OrderStatus status, Quantity filled_quantity, - Price avg_price, + Price average_price, std::string const *error_msg) { using namespace bts::spreader; @@ -260,7 +260,7 @@ void SpreaderOrder::on_child_update(OrderKey orderkey, LOG(OrderMan,Diag, "on_child_update SpreaderOrder." "k: {} status: {} filled_qty: {} avg_price: {} reject_msg: {}", - orderkey.value(), status, filled_quantity.value(), avg_price.value(), error_msg ? empty:*error_msg); + orderkey.value(), status, filled_quantity.value(), average_price.value(), error_msg ? empty:*error_msg); if (_state == State::START) bts_assert(false); else if (_state == State::WAITING_FOR_FIRST_CONNECT) @@ -275,7 +275,7 @@ void SpreaderOrder::on_child_update(OrderKey orderkey, if (q_leg_data_ptr != NULL) { SpreaderBookkeepingData::LegData& q_leg_data = *(q_leg_data_ptr); - SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, avg_price, q_leg_data.filled_quantity, q_leg_data.avergage_filled_price); + SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, average_price, q_leg_data.filled_quantity, q_leg_data.avergage_filled_price); _handle_quoter_order_update(q_leg_data, update_message); } else @@ -284,7 +284,7 @@ void SpreaderOrder::on_child_update(OrderKey orderkey, SpreaderBookkeepingData::HedgerData* hedger_data = _bookkeeping_data->find_hedger_from_orderkey(orderkey); if (hedger_data != NULL) { - SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, avg_price, hedger_data->filled_quantity, hedger_data->avergage_filled_price); + SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, average_price, hedger_data->filled_quantity, hedger_data->avergage_filled_price); hedger_data->update_fill(filled_quantity); hedger_data->hedger.update_order_state(update_message); } @@ -298,7 +298,7 @@ void SpreaderOrder::on_child_update(OrderKey orderkey, if (q_leg_data_ptr != NULL) { SpreaderBookkeepingData::LegData& q_leg_data = *(q_leg_data_ptr); - SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, avg_price, q_leg_data.filled_quantity, q_leg_data.avergage_filled_price); + SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, average_price, q_leg_data.filled_quantity, q_leg_data.avergage_filled_price); q_leg_data_ptr->quoter->update_order_status(update_message); } else @@ -306,7 +306,7 @@ void SpreaderOrder::on_child_update(OrderKey orderkey, SpreaderBookkeepingData::HedgerData* hedger_data = _bookkeeping_data->find_hedger_from_orderkey(orderkey); if (hedger_data != NULL) { - SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, avg_price, hedger_data->filled_quantity, hedger_data->avergage_filled_price); + SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, average_price, hedger_data->filled_quantity, hedger_data->avergage_filled_price); hedger_data->update_fill(filled_quantity); hedger_data->hedger.update_order_state(update_message); } @@ -410,7 +410,7 @@ void SpreaderOrder::_handle_quoter_order_update(SpreaderBookkeepingData::LegData if (update_message.update_fill_price_quantity(this_fill_quantity, this_fill_price)) { leg_data.filled_quantity = update_message.filled_quantity; - leg_data.avergage_filled_price = update_message.avg_price; + leg_data.avergage_filled_price = update_message.average_price; for (size_t idx = 0; idx < _bookkeeping_data->count(); idx++) { if (idx != leg_data.leg_property_data.leg_index) diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h index 5c1c42471..c902a63eb 100644 --- a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h @@ -71,7 +71,7 @@ public: void on_child_update(OrderKey child_k, api::orderman::OrderStatus , Quantity filled_quantity, - Price avg_price, + Price average_price, std::string const *reject); // called when an external error occurs (which could be a risk limit // breach or a system issue) diff --git a/src/server/sparkd/spreader/SimpleSpreader.cpp b/src/server/sparkd/spreader/SimpleSpreader.cpp index ece831c63..b8a73d14e 100644 --- a/src/server/sparkd/spreader/SimpleSpreader.cpp +++ b/src/server/sparkd/spreader/SimpleSpreader.cpp @@ -160,7 +160,7 @@ namespace spreader void SimpleSpreader::on_child_order_update(orderman::OrderKey orderkey, api::orderman::OrderStatus status, Quantity filled_quantity, - Price avg_price, + Price average_price, std::string const *error_msg) { if (_state == State::START) @@ -177,7 +177,7 @@ namespace spreader if (q_leg_data_ptr != NULL) { SpreaderBookkeepingData::LegData& q_leg_data = *(q_leg_data_ptr); - SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, avg_price, q_leg_data.filled_quantity, q_leg_data.avergage_filled_price); + SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, average_price, q_leg_data.filled_quantity, q_leg_data.avergage_filled_price); _handle_quoter_order_update(q_leg_data, update_message); } else @@ -186,7 +186,7 @@ namespace spreader SpreaderBookkeepingData::HedgerData* hedger_data = _bookkeeping_data->find_hedger_from_orderkey(orderkey); if (hedger_data != NULL) { - SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, avg_price, hedger_data->filled_quantity, hedger_data->avergage_filled_price); + SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, average_price, hedger_data->filled_quantity, hedger_data->avergage_filled_price); hedger_data->update_fill(filled_quantity); hedger_data->hedger.update_order_state(update_message); } @@ -200,7 +200,7 @@ namespace spreader if (q_leg_data_ptr != NULL) { SpreaderBookkeepingData::LegData& q_leg_data = *(q_leg_data_ptr); - SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, avg_price, q_leg_data.filled_quantity, q_leg_data.avergage_filled_price); + SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, average_price, q_leg_data.filled_quantity, q_leg_data.avergage_filled_price); q_leg_data_ptr->quoter->update_order_status(update_message); } else @@ -208,7 +208,7 @@ namespace spreader SpreaderBookkeepingData::HedgerData* hedger_data = _bookkeeping_data->find_hedger_from_orderkey(orderkey); if (hedger_data != NULL) { - SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, avg_price, hedger_data->filled_quantity, hedger_data->avergage_filled_price); + SpreaderOrderUpdateMessage update_message(orderkey, status, filled_quantity, average_price, hedger_data->filled_quantity, hedger_data->avergage_filled_price); hedger_data->update_fill(filled_quantity); hedger_data->hedger.update_order_state(update_message); } @@ -342,7 +342,7 @@ namespace spreader if (update_message.update_fill_price_quantity (this_fill_quantity, this_fill_price)) { leg_data.filled_quantity = update_message.filled_quantity; - leg_data.avergage_filled_price = update_message.avg_price; + leg_data.avergage_filled_price = update_message.average_price; for (size_t idx = 0; idx < _bookkeeping_data->count(); idx++) { if (idx != leg_data.leg_property_data.leg_index) diff --git a/src/server/sparkd/spreader/SimpleSpreader.h b/src/server/sparkd/spreader/SimpleSpreader.h index 68e1b447c..261d56bc0 100644 --- a/src/server/sparkd/spreader/SimpleSpreader.h +++ b/src/server/sparkd/spreader/SimpleSpreader.h @@ -39,7 +39,7 @@ namespace spreader void on_child_order_update(orderman::OrderKey orderkey, api::orderman::OrderStatus status, Quantity filled_quantity, - Price avg_price, + Price average_price, std::string const *error_msg_arg) override; void on_time(const TimeStamp&) override; void on_user_update(const SpreaderUpdate&) override; diff --git a/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h b/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h index 1135ea564..1ee02f071 100644 --- a/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h +++ b/src/server/sparkd/spreader/SpreaderOrderUpdateMessage.h @@ -19,11 +19,11 @@ public: // original order_state passed from the engine infrastructure // (do not cache it) const orderman::OrderKey key; - const api::orderman::OrderStatus status; - const Quantity filled_quantity; - const Price avg_price; - const Quantity previous_filled_quantity; - const Price previous_avg_price; + api::orderman::OrderStatus status; + Quantity filled_quantity; + Price average_price; + Quantity last_update_filled_quantity; + Price last_update_average_price; //std::string const *error_msg; SpreaderOrderUpdateMessage(orderman::OrderKey orderkey_arg, api::orderman::OrderStatus status_arg, @@ -36,9 +36,9 @@ public: key(orderkey_arg), status(status_arg), filled_quantity(filled_quantity_arg), - avg_price(avg_price_arg), - previous_filled_quantity(previous_filled_quantity_arg), - previous_avg_price(previous_avg_price_arg) + average_price(avg_price_arg), + last_update_filled_quantity(previous_filled_quantity_arg), + last_update_average_price(previous_avg_price_arg) //error_msg(error_msg_arg) { } bool terminal_status() const { return SpreaderUtils::order_in_terminal_state(status); } @@ -47,16 +47,30 @@ public: bool has_fills() const { - return filled_quantity.value() != previous_filled_quantity.value(); + return filled_quantity.value() != last_update_filled_quantity.value(); + } + + void update(api::orderman::OrderStatus status_arg, + Quantity filled_quantity_arg, + Price average_price_arg, + std::string const *) + { + status = status_arg; + bts_assert(filled_quantity_arg.value() >= filled_quantity.value()); + last_update_filled_quantity = Quantity(filled_quantity_arg.value() - filled_quantity.value()); + if (last_update_filled_quantity.value() > 0) + last_update_average_price = Price((average_price_arg.value() * filled_quantity_arg.value() - average_price.value() * filled_quantity.value()) / last_update_filled_quantity.value()); + filled_quantity = filled_quantity_arg; + average_price = average_price_arg; } bool update_fill_price_quantity(Quantity& this_fill_quantity, Price& this_fill_price) const { - if (filled_quantity.value() != previous_filled_quantity.value()) + if (filled_quantity.value() != last_update_filled_quantity.value()) { - bts_assert(filled_quantity.value() > previous_filled_quantity.value()); - this_fill_quantity = Quantity(filled_quantity.value() - previous_filled_quantity.value()); - double this_price = (avg_price.value()*filled_quantity.value() - previous_avg_price.value()*previous_filled_quantity.value()) / this_fill_quantity.value(); + bts_assert(filled_quantity.value() > last_update_filled_quantity.value()); + this_fill_quantity = Quantity(filled_quantity.value() - last_update_filled_quantity.value()); + double this_price = (average_price.value()*filled_quantity.value() - last_update_average_price.value()*last_update_filled_quantity.value()) / this_fill_quantity.value(); this_fill_price = Price(this_price); return true; } From 9e092cd39745a7382ce3684bed4b42d548cf6c2f Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 10 Oct 2017 16:39:17 -0400 Subject: [PATCH 2/3] merge --- externals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals b/externals index 0a9535b0a..1884a761e 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 0a9535b0a257ceeb105dc2bb0848223a37f51345 +Subproject commit 1884a761e4a0296b59c6801ec7e62acca4d22997 From b9a97b9069053df907afec691e03cc14829e989a Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 10 Oct 2017 17:07:17 -0400 Subject: [PATCH 3/3] spark-182 Ladder Header formatting --- src/client/spark/mspark/Ladder/LadderVM.cs | 8 ++--- .../spark/mspark/Ladder/LadderView.xaml | 34 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/client/spark/mspark/Ladder/LadderVM.cs b/src/client/spark/mspark/Ladder/LadderVM.cs index 7e8d516d8..1939e7c98 100644 --- a/src/client/spark/mspark/Ladder/LadderVM.cs +++ b/src/client/spark/mspark/Ladder/LadderVM.cs @@ -39,7 +39,7 @@ namespace mbts.spark { _high = backing(nameof(high), ""); _low = backing(nameof(low), ""); _change = backing(nameof(change), ""); - _last = backing(nameof(last), ""); + _open = backing(nameof(open), ""); _volume = backing(nameof(volume), 0ul); // calculator @@ -95,10 +95,10 @@ namespace mbts.spark { var spec = security.ContractSpec; _high.set(spec.format(md.session_high)); _low.set(spec.format(md.session_low)); + _open.set(spec.format(md.open_price)); ulong unused = 0; md.get_last_trade(ref unused, out NativePriceSize last, out DateTime time, out ulong volume); _change.set(spec.format(last.price - md.settlement_price)); - _last.set(spec.format(last.price)); _volume.set(volume); } } @@ -111,8 +111,8 @@ namespace mbts.spark { Property _change; public string change => _change.Value; - Property _last; - public string last => _last.Value; + Property _open; + public string open => _open.Value; Property _volume; public ulong volume => _volume.Value; diff --git a/src/client/spark/mspark/Ladder/LadderView.xaml b/src/client/spark/mspark/Ladder/LadderView.xaml index 973ebd010..3df56cd2d 100644 --- a/src/client/spark/mspark/Ladder/LadderView.xaml +++ b/src/client/spark/mspark/Ladder/LadderView.xaml @@ -54,34 +54,32 @@ - - - - + + + + - - + + + - - - - - - + + + + + + + + +