From ced54defd9119a4d4ab7ea559c50eadc524aeda0 Mon Sep 17 00:00:00 2001
From: fujie <405295521@qq.com>
Date: Tue, 15 Aug 2017 19:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0printResult=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=83=A8=E5=88=86=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/example/financing.tinyscript    | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript b/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript
index e4b4aaa..6b7f117 100644
--- a/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript
+++ b/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript
@@ -9,30 +9,42 @@ class Fund{
 		this.interestRate = interestRate;
 	}
 }
-sumIncome(e,str)->{//对e中对象进行求和,统计收益
+sumIncome(ele,money,days)->{//对ele中对象进行求和,统计收益
 	value = 0;
-	for(i = 0;i<e.size();i++){
-		money = min(e.get(i).maxMoney,(e.size()<=1||i==0)?m:(m-sum(e.subList(0,i).maxMoney)));	
-		value += e.get(i).interestRate*money*t+money;
-		str += e.get(i).name+" "+money+" ";
+	for(i = 0;i<ele.size();i++){
+		m = min(ele.get(i).maxMoney,(ele.size()<=1||i==0)?money:(money-sum(ele.subList(0,i).maxMoney)));	
+		value += ele.get(i).interestRate*m*days+m;
 	}
 	return value;	
 };
+printResult(money,days,ele)->{//对结果进行打印
+	temp = money;
+	for(fund : ele){
+		if(money>fund.maxMoney){
+			money -= fund.maxMoney;
+			print(fund.name+" "+fund.maxMoney+" ");
+		}else{
+			print(fund.name+" "+money+" ");
+			break;
+		}	
+	}
+	println("总价值："+sumIncome(ele,temp,days));	
+};
+
 list=[new Fund("鹏华国防",100,1000,30,0.00045),new Fund("鹏华中证",100,2000,100,0.00035),new Fund("国投瑞银",100,2000,60,0.00055),new Fund("华商主题精选",100,1000,50,0.00040),new Fund("金鹰智慧",100,500,80,0.00030)];
-investmentprogram = "";//投资方案结果
-result = 0;//最大收益
-caculate(m,t)->{
-	result = 0;
-	list.combine((e)->{
-		e = e.sort("interestRate desc");//按利率进行排序
-		str = "";
-		if(sumIncome(e,str) > result){
-			investmentprogram = str;
-			result = sumIncome(e,str);			
+caculate(money,days)->{
+	investmentprogram = null;//投资方案结果
+	result = 0;//最大收益
+	list.combine((ele)->{
+		ele = ele.sort("interestRate desc");//按利率进行排序
+		if(sumIncome(ele,money,days) > result){
+			result = sumIncome(ele,money,days);	
+			investmentprogram = ele;		
 		}					
 	});
+	return investmentprogram;
 };
-caculate(5000,80);println("投资方案: "+investmentprogram);println("最大收益: "+result);
-caculate(3000,30);println("投资方案: "+investmentprogram);println("最大收益: "+result);
-caculate(3000,60);println("投资方案: "+investmentprogram);println("最大收益: "+result);
-caculate(2000,20);println("投资方案: "+investmentprogram);println("最大收益: "+result);
\ No newline at end of file
+printResult(5000,80,caculate(5000,80));
+printResult(3000,30,caculate(3000,30));
+printResult(3000,60,caculate(3000,60));
+printResult(2000,20,caculate(2000,20));
\ No newline at end of file
-- 
Gitee