diff --git a/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/ComputeEngine.java b/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/ComputeEngine.java index 517f8e38e9ed3bcc8249e3af7915c83c0fc5454e..d29a553c38ebf7aca092bf0a19d72262c398dccb 100644 --- a/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/ComputeEngine.java +++ b/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/ComputeEngine.java @@ -3,7 +3,7 @@ package org.tinygroup.tinyscript; import org.tinygroup.tinyscript.ScriptEngine; /** - * 集算器引擎 + * tinyscript引擎 * @author yancheng11334 * */ diff --git a/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/executor/ComputeEngineExecutor.java b/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/executor/ComputeEngineExecutor.java index 27f30f431147e64d7f9a6f3a69341cf2f4599864..94f94137f8e70c41be6822f494d954179b06fb5c 100644 --- a/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/executor/ComputeEngineExecutor.java +++ b/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/executor/ComputeEngineExecutor.java @@ -5,7 +5,7 @@ import org.tinygroup.tinyscript.executor.TinyScriptOperator; /** - * 集算器的模拟器执行 + * tinyscript的模拟器执行 * @author yancheng11334 * */ diff --git a/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/executor/ComputeEngineOperator.java b/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/executor/ComputeEngineOperator.java index dcbc86e9aec115d78884f84a69faa17f2d371735..bdb056936b1ceeba82836abfe57d3e48d74c66a1 100644 --- a/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/executor/ComputeEngineOperator.java +++ b/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/executor/ComputeEngineOperator.java @@ -6,13 +6,13 @@ import org.tinygroup.tinyscript.executor.AbstractTinyScriptOperator; import org.tinygroup.tinyscript.impl.DefaultComputeEngine; /** - * 集算器的脚本模拟器实现 + * tinyscript的脚本模拟器实现 * @author yancheng11334 * */ public class ComputeEngineOperator extends AbstractTinyScriptOperator{ - //生成集算器 + //生成tinyscript引擎 public ScriptEngine createScriptEngine() throws ScriptException { return new DefaultComputeEngine(); } diff --git a/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/impl/DefaultComputeEngine.java b/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/impl/DefaultComputeEngine.java index e3f29209a2e2ed04402374bc80f4b5d6acd3101c..18de5b0e91d50fbca1bf1fe681f187cb100b73b8 100644 --- a/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/impl/DefaultComputeEngine.java +++ b/org.tinygroup.tinyscript/src/main/java/org/tinygroup/tinyscript/impl/DefaultComputeEngine.java @@ -84,7 +84,7 @@ import org.tinygroup.tinyscript.text.function.ReadTxtFunction; import org.tinygroup.tinyscript.tree.function.CreateDataTreeFunction; /** - * 默认的集算器实现 + * 默认的tinyscript实现 * @author yancheng11334 * */ diff --git a/org.tinygroup.tinyscript/src/test/java/org/tinygroup/tinyscript/TxtTest.java b/org.tinygroup.tinyscript/src/test/java/org/tinygroup/tinyscript/TxtTest.java index 4de97ca320661d64c086e0bd8ec577e6faf4144d..ea6e281eb223487f81515048e7ca1be115123634 100644 --- a/org.tinygroup.tinyscript/src/test/java/org/tinygroup/tinyscript/TxtTest.java +++ b/org.tinygroup.tinyscript/src/test/java/org/tinygroup/tinyscript/TxtTest.java @@ -7,7 +7,7 @@ import org.tinygroup.tinyscript.impl.DefaultComputeEngine; import junit.framework.TestCase; /** - * 增加对集算器文本的读取函数 + * 增加对tinyscript文本的读取函数 * @author yancheng11334 * */ diff --git a/org.tinygroup.tinyscript/src/test/resources/base.tinyscript b/org.tinygroup.tinyscript/src/test/resources/base.tinyscript index b5ef4a47e85d0c732c9c2789ecb9ddd05132c1fc..7a759fba06922d0af9cea336f77e65cbec767403 100644 --- a/org.tinygroup.tinyscript/src/test/resources/base.tinyscript +++ b/org.tinygroup.tinyscript/src/test/resources/base.tinyscript @@ -1,5 +1,5 @@ /* -本脚本示例演示基本的集算器语法,用户可以通过集算器运行器执行。 +本脚本示例演示基本的tinyscript语法,用户可以通过tinyscript运行器执行。 具体安装过程可以参考文档:http://www.tinygroup.org/docs/6213296363248889992 */ diff --git a/org.tinygroup.tinyscript/src/test/resources/example/fund.tinyscript b/org.tinygroup.tinyscript/src/test/resources/example/fund.tinyscript index 020bf97984b4b5795b9ac8a89f89ec032c815fda..abc2834e1e9b8bb68281c9e20a6da820b8f0efed 100644 --- a/org.tinygroup.tinyscript/src/test/resources/example/fund.tinyscript +++ b/org.tinygroup.tinyscript/src/test/resources/example/fund.tinyscript @@ -9,6 +9,7 @@ groupds.update("UP",(e)->{ });//求一月的净值 groupds.update("rate",(e)->{ + println(value); minvalue = value[0]; for(i = 1;i<=31-e;i++){ if(value[i]{ return (value[0]-minvalue)/value[0]; }); -groupds.update("rate",(e)->{ - last = 31-e; - first = 1-e; - maxvalue = 0; - for(i = first;i<=last;i++){ - maxvalue = max(maxvalue,rate[i]); - - } - - return maxvalue; -});//对每一个净值的回撤率进行比较求出最大回撤率 +groupds = groupds.sortGroup("rate desc"); //过滤回撤率大于50%的数据 groupds = groupds.sort("UP desc"); groupds = groupds.limit(1,5); - groupds = groupds.filterGroup(rate[0]<=0.5); dataset2 = readTxt("/example/history.txt");