fix

Author: linzhijun

csharp/ToolGood.Algorithm.Test/AlgorithmEngineHelper/AlgorithmEngineHelperTest.cs

@@ -27,9 +27,15 @@ public void Test()
 
             DiyNameInfo p7 = AlgorithmEngineHelper.GetDiyNames("ddd+2");
             Assert.AreEqual("ddd", p7.Parameters[0].ToString());
-        }
 
-        [Test]
+ 
+			DiyNameInfo p8 = AlgorithmEngineHelper.GetDiyNames(@"{""A"": 0.6,""B"": 0.4,""C"": 0.6,""E"": 0.33,""F"": 0.29,""Z"": 0.15
+,""EB"": 0.7,""EE"": 0.65,""EA"": 0.85,""AB"": 1.0,""BC"": 1.0,""AA"":1.0
+,""EBC"": 1.15,""BAB"": 1.25,""BCB"": 1.25,""BBC"": 1.25,""CBB"": 1.25,""EBA"": 1.2,""AAA"": 1.4}[瓦楞]");
+			Assert.AreEqual("瓦楞", p8.Parameters[0].ToString());
+		}
+
+		[Test]
         public void Test2()
         {
             var b = AlgorithmEngineHelper.IsKeywords("false");

csharp/ToolGood.Algorithm/Internals/DiyNameVisitor.cs

@@ -15,23 +15,16 @@ public object VisitPARAMETER_fun(mathParser.PARAMETER_funContext context)
 			if(node != null) {
 				diy.Parameters.Add(new ParameterInfo(node.GetText(), node.Symbol.StartIndex, node.Symbol.StopIndex));
 			}
-			//node = context.PARAMETER2();
-			//if (node != null) {
-			//    string str = node.GetText();
-			//    if (str.StartsWith('@')) {
-			//        diy.Parameters.Add(new ParameterInfo(str.AsSpan(1).ToString(), node.Symbol.StartIndex, node.Symbol.StopIndex));
-			//    } else if ((str.StartsWith('【') && str.EndsWith('】'))
-			//        || (str.StartsWith('[') && str.EndsWith(']'))
-			//        || (str.StartsWith('#') && str.EndsWith('#'))) {
-			//        diy.Parameters.Add(new ParameterInfo(str.AsSpan(1, str.Length - 2).ToString(), node.Symbol.StartIndex, node.Symbol.StopIndex));
-			//    } else {
-			//        diy.Parameters.Add(new ParameterInfo(str, node.Symbol.StartIndex, node.Symbol.StopIndex));
-			//    }
-			//}
-
 			return VisitChildren(context);
 		}
-
+		public object VisitGetJsonValue_fun(mathParser.GetJsonValue_funContext context)
+		{
+			ITerminalNode node = context.PARAMETER();
+			if (node != null) {
+				diy.Parameters.Add(new ParameterInfo(node.GetText(), node.Symbol.StartIndex, node.Symbol.StopIndex));
+			}
+			return VisitChildren(context);
+		}
 		public object VisitDiyFunction_fun(mathParser.DiyFunction_funContext context)
 		{
 			diy.Functions.Add(context.PARAMETER().GetText());
@@ -383,10 +376,7 @@ public object VisitGEOMEAN_fun(mathParser.GEOMEAN_funContext context)
 			return VisitChildren(context);
 		}
 
-		public object VisitGetJsonValue_fun(mathParser.GetJsonValue_funContext context)
-		{
-			return VisitChildren(context);
-		}
+	
 
 		public object VisitGUID_fun(mathParser.GUID_funContext context)
 		{

csharp/ToolGood.Algorithm/ToolGood.Algorithm.csproj

@@ -19,7 +19,7 @@
     <Product>ToolGood.Algorithm</Product>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <SignAssembly>true</SignAssembly>
-    <Version>6.0.0.2</Version>
+    <Version>6.0.0.3</Version>
     <AssemblyOriginatorKeyFile>ToolGood.Algorithm.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\ToolGood.Algorithm.xml</DocumentationFile>