From 56578c1a4100e007dd7debb4441e49eed06dbd71 Mon Sep 17 00:00:00 2001 From: fujie <405295521@qq.com> Date: Tue, 15 Aug 2017 23:08:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/resources/example/financing.tinyscript | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript b/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript index 6b7f117..abca11a 100644 --- a/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript +++ b/org.tinygroup.tinyscript/src/test/resources/example/financing.tinyscript @@ -1,4 +1,8 @@ /*小王有一笔钱m，在t时间内，想做理财投资，有如下几只理财产品，请给出最佳方案*/ +/* + 解题思路：1.把所有的理财产品进行组合，得到所有的组合。2.对每一个组合按照利率从大到小进行排序（利率大的肯定收益高）。3.组合中从第一个开始每次都买到不能再买为止，直到把钱花光。然后求收益和。 + 4.在每个组合中选取最大收益的那个组合即为计算结果。 +*/ class Fund{ name,minMoney,maxMoney,days,interestRate;//name：产品名，minMoney:最小起投金额，maxMoney：最大投资金额，interestRate：利率 Fund(name,minMoney,maxMoney,days,interestRate){ @@ -9,10 +13,12 @@ class Fund{ this.interestRate = interestRate; } } +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)]; + sumIncome(ele,money,days)->{//对ele中对象进行求和,统计收益 value = 0; for(i = 0;i{//对结果进行打印 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)]; caculate(money,days)->{ investmentprogram = null;//投资方案结果 result = 0;//最大收益 -- Gitee From 0adfb52f6c33b64aa35e23999ed66af12f93f20e Mon Sep 17 00:00:00 2001 From: fujie <405295521@qq.com> Date: Tue, 15 Aug 2017 23:14:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=9A=E4=BA=86=E4=B8=80=E4=B8=AAprintln?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/resources/example/fund.tinyscript | 1 - 1 file changed, 1 deletion(-) diff --git a/org.tinygroup.tinyscript/src/test/resources/example/fund.tinyscript b/org.tinygroup.tinyscript/src/test/resources/example/fund.tinyscript index abc2834..36e8134 100644 --- a/org.tinygroup.tinyscript/src/test/resources/example/fund.tinyscript +++ b/org.tinygroup.tinyscript/src/test/resources/example/fund.tinyscript @@ -9,7 +9,6 @@ groupds.update("UP",(e)->{ });//求一月的净值 groupds.update("rate",(e)->{ - println(value); minvalue = value[0]; for(i = 1;i<=31-e;i++){ if(value[i] Date: Thu, 17 Aug 2017 11:16:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/tinygroup/tinyscript/impl/ArrayScriptContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.tinygroup.tinyscriptbase/src/main/java/org/tinygroup/tinyscript/impl/ArrayScriptContext.java b/org.tinygroup.tinyscriptbase/src/main/java/org/tinygroup/tinyscript/impl/ArrayScriptContext.java index ae01718..1587c18 100644 --- a/org.tinygroup.tinyscriptbase/src/main/java/org/tinygroup/tinyscript/impl/ArrayScriptContext.java +++ b/org.tinygroup.tinyscriptbase/src/main/java/org/tinygroup/tinyscript/impl/ArrayScriptContext.java @@ -65,7 +65,7 @@ public class ArrayScriptContext extends ContextImpl implements private void dealDimList(List dimList, ArrayScriptContext context) { - dimList.add(getLength()); + dimList.add(context.getLength()); Map subContexts = context.getSubContextMap(); if(!subContexts.isEmpty()){ -- Gitee