post-guard/auto_bus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了SCAN策略中遇到公交车停下后本来前进方向丢失的问题

Browse Source
This commit is contained in:
jackfiled 2022-06-05 20:30:47 +08:00
parent 96961c91c9
commit 6e79af8b06
4 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
all_test/main.c
View File

@ -176,13 +176,13 @@ int main()
direction = SCANDirection(target_query, direction); direction = SCANDirection(target_query, direction);
// 处理下一个需要处理的请求就在脚底下的情况 // 处理下一个需要处理的请求就在脚底下的情况
if(target_query != NULL && direction == BUS_STOP && target_query->node == the_bus->rail_node_pos) if(target_query != NULL && target_query->node == the_bus->rail_node_pos)
{ {
while (target_query != NULL && direction == BUS_STOP && target_query->node == the_bus->rail_node_pos) while (target_query != NULL && target_query->node == the_bus->rail_node_pos)
{ {
DeleteQuery(target_query); DeleteQuery(target_query);
target_query = SCANGetQuery(direction); target_query = SSTFGetQuery();
direction = SCANDirection(target_query, direction); direction = SSTFDirection(target_query);
} }
} }
RunBus(direction); RunBus(direction);

15
include/controller.h
View File

@ -71,4 +71,19 @@ int SCANDirection(bus_query_t *query, int orientation);
* @return 服务的请求指针 * @return 服务的请求指针
*/ */
bus_query_t *SCANBTWQuery(); bus_query_t *SCANBTWQuery();
/**
* FCFS策略的控制函数
*/
void FCFSControl();
/**
* SSTF策略的控制函数
*/
void SSTFControl();
/**
* SCAN策略的控制函数
*/
void SCANControl();
#endif //AUTO_PILOT_BUS_CONTROLLER_H #endif //AUTO_PILOT_BUS_CONTROLLER_H

4
main.c
View File

@ -87,9 +87,9 @@ int main()
direction = SSTFDirection(target_query); direction = SSTFDirection(target_query);
// 处理下一个需要处理的请求就在脚底下的情况 // 处理下一个需要处理的请求就在脚底下的情况
if(target_query != NULL && direction == BUS_STOP && target_query->node == the_bus->rail_node_pos) if(target_query != NULL && target_query->node == the_bus->rail_node_pos)
{ {
while (target_query != NULL && direction == BUS_STOP && target_query->node == the_bus->rail_node_pos) while (target_query != NULL && target_query->node == the_bus->rail_node_pos)
{ {
DeleteQuery(target_query); DeleteQuery(target_query);
target_query = SSTFGetQuery(); target_query = SSTFGetQuery();

23
src/controller.c
View File

@ -238,10 +238,6 @@ int SCANDirection(bus_query_t *query, int orientation)
{ {
return BUS_COUNTER_CLOCK_WISE; return BUS_COUNTER_CLOCK_WISE;
} }
else if(distance == 0)
{
return BUS_STOP;
}
else else
{ {
return BUS_CLOCK_WISE; return BUS_CLOCK_WISE;
@ -261,10 +257,6 @@ int SCANDirection(bus_query_t *query, int orientation)
return BUS_CLOCK_WISE; return BUS_CLOCK_WISE;
} }
} }
else if(distance == 0)
{
return BUS_STOP;
}
else else
{ {
return orientation; return orientation;
@ -292,3 +284,18 @@ bus_query_t *SCANBTWQuery()
return NULL; return NULL;
} }
void FCFSControl()
{
}
void SSTFControl()
{
}
void SCANControl()
{
}