diff --git a/src/client/spark_excel/algo_example.xlsm b/src/client/spark_excel/algo_example.xlsm index 5fdd5a84a..c412292d1 100644 Binary files a/src/client/spark_excel/algo_example.xlsm and b/src/client/spark_excel/algo_example.xlsm differ 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() {}