From 4db7d08bb295be33e80f1353f58fcea4a8da6127 Mon Sep 17 00:00:00 2001 From: cloudflight <cloudflight@126.com> Date: 星期一, 10 六月 2024 19:11:39 +0800 Subject: [PATCH] 2024年6月10日 --- Hydraulic/Hydro.CodeProvider/Eval.cs | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Hydraulic/Hydro.CodeProvider/Eval.cs b/Hydraulic/Hydro.CodeProvider/Eval.cs index ad88eeb..26c4584 100644 --- a/Hydraulic/Hydro.CodeProvider/Eval.cs +++ b/Hydraulic/Hydro.CodeProvider/Eval.cs @@ -269,10 +269,11 @@ /// </summary> /// <param name="paramArray"></param> /// <returns></returns> - public dynamic getResult(List<double> paramArray, List<double[]> patternArray=null,LogicModelParams param=null,GeneticParams gParam=null) + public double getResult(List<double> paramArray, List<double[]> patternArray=null,LogicModelParams param=null,GeneticParams gParam=null) { - object result; - result = mi.Invoke(tmp, new object[] { paramArray, patternArray, param, gParam }); + double result; + result = (double)mi.Invoke(tmp, new object[] { paramArray, patternArray, param, gParam }); + //result = paramArray.Count(); return result; //return mi; @@ -376,6 +377,7 @@ public static Regex FuncRegex = new Regex(@"\{\|?((#|[^\[\]\{\}\|;\s])+)(\[([\-\+][0-9]+|[0-9]+)?\])?\|?\}"); //new Regex( @"\{[\u4E00-\u9fa5A-Za-z0-9_~!@#$%\^&*\(\)锛堬級\[\]锛丂锟モ�︹�-\+\|]+\}"); public static string FuncRegexString = @"^[^\[\]\{\}\|;\s]+$"; + public static string CommonUse = @" using System; using System.Collections; @@ -399,6 +401,7 @@ } } }"; + static string TempCode_Total = CommonUse + @" namespace CoustomEval { -- Gitblit v1.9.3