Skip to content

Commit 5bafa07

Browse files
committed
fix
1 parent d711c2d commit 5bafa07

File tree

2 files changed

+42
-1
lines changed

2 files changed

+42
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ public override Operand Calculate(AlgorithmEngine work)
10361036
var args = new List<Operand>();
10371037
foreach (var item in funcs) { var aa = item.Calculate(work); if (aa.IsError) { return aa; } args.Add(aa); }
10381038

1039-
var args1 = args[0].ToArray("Function 'VLOOKUP' parameter {0} error!", 1); if (args1.IsError) { return args1; }
1039+
var args1 = args[0].ToArray("Function 'VLOOKUP' parameter {0} is error!", 1); if (args1.IsError) { return args1; }
10401040
var args2 = args[1];
10411041
var args3 = args[2].ToNumber("Function 'VLOOKUP' parameter {0} is error!", 3); if (args3.IsError) { return args3; }
10421042

csharp/ToolGood.Algorithm/Operand.cs

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,14 @@ public static Operand CreateNull()
396396
/// <param name="index"></param>
397397
/// <returns></returns>
398398
public virtual Operand ToNumber(string errorMessage, int index) { return Error(string.Format(errorMessage, index)); }
399+
/// <summary>
400+
/// 转数值类型
401+
/// </summary>
402+
/// <param name="errorMessage"></param>
403+
/// <param name="funName"></param>
404+
/// <param name="index"></param>
405+
/// <returns></returns>
406+
public virtual Operand ToNumber(string errorMessage,string funName, int index) { return Error(string.Format(errorMessage, funName, index)); }
399407

400408
/// <summary>
401409
/// 转bool类型
@@ -410,6 +418,14 @@ public static Operand CreateNull()
410418
/// <param name="index"></param>
411419
/// <returns></returns>
412420
public virtual Operand ToBoolean(string errorMessage, int index) { return Error(string.Format(errorMessage, index)); }
421+
/// <summary>
422+
/// 转bool类型
423+
/// </summary>
424+
/// <param name="errorMessage"></param>
425+
/// <param name="funName"></param>
426+
/// <param name="index"></param>
427+
/// <returns></returns>
428+
public virtual Operand ToBoolean(string errorMessage, string funName, int index) { return Error(string.Format(errorMessage, funName, index)); }
413429

414430
/// <summary>
415431
/// 转String类型
@@ -424,6 +440,14 @@ public static Operand CreateNull()
424440
/// <param name="index"></param>
425441
/// <returns></returns>
426442
public virtual Operand ToText(string errorMessage, int index) { return Error(string.Format(errorMessage, index)); }
443+
/// <summary>
444+
/// 转String类型
445+
/// </summary>
446+
/// <param name="errorMessage"></param>
447+
/// <param name="funName"></param>
448+
/// <param name="index"></param>
449+
/// <returns></returns>
450+
public virtual Operand ToText(string errorMessage, string funName, int index) { return Error(string.Format(errorMessage, funName, index)); }
427451

428452
/// <summary>
429453
/// 转MyDate类型
@@ -438,6 +462,14 @@ public static Operand CreateNull()
438462
/// <param name="index"></param>
439463
/// <returns></returns>
440464
public virtual Operand ToMyDate(string errorMessage, int index) { return Error(string.Format(errorMessage, index)); }
465+
/// <summary>
466+
/// 转MyDate类型
467+
/// </summary>
468+
/// <param name="errorMessage"></param>
469+
/// <param name="funName"></param>
470+
/// <param name="index"></param>
471+
/// <returns></returns>
472+
public virtual Operand ToMyDate(string errorMessage, string funName, int index) { return Error(string.Format(errorMessage, funName, index)); }
441473

442474
/// <summary>
443475
/// 转Json类型
@@ -460,6 +492,15 @@ public static Operand CreateNull()
460492
/// <param name="index"></param>
461493
/// <returns></returns>
462494
public virtual Operand ToArray(string errorMessage, int index) { return Error(string.Format(errorMessage, index)); }
495+
/// <summary>
496+
/// 转Array类型
497+
/// </summary>
498+
/// <param name="errorMessage"></param>
499+
/// <param name="funName"></param>
500+
/// <param name="index"></param>
501+
/// <returns></returns>
502+
public virtual Operand ToArray(string errorMessage, string funName, int index) { return Error(string.Format(errorMessage, funName, index)); }
503+
463504

464505
#region Operand
465506

0 commit comments

Comments
 (0)