Skip to content

Commit 33833dd

Browse files
BeardedManZhaoBeardedManZhao
committed
update
1 parent 09349d5 commit 33833dd

25 files changed

+553
-71
lines changed

‎AsLib/LibSrc/.idea/workspace.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AsLib/LibSrc/cmake-build-debug/Testing/Temporary/LastTest.log‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Start testing: Feb 26 13:00 ?D1��������?����??
1+
Start testing: Mar 26 11:37 ?D1��������?����??
22
----------------------------------------------------------
3-
End testing: Feb 26 13:00 ?D1��������?����??
3+
End testing: Mar 26 11:37 ?D1��������?����??

‎AsLib/libBeardedManZhao.dll‎

0 Bytes
Binary file not shown.

‎README-Chinese.md‎

Lines changed: 65 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,79 @@
88

99
各种算法、向量计算、坐标计算、空间坐标等功能皆含于内，API操作简单，机器学习与数学、医学、人工智能等领域具有很高的实用性。
1010

11-
### Maven 依赖
11+
## Maven 依赖
1212

1313
您可以通过maven将算术之星（AS-MB）集成到您的项目中，maven的配置如下所示。您可以将其添加到maven项目中，也可以从Releases下载并手动将其集成到项目中。
1414

1515
```xml
16-
16+
<!-- algorithmStar 机器学习与数据计算库程序 maven 坐标 -->
1717
<dependencies>
1818
<dependency>
1919
<groupId>io.github.BeardedManZhao</groupId>
2020
<artifactId>algorithmStar</artifactId>
21-
<version>1.16</version>
21+
<version>1.17</version>
22+
</dependency>
23+
</dependencies>
24+
```
25+
### AS库的所需依赖
26+
27+
在1.17版本之后，AS库的所有依赖被剥离，更好避免依赖的捆绑问题，减少项目发生冲突的可能性，同时也可以按照开发者的需求使用更加适合的依赖配置项，您可以在这里查看到AS库所依赖的第三方库依赖。
28+
29+
#### 必选依赖项
30+
AS库在进行诸多计算函数的时候会产生一些日志数据，因此AS库的使用需要导入日志依赖项，这个依赖项是必不可少的，请按照如下的方式导入依赖。
31+
```xml
32+
<dependencies>
33+
<!-- 使用 log4j2 的适配器进行绑定 -->
34+
<dependency>
35+
<groupId>org.apache.logging.log4j</groupId>
36+
<artifactId>log4j-slf4j-impl</artifactId>
37+
<version>2.20.0</version>
38+
<!--<scope>provided</scope>-->
39+
</dependency>
40+
41+
<!-- log4j2 日志门面 -->
42+
<dependency>
43+
<groupId>org.apache.logging.log4j</groupId>
44+
<artifactId>log4j-api</artifactId>
45+
<version>2.20.0</version>
46+
<!--<scope>provided</scope>-->
47+
</dependency>
48+
<!-- log4j2 日志实面 -->
49+
<dependency>
50+
<groupId>org.apache.logging.log4j</groupId>
51+
<artifactId>log4j-core</artifactId>
52+
<version>2.20.0</version>
53+
<!--<scope>provided</scope>-->
54+
</dependency>
55+
</dependencies>
56+
```
57+
#### 可选依赖项
58+
59+
AS库在针对数据库，Spark等各种平台对接的时候，需要使用到第三方依赖程序包，这些包是可选的，如果您不需要使用这些功能，您可以不去导入依赖，如果您需要，可以参考下面的配置。
60+
```xml
61+
<dependencies>
62+
<!-- MySQL数据库连接驱动 如果您需要连接的关系型数据库是其它类型，这里也可以随之修改 -->
63+
<dependency>
64+
<groupId>mysql</groupId>
65+
<artifactId>mysql-connector-java</artifactId>
66+
<version>8.0.30</version>
67+
</dependency>
68+
<!-- spark 三大模块的依赖程序开发包，如果您需要使用这里也可以选择导入，如果不需要则不导入 -->
69+
<dependency>
70+
<groupId>org.apache.spark</groupId>
71+
<artifactId>spark-core_2.12</artifactId>
72+
<version>3.1.3</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.apache.spark</groupId>
76+
<artifactId>spark-sql_2.12</artifactId>
77+
<version>3.1.3</version>
78+
</dependency>
79+
80+
<dependency>
81+
<groupId>org.apache.spark</groupId>
82+
<artifactId>spark-mllib_2.12</artifactId>
83+
<version>3.1.3</version>
2284
</dependency>
2385
</dependencies>
2486
```

‎README.md‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,70 @@ can add it to your maven project, or you can download it from Releases and manua
2121
<dependency>
2222
<groupId>io.github.BeardedManZhao</groupId>
2323
<artifactId>algorithmStar</artifactId>
24-
<version>1.16</version>
24+
<version>1.17</version>
25+
</dependency>
26+
</dependencies>
27+
```
28+
29+
### Required dependencies of the AS library
30+
31+
After version 1.17, all dependencies of the AS library have been stripped to better avoid binding dependencies and reduce the possibility of project conflicts. At the same time, more suitable dependency configuration items can be used according to the needs of developers. You can view third-party library dependencies on which the AS library depends here.
32+
33+
#### Required Dependencies
34+
The AS library generates some log data when performing many calculation functions. Therefore, the use of the AS library requires importing log dependencies, which are essential. Please import the dependencies as follows.
35+
```xml
36+
<dependencies>
37+
<!-- Binding using the adapter of log4j2 -->
38+
<dependency>
39+
<groupId>org.apache.logging.log4j</groupId>
40+
<artifactId>log4j-slf4j-impl</artifactId>
41+
<version>2.20.0</version>
42+
<!--<scope>provided</scope>-->
43+
</dependency>
44+
45+
<!-- Log4j2 log facade -->
46+
<dependency>
47+
<groupId>org.apache.logging.log4j</groupId>
48+
<artifactId>log4j-api</artifactId>
49+
<version>2.20.0</version>
50+
<!--<scope>provided</scope>-->
51+
</dependency>
52+
<!-- Log4j2 log real surface -->
53+
<dependency>
54+
<groupId>org.apache.logging.log4j</groupId>
55+
<artifactId>log4j-core</artifactId>
56+
<version>2.20.0</version>
57+
<!--<scope>provided</scope>-->
58+
</dependency>
59+
</dependencies>
60+
```
61+
#### 可选依赖项
62+
63+
When interfacing with various platforms such as databases and Sparks, the AS library needs to use third-party dependency packages, which are optional. If you do not need to use these functions, you may not need to import dependencies. If you need to, you can refer to the following configuration.
64+
```xml
65+
<dependencies>
66+
<!-- MySQL database connection driver If the relational database you want to connect to is of another type, you can also modify it here -->
67+
<dependency>
68+
<groupId>mysql</groupId>
69+
<artifactId>mysql-connector-java</artifactId>
70+
<version>8.0.30</version>
71+
</dependency>
72+
<!-- The dependency development package for the three major Spark modules can also be imported if you need to use it here, or not if you don't need it -->
73+
<dependency>
74+
<groupId>org.apache.spark</groupId>
75+
<artifactId>spark-core_2.12</artifactId>
76+
<version>3.1.3</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.apache.spark</groupId>
80+
<artifactId>spark-sql_2.12</artifactId>
81+
<version>3.1.3</version>
82+
</dependency>
83+
84+
<dependency>
85+
<groupId>org.apache.spark</groupId>
86+
<artifactId>spark-mllib_2.12</artifactId>
87+
<version>3.1.3</version>
2588
</dependency>
2689
</dependencies>
2790
```

‎src_code/README-Chinese.md‎

Lines changed: 101 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
### 更新日志
1010

11-
* 框架版本：1.15 - 1.16
11+
* 框架版本：1.16 - 1.17
1212
* 将集成器的名称修改为“Integrator”。
1313
* 提供卷积函数的计算支持，能够通过卷积函数将特征放大同时缩小图像矩阵的元素数量。
1414

@@ -605,10 +605,10 @@ public class MAIN1 {
605605
FinalSeries.parse("tang8", "W", "110xxxxxxxx", "30000"),
606606
FinalSeries.parse("yang9", "W", "110xxxxxxxx", "30000")
607607
);
608-
// 查看数据集
609-
System.out.println(insert.desc());
610-
// 输出表的HTML
611-
insert.into_outHtml("C:\\Users\\Liming\\Desktop\\fsdownload\\res11234.html", "myTable");
608+
// 输出表的HTML 然后查看表中的数据
609+
System.out.println(
610+
insert.into_outHtml("C:\\Users\\Liming\\Desktop\\fsdownload\\res11234.html", "myTable")
611+
);
612612
}
613613
}
614614
```
@@ -715,4 +715,100 @@ public class MAIN1 {
715715
}
716716
```
717717

718+
* 支持表数据之间的运算操作，能够将表中所有的数值类型进行求和与做差计算，计算之后将返回新DF对象。
719+
720+
```java
721+
package zhao.algorithmMagic;
722+
723+
import zhao.algorithmMagic.operands.table.*;
724+
725+
public class MAIN1 {
726+
public static void main(String[] args) {
727+
// 创建一个空的 DataFrame 对象
728+
FDataFrame select1 = FDataFrame.select(
729+
FieldCell.parse("id", "name", "sex", "age"), 1
730+
);
731+
// 手动插入数据
732+
select1.insert(
733+
FinalSeries.parse("1", "zhao", "M", "19"),
734+
FinalSeries.parse("2", "tang", "W", "18"),
735+
FinalSeries.parse("3", "yang", "W", "20"),
736+
FinalSeries.parse("4", "shen", "W", "19")
737+
);
738+
// 创建一个空的 DataFrame 对象
739+
FDataFrame select2 = FDataFrame.select(
740+
FieldCell.parse("id", "name", "sex", "age"), 1
741+
);
742+
// 手动插入数据
743+
select2.insert(
744+
FinalSeries.parse("1", "zhao", "M", "19"),
745+
FinalSeries.parse("2", "tang", "W", "18"),
746+
FinalSeries.parse("3", "yang", "W", "20")
747+
);
748+
// 进行求和与做差的运算操作
749+
System.out.println(select1.add(select2));
750+
System.out.println(select1.diff(select2));
751+
}
752+
}
753+
```
754+
755+
* DataFrame数据对象指定列合并
756+
757+
```java
758+
package zhao.algorithmMagic;
759+
760+
import zhao.algorithmMagic.operands.table.*;
761+
762+
import java.sql.SQLException;
763+
764+
public class MAIN1 {
765+
public static void main(String[] args) {
766+
// 创建一个空的 DataFrame 对象
767+
FDataFrame select = FDataFrame.select(
768+
FieldCell.parse("id", "name", "sex", "age"), 1
769+
);
770+
// 手动插入数据 然后进行分组
771+
GroupDataFrameData groupDataFrameData = select.insert(
772+
FinalSeries.parse("1", "zhao", "M", "19"),
773+
FinalSeries.parse("2", "tang", "W", "18"),
774+
FinalSeries.parse("3", "yang", "W", "20")
775+
).groupBy("sex");
776+
// 打印出 M 组的数据
777+
System.out.println(groupDataFrameData.getDFByGroup("M"));
778+
// 打印出 W 组的数据
779+
System.out.println(groupDataFrameData.getDFByGroup("W"));
780+
}
781+
}
782+
```
783+
784+
* 新版本注意事项：此版本中的所有依赖被标记为 provided 这样可以最大化的降低冗余程度，能够根据自己的实际项目来进行相关的配置，因此在进行AS库注入的时候请将以下的必须项一键导入。
785+
786+
```xml
787+
788+
<dependencies>
789+
<!-- 使用 log4j2 的适配器进行绑定 -->
790+
<dependency>
791+
<groupId>org.apache.logging.log4j</groupId>
792+
<artifactId>log4j-slf4j-impl</artifactId>
793+
<version>2.20.0</version>
794+
<!--<scope>provided</scope>-->
795+
</dependency>
796+
797+
<!-- log4j2 日志门面 -->
798+
<dependency>
799+
<groupId>org.apache.logging.log4j</groupId>
800+
<artifactId>log4j-api</artifactId>
801+
<version>2.20.0</version>
802+
<!--<scope>provided</scope>-->
803+
</dependency>
804+
<!-- log4j2 日志实面 -->
805+
<dependency>
806+
<groupId>org.apache.logging.log4j</groupId>
807+
<artifactId>log4j-core</artifactId>
808+
<version>2.20.0</version>
809+
<!--<scope>provided</scope>-->
810+
</dependency>
811+
</dependencies>
812+
```
813+
718814
### Version update date : xx xx-xx-xx

‎src_code/README.md‎

Lines changed: 75 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
### Update log:
1010

11-
* Framework version: 1.16 - x.xx
11+
* Framework version: 1.16 - 1.17
1212
* Change the name of the integrator to Integrator.
1313
* It provides the calculation support of convolution function, which can enlarge the features and reduce the number of
1414
elements in the image matrix.
@@ -606,10 +606,10 @@ public class MAIN1 {
606606
FinalSeries.parse("tang8", "W", "110xxxxxxxx", "30000"),
607607
FinalSeries.parse("yang9", "W", "110xxxxxxxx", "30000")
608608
);
609-
// 查看数据集
610-
System.out.println(insert.desc());
611-
// 输出表的HTML
612-
insert.into_outHtml("C:\\Users\\Liming\\Desktop\\fsdownload\\res11234.html", "myTable");
609+
// 输出表的HTML 然后查看表中的数据
610+
System.out.println(
611+
insert.into_outHtml("C:\\Users\\Liming\\Desktop\\fsdownload\\res11234.html", "myTable")
612+
);
613613
}
614614
}
615615
```
@@ -718,4 +718,74 @@ public class MAIN1 {
718718
}
719719
```
720720

721+
* Supports operations between table data, and can perform summation and subtraction calculations on all numeric types in
722+
the table. After calculation, a new DF object will be returned.
723+
724+
```java
725+
package zhao.algorithmMagic;
726+
727+
import zhao.algorithmMagic.operands.table.*;
728+
729+
public class MAIN1 {
730+
public static void main(String[] args) {
731+
// 创建一个空的 DataFrame 对象
732+
FDataFrame select1 = FDataFrame.select(
733+
FieldCell.parse("id", "name", "sex", "age"), 1
734+
);
735+
// 手动插入数据
736+
select1.insert(
737+
FinalSeries.parse("1", "zhao", "M", "19"),
738+
FinalSeries.parse("2", "tang", "W", "18"),
739+
FinalSeries.parse("3", "yang", "W", "20"),
740+
FinalSeries.parse("4", "shen", "W", "19")
741+
);
742+
// 创建一个空的 DataFrame 对象
743+
FDataFrame select2 = FDataFrame.select(
744+
FieldCell.parse("id", "name", "sex", "age"), 1
745+
);
746+
// 手动插入数据
747+
select2.insert(
748+
FinalSeries.parse("1", "zhao", "M", "19"),
749+
FinalSeries.parse("2", "tang", "W", "18"),
750+
FinalSeries.parse("3", "yang", "W", "20")
751+
);
752+
// 进行求和与做差的运算操作
753+
System.out.println(select1.add(select2));
754+
System.out.println(select1.diff(select2));
755+
}
756+
}
757+
```
758+
759+
* Note for the new version: All dependencies in this version are marked as provided, which can minimize redundancy and
760+
enable related configuration based on your actual project. Therefore, when performing AS library injection, please
761+
import the following required items in one click.
762+
763+
```xml
764+
765+
<dependencies>
766+
<!-- 使用 log4j2 的适配器进行绑定 -->
767+
<dependency>
768+
<groupId>org.apache.logging.log4j</groupId>
769+
<artifactId>log4j-slf4j-impl</artifactId>
770+
<version>2.20.0</version>
771+
<!--<scope>provided</scope>-->
772+
</dependency>
773+
774+
<!-- log4j2 日志门面 -->
775+
<dependency>
776+
<groupId>org.apache.logging.log4j</groupId>
777+
<artifactId>log4j-api</artifactId>
778+
<version>2.20.0</version>
779+
<!--<scope>provided</scope>-->
780+
</dependency>
781+
<!-- log4j2 日志实面 -->
782+
<dependency>
783+
<groupId>org.apache.logging.log4j</groupId>
784+
<artifactId>log4j-core</artifactId>
785+
<version>2.20.0</version>
786+
<!--<scope>provided</scope>-->
787+
</dependency>
788+
</dependencies>
789+
```
790+
721791
### Version update date : xx xx-xx-xx

0 commit comments

Comments
 (0)