删除了冗余的代码
修正了readme中的错误
This commit is contained in:
parent
63a563de9f
commit
229c87c97a
|
@ -52,7 +52,7 @@ git clone http://10.3.255.244:8801/2021211180/2021211180.git
|
||||||
cd 20212111180
|
cd 20212111180
|
||||||
mkdir build # 创建编译的文件夹
|
mkdir build # 创建编译的文件夹
|
||||||
cd build
|
cd build
|
||||||
cmake .. -G "MinGW MakeFiles" # 在第一次生成之后就不必再使用"-G"参数指定编译类型
|
cmake .. -G "MinGW Makefiles" # 在第一次生成之后就不必再使用"-G"参数指定编译类型
|
||||||
cmake --build .
|
cmake --build .
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -40,5 +40,4 @@ void UpBus(rail_node_t* rail_node);
|
||||||
* @param rail_node 当前所在的站点
|
* @param rail_node 当前所在的站点
|
||||||
*/
|
*/
|
||||||
void DownBus(rail_node_t* rail_node);
|
void DownBus(rail_node_t* rail_node);
|
||||||
int sum(int a,int b);
|
|
||||||
#endif //AUTO_PILOT_BUS_BUS_H
|
#endif //AUTO_PILOT_BUS_BUS_H
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
int FCFSFunction(rail_node_t rails, up_bus_t up_queries, down_bus_t down_queries);
|
int FCFSFunction(rail_node_t rails, up_bus_t up_queries, down_bus_t down_queries);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 朢ăçźĺŻ»ć‰ľć—¶é—´äĽ<EFBFBD>ĺ…<EFBFBD>çš„ç–略控ĺ<EFBFBD>¶ĺ‡˝ć•°
|
* 最短寻找时间优先的策略控制函数
|
||||||
* @param rails 轨道链表
|
* @param rails 轨道链表
|
||||||
* @param up_queries 上车请求队列
|
* @param up_queries 上车请求队列
|
||||||
* @param down_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);
|
int SSTFFunction(rail_node_t rails, up_bus_t up_queries, down_bus_t down_queries);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 顺便服务的ç–略控ĺ<EFBFBD>¶ĺ‡˝ć•„1¤7
|
* 顺便服务的策略控制函数
|
||||||
* @param rails 轨道链表
|
* @param rails 轨道链表
|
||||||
* @param up_queries 上车请求队列
|
* @param up_queries 上车请求队列
|
||||||
* @param down_queries 下车请求队列
|
* @param down_queries 下车请求队列
|
||||||
* @return 车前进的方向
|
* @return 车前进的方向
|
||||||
*/
|
*/
|
||||||
int SCANFunction(rail_node_t rails, up_bus_t up_queries, down_bus_t down_queries);
|
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
|
#endif //AUTO_PILOT_BUS_CONTROLLER_H
|
||||||
|
|
|
@ -40,6 +40,4 @@ rail_node_t *FindNode(int id);
|
||||||
|
|
||||||
int add(int a, int b);
|
int add(int a, int b);
|
||||||
|
|
||||||
int power(int a, int b);
|
|
||||||
|
|
||||||
#endif //AUTO_PILOT_BUS_RAIL_H
|
#endif //AUTO_PILOT_BUS_RAIL_H
|
||||||
|
|
|
@ -1,7 +1 @@
|
||||||
#include "bus.h"
|
#include "bus.h"
|
||||||
int sum(int a,int b)
|
|
||||||
{
|
|
||||||
int sum=b+a;
|
|
||||||
return sum;
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,8 +1,4 @@
|
||||||
//
|
//
|
||||||
// Created by ricardo on 2022/5/6.
|
// Created by ricardo on 2022/5/6.
|
||||||
//
|
//
|
||||||
#include "controller.h"
|
#include "controller.h"
|
||||||
int add(int a,int b)
|
|
||||||
{
|
|
||||||
printf("%d",a+b);
|
|
||||||
}
|
|
|
@ -5,9 +5,4 @@ rail_node_t *rails;
|
||||||
int add(int a, int b)
|
int add(int a, int b)
|
||||||
{
|
{
|
||||||
return a+ b;
|
return a+ b;
|
||||||
}
|
|
||||||
|
|
||||||
int power(int a, int b)
|
|
||||||
{
|
|
||||||
return a*b;
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user