From 85d2f31e8d165074a2d822c88c7675fddc69a272 Mon Sep 17 00:00:00 2001 From: JianjunLiu Date: Fri, 30 Jun 2023 10:35:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改测试 --- tsdata/param/StockRefDatebyEndt.param | 16 ------ tsdata/param/StocktTrailingAvgByEndT.param | 22 -------- tsdata/param/StocktTrailingStdByEndT.param | 22 -------- .../中间函数/StockRefDatebyEndt.tsf | 51 ------------------- .../中间函数/StocktTrailingAvgByEndT.tsf | 34 ------------- .../中间函数/StocktTrailingStdByEndT.tsf | 34 ------------- 6 files changed, 179 deletions(-) delete mode 100644 tsdata/param/StockRefDatebyEndt.param delete mode 100644 tsdata/param/StocktTrailingAvgByEndT.param delete mode 100644 tsdata/param/StocktTrailingStdByEndT.param delete mode 100644 tsdata/股票/行情因子/中间函数/StockRefDatebyEndt.tsf delete mode 100644 tsdata/股票/行情因子/中间函数/StocktTrailingAvgByEndT.tsf delete mode 100644 tsdata/股票/行情因子/中间函数/StocktTrailingStdByEndT.tsf diff --git a/tsdata/param/StockRefDatebyEndt.param b/tsdata/param/StockRefDatebyEndt.param deleted file mode 100644 index ee01737..0000000 --- a/tsdata/param/StockRefDatebyEndt.param +++ /dev/null @@ -1,16 +0,0 @@ -nameStockRefDatebyEndt -nicknameָ -comment -infoƱ;;м亯 -typeid16777217 -id10 -id20 -id30 -id40 -ctrl -param -array( -("paramname":"Endt","paramcomment":"ֹ","datatype":3,"value": -("value":44393,"cv":"44393")), -("paramname":"RefType","paramcomment":"","datatype":17,"value": -("value":"=12\x0112\x02\x031=0\x031=1\x033=2\x036=3\x031=4\x032=5\x033=6\x035=7\x03=8\x03=9\x03=10\x03=11\x03=12\x03","cv":"12"))) diff --git a/tsdata/param/StocktTrailingAvgByEndT.param b/tsdata/param/StocktTrailingAvgByEndT.param deleted file mode 100644 index 24ec6de..0000000 --- a/tsdata/param/StocktTrailingAvgByEndT.param +++ /dev/null @@ -1,22 +0,0 @@ -nameStocktTrailingAvgByEndT -nicknameȡָƽ׶εվָ -comment -infoƱ;;м亯 -typeid16777217 -id10 -id20 -id30 -id40 -ctrl -param -array( -("paramname":"Endt","paramcomment":"ֹ","datatype":3,"value": -("value":44393,"cv":"44393")), -("paramname":"RefType","paramcomment":"","datatype":17,"value": -("value":"=12\x0112\x02\x031=0\x031=1\x033=2\x036=3\x031=4\x032=5\x033=6\x035=7\x03=8\x03=9\x03=10\x03=11\x03=12\x03","cv":"12")), -("paramname":"Exp","paramcomment":"ָʽ","datatype":16,"value": -("value":"@stockzdf3()","cv":"@stockzdf3()")), -("paramname":"IsExcludeIPO","paramcomment":"Ƿ޳","datatype":1,"value": -("value":1,"cv":"1")), -("paramname":"N","paramcomment":"޳","datatype":0,"value": -("value":3,"cv":"3"))) diff --git a/tsdata/param/StocktTrailingStdByEndT.param b/tsdata/param/StocktTrailingStdByEndT.param deleted file mode 100644 index f4bd170..0000000 --- a/tsdata/param/StocktTrailingStdByEndT.param +++ /dev/null @@ -1,22 +0,0 @@ -nameStocktTrailingStdByEndT -nicknameȡָƽ׶εָ׼ -comment -infoƱ;;м亯 -typeid16777217 -id10 -id20 -id30 -id40 -ctrl -param -array( -("paramname":"Endt","paramcomment":"ֹ","datatype":3,"value": -("value":44393,"cv":"44393")), -("paramname":"RefType","paramcomment":"","datatype":17,"value": -("value":"=12\x0112\x02\x031=0\x031=1\x033=2\x036=3\x031=4\x032=5\x033=6\x035=7\x03=8\x03=9\x03=10\x03=11\x03=12\x03","cv":"12")), -("paramname":"Exp","paramcomment":"ָʽ","datatype":16,"value": -("value":"@stockzdf3()","cv":"@stockzdf3()")), -("paramname":"IsExcludeIPO","paramcomment":"Ƿ޳","datatype":1,"value": -("value":1,"cv":"1")), -("paramname":"N","paramcomment":"޳","datatype":0,"value": -("value":3,"cv":"3"))) diff --git a/tsdata/股票/行情因子/中间函数/StockRefDatebyEndt.tsf b/tsdata/股票/行情因子/中间函数/StockRefDatebyEndt.tsf deleted file mode 100644 index b317fde..0000000 --- a/tsdata/股票/行情因子/中间函数/StockRefDatebyEndt.tsf +++ /dev/null @@ -1,51 +0,0 @@ -Function StockRefDatebyEndt(Endt,RefType); -Begin -{** ======================================================================// - %% @explain(˵): - ļָָڣԱںȡ - %% : - %% @param(EndT)(TDateTime) ڣֹ - %% @param(RefType) ûԶ壬ѡͣȡֵ£ - 0: 1 - 1: 1 - ... - 12:Ҫϵͳ֤ȯ룩 - - %% : ֵڣ - %% @remark(־) 2021-07-14 TSҵ - -%%//====================================================================== **} - case RefType of - 0: //1 - begt := IncWeek(EndT,-1)+1; - 1: //1 - begt := IncMonth(EndT,-1)+1; - 2: //3 - begt := IncMonth(EndT,-2)+1; - 3: //6 - begt := IncMonth(EndT,-3)+1; - 4: //1 - begt := IncYear(EndT,-1)+1; - 5: //2 - begt := IncYear(EndT,-2)+1; - 6: //3 - begt := IncYear(EndT,-3)+1; - 7: //5 - begt := IncYear(EndT,-5)+1; - 8: // - begt := StartOfTheWeek(EndT); - 9: // - begt := StartOfTheMonth(EndT); - 10: // - begt := StartOfTheQuarter(EndT); - 11: // - begt := StartOfTheYear(EndT); - 12: //ָȡʼ - begt := ifthen(stocktype(DefaultStockID())=-1,base(750004),firstday()); - else - begt := endt; - end; - - return begt; - -End; diff --git a/tsdata/股票/行情因子/中间函数/StocktTrailingAvgByEndT.tsf b/tsdata/股票/行情因子/中间函数/StocktTrailingAvgByEndT.tsf deleted file mode 100644 index 4c1b227..0000000 --- a/tsdata/股票/行情因子/中间函数/StocktTrailingAvgByEndT.tsf +++ /dev/null @@ -1,34 +0,0 @@ -Function StocktTrailingAvgByEndT(Endt,RefType,Exp,IsExcludeIPO,N); -Begin -{** ======================================================================// - %% @explain(˵): - ȡָƽ׶εվָ - %% : - %% @param(EndT)(TDateTime) ڣֹ - %% @param(RefType) ûԶ壬ѡͣȡֵ£ - 0: 1 - 1: 1 - ... - 12: - %% @param(Exp)(exp) ָʽ@close(),@stockzdf3() - %% @param(IsExcludeIPO)(Bool) Ƿ޳ - %% @param(N)(Int) ޳ - %% : ֵreal - %% @remark(־) 2021-07-14 TSҵ - -%%//====================================================================== **} - ov := BackupSystemParameters2(); - if ifnil(IsExcludeIPO) then IsExcludeIPO:=0; - if ifnil(N) then N:=1; - setsysparam(pn_date(),endt); - setsysparam(pn_cycle(),cy_day()); - begt := StockRefDatebyEndt(Endt,RefType); - ND := tradedays(begt,endt); - if IsExcludeIPO then - begin - MD := tradedays(firstday(),sp_time()); - ND := MD-ND<=N?MD-N:ND; - end - return MA(eval(Exp),ND); - -End; diff --git a/tsdata/股票/行情因子/中间函数/StocktTrailingStdByEndT.tsf b/tsdata/股票/行情因子/中间函数/StocktTrailingStdByEndT.tsf deleted file mode 100644 index fc0a469..0000000 --- a/tsdata/股票/行情因子/中间函数/StocktTrailingStdByEndT.tsf +++ /dev/null @@ -1,34 +0,0 @@ -Function StocktTrailingStdByEndT(Endt,RefType,Exp,IsExcludeIPO,N); -Begin -{** ======================================================================// - %% @explain(˵): - ȡָƽ׶εָ׼ - %% : - %% @param(EndT)(TDateTime) ڣֹ - %% @param(RefType) ûԶ壬ѡͣȡֵ£ - 0: 1 - 1: 1 - ... - 12: - %% @param(Exp)(exp) ָʽ@close(),@stockzdf3() - %% @param(IsExcludeIPO)(Bool) Ƿ޳ - %% @param(N)(Int) ޳ - %% : ֵreal - %% @remark(־) 2021-07-14 TSҵ - -%%//====================================================================== **} - ov := BackupSystemParameters2(); - if ifnil(IsExcludeIPO) then IsExcludeIPO:=0; - if ifnil(N) then N:=1; - setsysparam(pn_date(),endt); - setsysparam(pn_cycle(),cy_day()); - begt := StockRefDatebyEndt(Endt,RefType); - ND := tradedays(begt,endt); - if IsExcludeIPO then - begin - MD := tradedays(firstday(),sp_time()); - ND := MD-ND<=N?MD-N:ND; - end - return sp_Std(eval(Exp),ND); - -End;