From 773ea38ffa8a01976215f22e44a8546f1ecaa7c7 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Sat, 20 Jul 2019 00:15:24 -0400 Subject: [PATCH] template problem --- src/client/spark_excel/algo_example.xlsm | Bin 17680 -> 17671 bytes src/client/spark_excel/algogen/Generate.cs | 2 +- .../functions/bts/SparkAlgoFunctions.cs | 6 +-- src/sdk/examples/ExcelAlgoTemplate.cpp | 5 --- src/sdk/examples/excel_plugin_example.cpp | 35 +++++++----------- 5 files changed, 17 insertions(+), 31 deletions(-) diff --git a/src/client/spark_excel/algo_example.xlsm b/src/client/spark_excel/algo_example.xlsm index 5fdd5a84a6787858d917bb000cdb55c039b6fd79..c412292d1a0142ebef28782756e99f3b50cd9927 100644 GIT binary patch delta 5846 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 delta 5908 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 diff --git a/src/client/spark_excel/algogen/Generate.cs b/src/client/spark_excel/algogen/Generate.cs index da5776275..c27e25c57 100644 --- a/src/client/spark_excel/algogen/Generate.cs +++ b/src/client/spark_excel/algogen/Generate.cs @@ -97,7 +97,7 @@ namespace bts.excel string funcimpls = string.Join(Environment.NewLine, functions.Select(x => x.function_impl.Replace("__AlgoName__", algoname) )); cpp = cpp.Replace("__FunctionImpls__", "//__FunctionImpls__" + Environment.NewLine + funcimpls); - string dualdefs = string.Join(Environment.NewLine, functions.SelectMany(x => x.get_dual_definitions().Select( xx => xx ) ).Distinct()); + string dualdefs = string.Join(Environment.NewLine, functions.SelectMany(x => x.get_dual_definitions().Select( xx => xx.Replace("__AlgoName__::", "") ) ).Distinct()); cpp = cpp.Replace("__DualDefs__", "//__DualDefs__" + Environment.NewLine + dualdefs); string dualimpls = string.Join(Environment.NewLine, functions.SelectMany(x => x.get_dual_impls().Select(xx => xx.Replace("__AlgoName__", algoname))).Distinct()); diff --git a/src/client/spark_excel/algogen/functions/bts/SparkAlgoFunctions.cs b/src/client/spark_excel/algogen/functions/bts/SparkAlgoFunctions.cs index 96665234f..c6336c586 100644 --- a/src/client/spark_excel/algogen/functions/bts/SparkAlgoFunctions.cs +++ b/src/client/spark_excel/algogen/functions/bts/SparkAlgoFunctions.cs @@ -112,10 +112,10 @@ namespace bts.excel [ExcelFunction] [SparkAlgoCode( + // dual_definition = @" + // template + // T& sparkalgo_take_snapshot(T&, const std::string& name);", dual_definition = @" - template - T& sparkalgo_take_snapshot(T&, const std::string& name);", - dual_impl = @" template T& __AlgoName__::sparkalgo_take_snapshot(T& rng, const std::string& name) { diff --git a/src/sdk/examples/ExcelAlgoTemplate.cpp b/src/sdk/examples/ExcelAlgoTemplate.cpp index 2da1dbaeb..03168817e 100644 --- a/src/sdk/examples/ExcelAlgoTemplate.cpp +++ b/src/sdk/examples/ExcelAlgoTemplate.cpp @@ -198,11 +198,6 @@ struct Range return end; } }; - -template struct Range; -template struct Range; -template struct Range; -template struct Range; class __AlgoName__ : public IAlgoOrder { diff --git a/src/sdk/examples/excel_plugin_example.cpp b/src/sdk/examples/excel_plugin_example.cpp index 90609bb92..b23d434cf 100644 --- a/src/sdk/examples/excel_plugin_example.cpp +++ b/src/sdk/examples/excel_plugin_example.cpp @@ -198,12 +198,6 @@ struct Range return end; } }; - -template struct Range; -template struct Range; -template struct Range; -template struct Range; -template struct Range; class algo_example_xlsm : public IAlgoOrder { @@ -258,8 +252,19 @@ class algo_example_xlsm : public IAlgoOrder int sparkalgo_snapshot_switch(const std::string& name, int on_off); - template - T& sparkalgo_take_snapshot(T&, const std::string& name);; +template +T& 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; +}; }; SecurityKey algo_example_xlsm::sparkalgo_resolve_security_id(const string& contract, const string& symbol, @@ -425,20 +430,6 @@ int algo_example_xlsm::sparkalgo_snapshot_switch(const std::string& name, int on return sparkalgo_take_snapshot(on_off,name+"_switch"); } -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() {}