From ba448bbf1e8764d60ad4f42d2e91bb6938be49ed Mon Sep 17 00:00:00 2001
From: fujie <405295521@qq.com>
Date: Sun, 13 Aug 2017 22:10:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=89=E5=85=B3=E9=9B=86?=
 =?UTF-8?q?=E7=AE=97=E5=99=A8=E7=9A=84=E4=B8=AD=E6=96=87=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/tinygroup/tinyscript/ComputeEngine.java    |  2 +-
 .../tinyscript/executor/ComputeEngineExecutor.java |  2 +-
 .../tinyscript/executor/ComputeEngineOperator.java |  4 ++--
 .../tinyscript/impl/DefaultComputeEngine.java      |  2 +-
 .../java/org/tinygroup/tinyscript/TxtTest.java     |  2 +-
 .../src/test/resources/base.tinyscript             |  2 +-
 .../src/test/resources/example/fund.tinyscript     | 14 ++------------
 7 files changed, 9 insertions(+), 19 deletions(-)

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 517f8e3..d29a553 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 27f30f4..94f9413 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 dcbc86e..bdb0569 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 e3f2920..18de5b0 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 4de97ca..ea6e281 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 b5ef4a4..7a759fb 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 020bf97..abc2834 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]<minvalue){
@@ -18,22 +19,11 @@ groupds.update("rate",(e)->{
 	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");
-- 
Gitee