From dffb9018da52c2f586da142b76b98459ee5a36c8 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Wed, 31 Jul 2019 15:46:07 -0400 Subject: [PATCH] join works --- src/client/spark_excel/algo_example.xlsm | Bin 18109 -> 18087 bytes .../functions/bts/SparkAlgoFunctions.cs | 24 +----- src/sdk/examples/ExcelAlgoTemplate.cpp | 26 +++++- src/sdk/examples/excel_plugin_example.cpp | 79 ++++++++++-------- 4 files changed, 69 insertions(+), 60 deletions(-) diff --git a/src/client/spark_excel/algo_example.xlsm b/src/client/spark_excel/algo_example.xlsm index 53b4bfdcab91560825e2d31ad88de4490146f1df..ddf620ee80f6696adc38c3ef99b9a6aebfb49127 100644 GIT binary patch delta 9750 zcmZ8nWl$YVvc0%VaCdiicL@;OEx0?u!o`CJxVXDJ!5xCTUEDpmJG^}Rs&@Ci`7zT~ z-F14ZXS!=@`gF!Xl*B;Pu416ZdeS^OLjVAAkN^N4030WFNp_1NX-;7kjfUZqmo?eKIo^?ETDCIe7t!-KV8(>HnBZlESg?VM%W z&Z-INxroVm+7`B#B>6dQyQ-N5T5aSXO#N6Fdd`E9I%Y=mh8U}eVk0}6m`t^*GoEHx=o!oZVo9xHjUTgy*JF8$p;i4%+FTBLGEX zvA`fkvwzVCbz_l&crfFDB61#<553qM*89_D*cg2gbGeJ@R$pntHO${gHi!!>`ZKuZ zcR8!w#--zv(&wcWQ-c`}r~18?abK;MUVv6O-q-6JTBD+Q6ADc`fLv8Rb6mqB;o95&H`ebbIp>SjHic>3#!sppv_B8v z5GJj-0Ok`k}j zS-+wPJR7_hm!7sa%!!^ysD*a!1dziq;f9Ept)k^6C`6&2<{Z4_V44k`5!$nII!Mrr zgT1~1a9B;TEJ+i~Y)*sT-5Y*leo#Yp0`(k3(L0WnBHmb#6Zm2lb%~d_Q-Qe_S-vqw zP<$vPrNr;?cqaDO6PvvRqSKkl%XmVS64R)LU#ZOBtVML+E~*5HazXxRBfboVglQkw z!BSMi!-#&?1Veb>z5J-x^{WYofi&dUCsL2AnXpm`>!Nwvr+81lQ z`e51{A3u`U$UCtr$Du!dP5Ce*QYpWqzMgk3oHm|MA=xz!XtbcKR{@`;)k6cPDZkp5 zY%~cztYfzEqykG%h(&MU(Bxko#YBQ=XM=w(JKQl}>NN)U^27T>a(S^%V8A!u_4tjb z-Q?Ag2z8)rUFTiFe!_M>jWabyw}BR^=F)kO&KF=x>3E)@F`_ZYEXJ2l9>RKuz;}gq zbh^4nIoi3ydhe+ z%BScg8J7U2B)8}-gYcY)LAvkgYY9k>)?c#4AINZ4sZ!(otX|nFR(`dM2Ti54I3%ZO z8Dv+G$F^&crnflEC3RciO`FkP#llq{;I0v_9%hY-j|80z5e?+hru7mVHuSH#&KWgZ zS>f~^Z&Rn8OcIYdfrM@Ra$yTvsGo=o8+fSf@={9txZvo-#SP;FbCRHoGnASEB`r{m%)GZ>KB1^9lM>nZHe|G?18;l0ZZzzp}@#wis}w@`5m^)EI%%} zH`i-7Wj_>oZwPLZgDCvYt_X;Mw

>E|Ry2BIR1S9~-zQ-bKB2hEUzW*dp;2hGW&4 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 -T& sparkalgo_take_snapshot(T&, const std::string& name);", - dual_impl = @" -template -T& __AlgoName__::sparkalgo_take_snapshot(T& rng, const std::string& name) -{ - static std::map< std::string, T > cache; - auto it = cache.find(name); - if(it == cache.end()) - { - cache[name] = rng; - return rng; - } - else - return it->second; -}" - )] - static public object sparkalgo_take_snapshot(object data, string tag) + [SparkAlgoCode] + static public object sparkalgo_take_snapshot(string tag, object data) { object val; if(!_cache.TryGetValue(tag, out val)) @@ -148,7 +130,7 @@ int sparkalgo_snapshot_switch(const std::string& name, int on_off);", int __AlgoName__::sparkalgo_snapshot_switch(const std::string& name, int on_off) { if(on_off) - return sparkalgo_take_snapshot(on_off,name+""_switch""); + return sparkalgo_take_snapshot(name+""_switch"", on_off); else return on_off; }" diff --git a/src/sdk/examples/ExcelAlgoTemplate.cpp b/src/sdk/examples/ExcelAlgoTemplate.cpp index b09abb964..f408e5a0b 100644 --- a/src/sdk/examples/ExcelAlgoTemplate.cpp +++ b/src/sdk/examples/ExcelAlgoTemplate.cpp @@ -10,6 +10,8 @@ #include "spark/lib/utils/PBUtils.h" #include "spark/lib/os/os.h" +#include + using namespace bts::api::orderman; using namespace bts::orderman; @@ -241,11 +243,15 @@ class __AlgoName__ : public IAlgoOrder const string& order_type = "", const string& order_params = ""); void sparkalgo_send_or_update_order(OrderKey local_order_id, double should_process_inputs, double price, int32_t quantity, - const string& order_params_update = ""); + const string& order_params_update = ""); + template + T& sparkalgo_take_snapshot(const std::string& name, T&); + __DualDefs__; }; + const string& __AlgoName__::get_user() const { return init_services().definition().user(); @@ -285,11 +291,27 @@ struct __AlgoName__::PImpl IBeforeLaunchAlgoServices* init_services = nullptr; IAlgoServices* algo_services = nullptr; std::map local_order_id_to_child; - + + typedef std::variant, Range, Range > vtypes; + std::map snapshots; + Book last_book; __ParameterDefs__; }; +template +T& __AlgoName__::sparkalgo_take_snapshot(const std::string& tag, T& data) +{ + auto it = me->snapshots.find(tag); + if(it == me->snapshots.end()) + { + me->snapshots[tag] = data; + return data; + } + else + return std::get(it->second); +} + SecurityKey __AlgoName__::sparkalgo_resolve_security_id(const string& contract, const string& symbol, const string& security_type, const string& exchange) { diff --git a/src/sdk/examples/excel_plugin_example.cpp b/src/sdk/examples/excel_plugin_example.cpp index ca3126cda..7fed60d84 100644 --- a/src/sdk/examples/excel_plugin_example.cpp +++ b/src/sdk/examples/excel_plugin_example.cpp @@ -10,6 +10,8 @@ #include "spark/lib/utils/PBUtils.h" #include "spark/lib/os/os.h" +#include + using namespace bts::api::orderman; using namespace bts::orderman; @@ -243,18 +245,19 @@ class algo_example_xlsm : public IAlgoOrder const string& order_type = "", const string& order_params = ""); void sparkalgo_send_or_update_order(OrderKey local_order_id, double should_process_inputs, double price, int32_t quantity, - const string& order_params_update = ""); + const string& order_params_update = ""); + template + T& sparkalgo_take_snapshot(const std::string& name, T&); + //__DualDefs__ ExcelBookAccessor sparkalgo_md_book_id(SecurityKey sk); -int sparkalgo_snapshot_switch(const std::string& name, int on_off); - -template -T& sparkalgo_take_snapshot(T&, const std::string& name);; +int sparkalgo_snapshot_switch(const std::string& name, int on_off);; }; + const string& algo_example_xlsm::get_user() const { return init_services().definition().user(); @@ -294,7 +297,10 @@ struct algo_example_xlsm::PImpl IBeforeLaunchAlgoServices* init_services = nullptr; IAlgoServices* algo_services = nullptr; std::map local_order_id_to_child; - + + typedef std::variant, Range, Range > vtypes; + std::map snapshots; + Book last_book; //__ParameterDefs__ double join_thresh; @@ -302,6 +308,19 @@ struct algo_example_xlsm::PImpl OrderKey join_k9_order_id;; }; +template +T& algo_example_xlsm::sparkalgo_take_snapshot(const std::string& tag, T& data) +{ + auto it = me->snapshots.find(tag); + if(it == me->snapshots.end()) + { + me->snapshots[tag] = data; + return data; + } + else + return std::get(it->second); +} + SecurityKey algo_example_xlsm::sparkalgo_resolve_security_id(const string& contract, const string& symbol, const string& security_type, const string& exchange) { @@ -414,25 +433,11 @@ ExcelBookAccessor algo_example_xlsm::sparkalgo_md_book_id(SecurityKey sk) int algo_example_xlsm::sparkalgo_snapshot_switch(const std::string& name, int on_off) { if(on_off) - return sparkalgo_take_snapshot(on_off,name+"_switch"); + return sparkalgo_take_snapshot(name+"_switch", on_off); else return on_off; } -template -T& algo_example_xlsm::sparkalgo_take_snapshot(T& rng, const std::string& name) -{ - static std::map< std::string, T > cache; - auto it = cache.find(name); - if(it == cache.end()) - { - cache[name] = rng; - return rng; - } - else - return it->second; -} - algo_example_xlsm::algo_example_xlsm() : me(new PImpl()) {} algo_example_xlsm::~algo_example_xlsm() {} @@ -720,11 +725,11 @@ void algo_example_xlsm::join_h31() auto&& Join_C17_C18 = range_init(join_c17, 2, 1); auto&& join_c18 = sparkalgo_md_book_id ( security_id)(10,1) ; range_set(Join_C17_C18, join_c18, 1, 0); - - auto Join_C17_C18_avg = 0.0; - for(auto& Join_C17_C18_i : Join_C17_C18 ) - Join_C17_C18_avg += Join_C17_C18_i; - Join_C17_C18_avg /= Join_C17_C18.size(); + + auto Join_C17_C18_avg = 0.0; + for(auto& Join_C17_C18_i : Join_C17_C18 ) + Join_C17_C18_avg += Join_C17_C18_i; + Join_C17_C18_avg /= Join_C17_C18.size(); auto&& join_c33 = Join_C17_C18_avg ; auto&& on_off = 1.0 + join_c33 ; @@ -738,11 +743,11 @@ void algo_example_xlsm::join_h31() range_set(Join_B17_D18, join_c18, 1, 1); auto&& join_d18 = sparkalgo_md_book_id ( security_id)(10,2) ; range_set(Join_B17_D18, join_d18, 1, 2); - auto&& join_g18 = ( join_c17 > 0.0 ? (sparkalgo_take_snapshot ( Join_B17_D18, std::string("book"))(1,1)) : (0.0) ) ; + auto&& join_g18 = ( join_c17 > 0.0 ? (sparkalgo_take_snapshot ( std::string("book"), Join_B17_D18)(1,1)) : (0.0) ) ; auto&& join_thresh = me->join_thresh; auto&& join_f31 = sparkalgo_snapshot_switch ( std::string("should_join"), ( (join_c18 > join_g18 && join_b18 >= join_thresh && true) ? (1.0) : (0.0) ) ) ; auto&& init_price = get_price(); - auto&& join_d31 = ( join_f31 ? (sparkalgo_take_snapshot ( join_c18, std::string("join_price"))) : (init_price) ) ; + auto&& join_d31 = ( join_f31 ? (sparkalgo_take_snapshot ( std::string("join_price"), join_c18)) : (init_price) ) ; auto&& quantity = get_quantity(); auto&& join_e31 = quantity ; sparkalgo_send_or_update_order ( join_k8, on_off, join_d31, join_e31) ; @@ -769,11 +774,11 @@ void algo_example_xlsm::join_h32() auto&& Join_C17_C18 = range_init(join_c17, 2, 1); auto&& join_c18 = sparkalgo_md_book_id ( security_id)(10,1) ; range_set(Join_C17_C18, join_c18, 1, 0); - - auto Join_C17_C18_avg = 0.0; - for(auto& Join_C17_C18_i : Join_C17_C18 ) - Join_C17_C18_avg += Join_C17_C18_i; - Join_C17_C18_avg /= Join_C17_C18.size(); + + auto Join_C17_C18_avg = 0.0; + for(auto& Join_C17_C18_i : Join_C17_C18 ) + Join_C17_C18_avg += Join_C17_C18_i; + Join_C17_C18_avg /= Join_C17_C18.size(); auto&& join_c33 = Join_C17_C18_avg ; auto&& on_off = 1.0 + join_c33 ; @@ -787,15 +792,15 @@ void algo_example_xlsm::join_h32() range_set(Join_B17_D18, join_c18, 1, 1); auto&& join_d18 = sparkalgo_md_book_id ( security_id)(10,2) ; range_set(Join_B17_D18, join_d18, 1, 2); - auto&& join_g18 = ( join_c17 > 0.0 ? (sparkalgo_take_snapshot ( Join_B17_D18, std::string("book"))(1,1)) : (0.0) ) ; + auto&& join_g18 = ( join_c17 > 0.0 ? (sparkalgo_take_snapshot ( std::string("book"), Join_B17_D18)(1,1)) : (0.0) ) ; auto&& join_thresh = me->join_thresh; auto&& join_f31 = sparkalgo_snapshot_switch ( std::string("should_join"), ( (join_c18 > join_g18 && join_b18 >= join_thresh && true) ? (1.0) : (0.0) ) ) ; auto&& init_price = get_price(); - auto&& join_d31 = ( join_f31 ? (sparkalgo_take_snapshot ( join_c18, std::string("join_price"))) : (init_price) ) ; - auto&& join_d32 = join_d31 - 1.0 ; + auto&& join_d31 = ( join_f31 ? (sparkalgo_take_snapshot ( std::string("join_price"), join_c18)) : (init_price) ) ; + auto&& join_d32 = join_d31 - 0.03 ; auto&& quantity = get_quantity(); auto&& join_e31 = quantity ; - auto&& join_e32 = join_e31 - 1.0 ; + auto&& join_e32 = join_e31 + 2.0 ; sparkalgo_send_or_update_order ( join_k13, on_off, join_d32, join_e32) ; }