Skip to content

Commit 970ca93

Browse files
toolgoodtoolgood
committed
整理代码
1 parent eeee0aa commit 970ca93

File tree

6 files changed

+78
-92
lines changed

6 files changed

+78
-92
lines changed

‎csharp/ToolGood.Algorithm/Internals/Functions/FunctionBase.csharp.cs‎

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
namespace ToolGood.Algorithm.Internals.Functions
99
{
10-
#region csharp
1110

11+
#region Url html
1212
internal class Function_URLENCODE : Function_1
1313
{
1414
public Function_URLENCODE(FunctionBase func1) : base(func1)
@@ -85,6 +85,10 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
8585
}
8686
}
8787

88+
#endregion
89+
90+
#region base64
91+
8892
internal class Function_BASE64TOTEXT : Function_2
8993
{
9094
public Function_BASE64TOTEXT(FunctionBase func1, FunctionBase func2) : base(func1, func2)
@@ -198,7 +202,9 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
198202
AddFunction(stringBuilder, "TextToBase64url");
199203
}
200204
}
205+
#endregion
201206

207+
#region regex
202208
internal class Function_REGEX : Function_2
203209
{
204210
public Function_REGEX(FunctionBase func1, FunctionBase func2) : base(func1, func2)
@@ -261,6 +267,10 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
261267
}
262268
}
263269

270+
#endregion
271+
272+
#region hash
273+
264274
internal class Function_GUID : FunctionBase
265275
{
266276
public Function_GUID()
@@ -542,6 +552,9 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
542552
}
543553
}
544554

555+
#endregion
556+
557+
#region string
545558
internal class Function_TRIMSTART : Function_2
546559
{
547560
public Function_TRIMSTART(FunctionBase func1, FunctionBase func2) : base(func1, func2)
@@ -831,33 +844,9 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
831844
}
832845
}
833846

834-
internal class Function_JSON : Function_1
835-
{
836-
public Function_JSON(FunctionBase func1) : base(func1)
837-
{
838-
}
839-
840-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
841-
{
842-
var args1 = func1.Evaluate(work, tempParameter);
843-
if (args1.IsJson) { return args1; }
844-
args1 = args1.ToText("Function '{0}' parameter is error!", "Json");
845-
if (args1.IsError) { return args1; }
846-
var txt = args1.TextValue;
847-
if ((txt.StartsWith('{') && txt.EndsWith('}')) || (txt.StartsWith('[') && txt.EndsWith(']'))) {
848-
try {
849-
var json = JsonMapper.ToObject(txt);
850-
return Operand.Create(json);
851-
} catch (Exception) { }
852-
}
853-
return Operand.Error("Function '{0}' parameter is error!", "Json");
854-
}
855-
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
856-
{
857-
AddFunction(stringBuilder, "Json");
858-
}
859-
}
847+
#endregion
860848

849+
#region has hasvalue
861850
internal class Function_HAS : Function_2
862851
{
863852
public Function_HAS(FunctionBase func1, FunctionBase func2) : base(func1, func2)
@@ -969,6 +958,6 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
969958
}
970959
}
971960

961+
#endregion
972962

973-
#endregion csharp
974963
}

‎csharp/ToolGood.Algorithm/Internals/Functions/FunctionBase.flow.cs‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace ToolGood.Algorithm.Internals.Functions
66
{
7-
#region flow
87

8+
#region if iferror
99
internal class Function_IF : Function_3
1010
{
1111
public Function_IF(FunctionBase func1, FunctionBase func2, FunctionBase func3) : base(func1, func2, func3)
@@ -43,6 +43,10 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
4343
}
4444
}
4545

46+
#endregion
47+
48+
#region isXXXX
49+
4650
internal class Function_ISNUMBER : Function_1
4751
{
4852
public Function_ISNUMBER(FunctionBase func1) : base(func1)
@@ -225,23 +229,6 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
225229
}
226230
}
227231

228-
internal class Function_NOT : Function_1
229-
{
230-
public Function_NOT(FunctionBase func1) : base(func1)
231-
{
232-
}
233-
234-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
235-
{
236-
var args1 = func1.Evaluate(work, tempParameter);
237-
if (args1.IsNotBoolean) { args1 = args1.ToBoolean("Function '{0}' parameter is error!", "Not"); if (args1.IsError) { return args1; } }
238-
return args1.BooleanValue ? Operand.False : Operand.True;
239-
}
240-
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
241-
{
242-
AddFunction(stringBuilder, "Not");
243-
}
244-
}
245232

246233

247234
internal class Function_ISNULLOREMPTY : Function_1
@@ -280,7 +267,25 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
280267
{
281268
AddFunction(stringBuilder, "IsNullOrWhiteSpace");
282269
}
283-
}
270+
}
271+
#endregion
272+
273+
274+
internal class Function_NOT : Function_1
275+
{
276+
public Function_NOT(FunctionBase func1) : base(func1)
277+
{
278+
}
284279

285-
#endregion flow
280+
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
281+
{
282+
var args1 = func1.Evaluate(work, tempParameter);
283+
if (args1.IsNotBoolean) { args1 = args1.ToBoolean("Function '{0}' parameter is error!", "Not"); if (args1.IsError) { return args1; } }
284+
return args1.BooleanValue ? Operand.False : Operand.True;
285+
}
286+
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
287+
{
288+
AddFunction(stringBuilder, "Not");
289+
}
290+
}
286291
}

‎csharp/ToolGood.Algorithm/Internals/Functions/FunctionBase.sum.cs‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -507,48 +507,6 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
507507
}
508508
}
509509

510-
internal class Function_RANGE : Function_2
511-
{
512-
public Function_RANGE(FunctionBase func1, FunctionBase func2) : base(func1, func2)
513-
{
514-
}
515-
516-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
517-
{
518-
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { args1 = args1.ToNumber("Function '{0}' parameter {1} is error!", "Range", 1); if (args1.IsError) { return args1; } }
519-
var args2 = func2.Evaluate(work, tempParameter); if (args2.IsNotNumber) { args2 = args2.ToNumber("Function '{0}' parameter {1} is error!", "Range", 2); if (args2.IsError) { return args2; } }
520-
return Operand.Create(args2.NumberValue - args1.NumberValue);
521-
}
522-
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
523-
{
524-
AddFunction(stringBuilder, "Range");
525-
}
526-
}
527-
528-
internal class Function_VARIANCE : Function_N
529-
{
530-
public Function_VARIANCE(FunctionBase[] funcs) : base(funcs)
531-
{
532-
}
533-
534-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
535-
{
536-
var args = new List<Operand>(); foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
537-
538-
List<decimal> list = new List<decimal>();
539-
var o = FunctionUtil.F_base_GetList(args, list);
540-
if (o == false) { return Operand.Error("Function '{0}' parameter is error!", "Variance"); }
541-
if (list.Count == 0) { return Operand.Error("Function '{0}' parameter is error!", "Variance"); }
542-
var avg = list.Average();
543-
var variance = list.Sum(d => (d - avg) * (d - avg)) / list.Count;
544-
return Operand.Create(variance);
545-
}
546-
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
547-
{
548-
AddFunction(stringBuilder, "Variance");
549-
}
550-
}
551-
552510
internal class Function_STDEV : Function_N
553511
{
554512
public Function_STDEV(FunctionBase[] funcs) : base(funcs)

‎csharp/ToolGood.Algorithm/Internals/Functions/FunctionBase.time.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,8 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
318318
}
319319
}
320320

321+
#region second minute hour month year day
322+
321323
internal class Function_SECOND : Function_1
322324
{
323325
public Function_SECOND(FunctionBase func1) : base(func1)
@@ -435,6 +437,7 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
435437
}
436438
}
437439

440+
#endregion
438441
internal class Function_WEEKDAY : Function_2
439442
{
440443
public Function_WEEKDAY(FunctionBase func1, FunctionBase func2) : base(func1, func2)
@@ -695,6 +698,8 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
695698
}
696699
}
697700

701+
#region Add Date Parts
702+
698703
internal class Function_ADDMONTHS : Function_2
699704
{
700705
public Function_ADDMONTHS(FunctionBase func1, FunctionBase func2) : base(func1, func2)
@@ -804,6 +809,7 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
804809
{
805810
AddFunction(stringBuilder, "AddDays");
806811
}
807-
}
812+
}
813+
#endregion
808814

809815
}

‎csharp/ToolGood.Algorithm/Internals/Functions/FunctionBase.value.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Text;
4+
using ToolGood.Algorithm.LitJson;
45
using static System.Net.Mime.MediaTypeNames;
56

67
namespace ToolGood.Algorithm.Internals.Functions
@@ -338,4 +339,31 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
338339

339340
}
340341

342+
internal class Function_JSON : Function_1
343+
{
344+
public Function_JSON(FunctionBase func1) : base(func1)
345+
{
346+
}
347+
348+
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
349+
{
350+
var args1 = func1.Evaluate(work, tempParameter);
351+
if (args1.IsJson) { return args1; }
352+
args1 = args1.ToText("Function '{0}' parameter is error!", "Json");
353+
if (args1.IsError) { return args1; }
354+
var txt = args1.TextValue;
355+
if ((txt.StartsWith('{') && txt.EndsWith('}')) || (txt.StartsWith('[') && txt.EndsWith(']'))) {
356+
try {
357+
var json = JsonMapper.ToObject(txt);
358+
return Operand.Create(json);
359+
} catch (Exception) { }
360+
}
361+
return Operand.Error("Function '{0}' parameter is error!", "Json");
362+
}
363+
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
364+
{
365+
AddFunction(stringBuilder, "Json");
366+
}
367+
}
368+
341369
}

‎csharp/ToolGood.Algorithm/ToolGood.Algorithm.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Product>ToolGood.Algorithm</Product>
2020
<PackageLicenseFile>LICENSE</PackageLicenseFile>
2121
<SignAssembly>true</SignAssembly>
22-
<Version>5.0.0.5</Version>
22+
<Version>5.0.0.6</Version>
2323
<AssemblyOriginatorKeyFile>ToolGood.Algorithm.snk</AssemblyOriginatorKeyFile>
2424
<DelaySign>false</DelaySign>
2525
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\ToolGood.Algorithm.xml</DocumentationFile>

0 commit comments

Comments
 (0)