Skip to content

Commit b3502d5

Browse files
committed
修改 README
1 parent fb5555d commit b3502d5

File tree

6 files changed

+55
-2
lines changed

6 files changed

+55
-2
lines changed

README-EN.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ ToolGood.Algorithm supports `Four arithmetic`, `Excel formula`, and supports `Cu
2525
}
2626
var b = engine.TryEvaluate("1=1 && 1<2 and 7-8>1", 0);// Support(支持) && || and or
2727
var c = engine.TryEvaluate("2+3", 0);
28+
var q = engine.TryEvaluate("-7 < -2 ?1 : 2", 0);
2829
var e = engine.TryEvaluate("count(array(1,2,3,4))", 0);//{} represents array, return: 4 {}代表数组,返回:4
2930
var s = engine.TryEvaluate("'aa'&'bb'", ""); //String connection, return: AABB 字符串连接,返回:aabb
3031
var r = engine.TryEvaluate("(1=1)*9+2", 0); //Return: 11 返回:11
@@ -124,6 +125,19 @@ Note: You can also use `AddParameter`, `AddParameterFromJson` to add methods, an
124125
```
125126
See unit testing for more features.
126127

128+
## Custom parameters
129+
``` csharp
130+
var helper = new ToolGood.Algorithm.AlgorithmEngineHelper();
131+
helper.IsKeywords("false"); // return true
132+
helper.IsKeywords("true"); // return true
133+
helper.IsKeywords("mysql"); // return false
134+
135+
DiyNameInfo p5 = helper.GetDiyNames("ddd(d1,22)");
136+
Assert.AreEqual("ddd", p5.Functions[0]);
137+
Assert.AreEqual("d1", p5.Parameters[0]);
138+
139+
```
140+
127141

128142
## Excel Formula
129143

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ToolGood.Algorithm支持`四则运算`、`Excel公式`,并支持`自定义参数
2626
}
2727
var b = engine.TryEvaluate("1=1 && 1<2 and 7-8>1", 0);// Support(支持) && || and or
2828
var c = engine.TryEvaluate("2+3", 0);
29+
var q = engine.TryEvaluate("-7 < -2 ?1 : 2", 0);
2930
var e = engine.TryEvaluate("count(array(1,2,3,4))", 0);//{} represents array, return: 4 {}代表数组,返回:4
3031
var s = engine.TryEvaluate("'aa'&'bb'", ""); //String connection, return: AABB 字符串连接,返回:aabb
3132
var r = engine.TryEvaluate("(1=1)*9+2", 0); //Return: 11 返回:11
@@ -124,6 +125,17 @@ bool转数值,假为`0`,真为`1`。bool转字符串,假为`FALSE`,真
124125
```
125126
更多功能请看一下单元测试。
126127

128+
## 自定义参数
129+
``` csharp
130+
var helper = new ToolGood.Algorithm.AlgorithmEngineHelper();
131+
helper.IsKeywords("false"); // return true
132+
helper.IsKeywords("true"); // return true
133+
helper.IsKeywords("mysql"); // return false
134+
135+
DiyNameInfo p5 = helper.GetDiyNames("ddd(d1,22)");
136+
Assert.AreEqual("ddd", p5.Functions[0]);
137+
Assert.AreEqual("d1", p5.Parameters[0]);
138+
```
127139

128140
## Excel公式
129141

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void Test()
4343
public void Test2()
4444
{
4545
var helper = new ToolGood.Algorithm.AlgorithmEngineHelper();
46-
var b = helper.IsKeywords("true");
46+
var b = helper.IsKeywords("false");
4747
Assert.IsTrue(b);
4848

4949

java/toolgood.algorithm/README-EN.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ToolGood.Algorithm supports `Four arithmetic`, `Excel formula`, and supports `Cu
2424
}
2525
double b = engine.TryEvaluate("1=1 && 1<2 and 7-8>1", 0.0);// 支持 && || and or
2626
double c = engine.TryEvaluate("2+3", 0);
27+
double q = engine.TryEvaluate("-7 < -2 ?1 : 2", 0);
2728
double d = engine.TryEvaluate("count(array(1,2,3,4))", 0.0);//{}代表数组,返回:4
2829
String s = engine.TryEvaluate("'aa'&'bb'", ""); //字符串连接,返回:aabb
2930
int r = engine.TryEvaluate("(1=1)*9+2", 0); //返回:11
@@ -119,6 +120,19 @@ Note: You can also use `AddParameter`, `AddParameterFromJson` to add methods, an
119120
```
120121
See unit testing for more features.
121122

123+
## Custom parameters
124+
``` csharp
125+
var helper = new ToolGood.Algorithm.AlgorithmEngineHelper();
126+
helper.IsKeywords("false"); // return true
127+
helper.IsKeywords("true"); // return true
128+
helper.IsKeywords("mysql"); // return false
129+
130+
DiyNameInfo p5 = helper.GetDiyNames("ddd(d1,22)");
131+
Assert.AreEqual("ddd", p5.Functions[0]);
132+
Assert.AreEqual("d1", p5.Parameters[0]);
133+
134+
```
135+
122136
## Excel Formula
123137

124138
Functions: `logical functions`, `mathematics and trigonometric functions`, `text functions`, `statistical functions`, `date and time functions`

java/toolgood.algorithm/README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ToolGood.Algorithm支持`四则运算`、`Excel公式`,并支持`自定义参数
2424
}
2525
double b = engine.TryEvaluate("1=1 && 1<2 and 7-8>1", 0.0);// 支持 && || and or
2626
double c = engine.TryEvaluate("2+3", 0);
27+
double q = engine.TryEvaluate("-7 < -2 ?1 : 2", 0);
2728
double d = engine.TryEvaluate("count(array(1,2,3,4))", 0.0);//{}代表数组,返回:4
2829
String s = engine.TryEvaluate("'aa'&'bb'", ""); //字符串连接,返回:aabb
2930
int r = engine.TryEvaluate("(1=1)*9+2", 0); //返回:11
@@ -116,6 +117,18 @@ public class Cylinder extends AlgorithmEngine {
116117
```
117118
更多功能请看一下单元测试。
118119

120+
## 自定义参数
121+
``` csharp
122+
var helper = new ToolGood.Algorithm.AlgorithmEngineHelper();
123+
helper.IsKeywords("false"); // return true
124+
helper.IsKeywords("true"); // return true
125+
helper.IsKeywords("mysql"); // return false
126+
127+
DiyNameInfo p5 = helper.GetDiyNames("ddd(d1,22)");
128+
Assert.AreEqual("ddd", p5.Functions[0]);
129+
Assert.AreEqual("d1", p5.Parameters[0]);
130+
```
131+
119132
## Excel公式
120133

121134
函数:`逻辑函数``数学与三角函数``文本函数``统计函数``日期与时间函数`

java/toolgood.algorithm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>toolgood</groupId>
88
<artifactId>toolgood-algorithm</artifactId>
9-
<version>3.0.1.0</version>
9+
<version>3.0.2.0</version>
1010

1111
<name>toolgood.algorithm</name>
1212
<url>https://github.com/toolgood/ToolGood.Algorithm</url>

0 commit comments

Comments
 (0)