diff --git a/README.md b/README.md index 9dc71cf..c61baf0 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ git clone http://10.3.255.244:8801/2021211180/2021211180.git cd 20212111180 mkdir build # 创建编译的文件夹 cd build -cmake .. -G "MinGW MakeFiles" # 在第一次生成之后就不必再使用"-G"参数指定编译类型 +cmake .. -G "MinGW Makefiles" # 在第一次生成之后就不必再使用"-G"参数指定编译类型 cmake --build . ``` diff --git a/include/bus.h b/include/bus.h index beae35f..ff85bc1 100644 --- a/include/bus.h +++ b/include/bus.h @@ -40,5 +40,4 @@ void UpBus(rail_node_t* rail_node); * @param rail_node 当前所在的站点 */ void DownBus(rail_node_t* rail_node); -int sum(int a,int b); #endif //AUTO_PILOT_BUS_BUS_H diff --git a/include/controller.h b/include/controller.h index 70a39bf..e6096f9 100644 --- a/include/controller.h +++ b/include/controller.h @@ -17,7 +17,7 @@ int FCFSFunction(rail_node_t rails, up_bus_t up_queries, down_bus_t down_queries); /** - * 朢短寻找时间优先的策略控制函数 + * 最短寻找时间优先的策略控制函数 * @param rails 轨道链表 * @param up_queries 上车请求队列 * @param down_queries 下车请求队列 @@ -26,13 +26,12 @@ int FCFSFunction(rail_node_t rails, up_bus_t up_queries, down_bus_t down_queries int SSTFFunction(rail_node_t rails, up_bus_t up_queries, down_bus_t down_queries); /** - * 顺便服务的策略控制函敄17 + * 顺便服务的策略控制函数 * @param rails 轨道链表 * @param up_queries 上车请求队列 * @param down_queries 下车请求队列 * @return 车前进的方向 */ int SCANFunction(rail_node_t rails, up_bus_t up_queries, down_bus_t down_queries); -int add(int a,int b); #endif //AUTO_PILOT_BUS_CONTROLLER_H diff --git a/include/rail.h b/include/rail.h index bc55e32..02f237d 100644 --- a/include/rail.h +++ b/include/rail.h @@ -40,6 +40,4 @@ rail_node_t *FindNode(int id); int add(int a, int b); -int power(int a, int b); - #endif //AUTO_PILOT_BUS_RAIL_H diff --git a/src/bus.c b/src/bus.c index c1086c7..f47b66b 100644 --- a/src/bus.c +++ b/src/bus.c @@ -1,7 +1 @@ -#include "bus.h" -int sum(int a,int b) -{ - int sum=b+a; - return sum; - -} \ No newline at end of file +#include "bus.h" \ No newline at end of file diff --git a/src/controller.c b/src/controller.c index 3f3867a..4444f4a 100644 --- a/src/controller.c +++ b/src/controller.c @@ -1,8 +1,4 @@ // // Created by ricardo on 2022/5/6. // -#include "controller.h" -int add(int a,int b) -{ - printf("%d",a+b); -} \ No newline at end of file +#include "controller.h" \ No newline at end of file diff --git a/src/rail.c b/src/rail.c index a73e926..0dd3efd 100644 --- a/src/rail.c +++ b/src/rail.c @@ -5,9 +5,4 @@ rail_node_t *rails; int add(int a, int b) { return a+ b; -} - -int power(int a, int b) -{ - return a*b; } \ No newline at end of file