再次修复了代码
提高了代码的可读性
This commit is contained in:
parent
dc7635d8d0
commit
8657066b49
|
@ -8,11 +8,11 @@
|
||||||
|
|
||||||
class BusFCFSStrategy : public BusStrategyBase
|
class BusFCFSStrategy : public BusStrategyBase
|
||||||
{
|
{
|
||||||
int GetBusDirection();
|
int GetBusDirection() override;
|
||||||
|
|
||||||
bus_query_t *GetTargetQuery();
|
bus_query_t *GetTargetQuery() override;
|
||||||
|
|
||||||
bus_query_t *HandleBTWQuery();
|
bus_query_t *HandleBTWQuery() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -9,11 +9,11 @@
|
||||||
|
|
||||||
class BusSCANStrategy : public BusStrategyBase
|
class BusSCANStrategy : public BusStrategyBase
|
||||||
{
|
{
|
||||||
int GetBusDirection();
|
int GetBusDirection() override;
|
||||||
|
|
||||||
bus_query_t *GetTargetQuery();
|
bus_query_t *GetTargetQuery() override;
|
||||||
|
|
||||||
bus_query_t *HandleBTWQuery();
|
bus_query_t *HandleBTWQuery() override;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -8,11 +8,11 @@
|
||||||
|
|
||||||
class BusSSTFStrategy : public BusStrategyBase
|
class BusSSTFStrategy : public BusStrategyBase
|
||||||
{
|
{
|
||||||
int GetBusDirection();
|
int GetBusDirection() override;
|
||||||
|
|
||||||
bus_query_t *GetTargetQuery();
|
bus_query_t *GetTargetQuery() override;
|
||||||
|
|
||||||
bus_query_t *HandleBTWQuery();
|
bus_query_t *HandleBTWQuery() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ public:
|
||||||
|
|
||||||
BusStrategyBase();
|
BusStrategyBase();
|
||||||
|
|
||||||
virtual ~BusStrategyBase();
|
~BusStrategyBase() override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获得当前公交车应该前进的方向
|
* 获得当前公交车应该前进的方向
|
||||||
|
|
|
@ -47,7 +47,7 @@ public:
|
||||||
* @param stop_number 站点的数量
|
* @param stop_number 站点的数量
|
||||||
* @return 站点之间的距离
|
* @return 站点之间的距离
|
||||||
*/
|
*/
|
||||||
int GetStopSpaceLength(int stop_number) const;
|
static int GetStopSpaceLength(int stop_number) ;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 加上一定的距离
|
* 加上一定的距离
|
||||||
|
|
|
@ -10,7 +10,7 @@ PosPair::PosPair()
|
||||||
pos_y = stop_begin_y;
|
pos_y = stop_begin_y;
|
||||||
}
|
}
|
||||||
|
|
||||||
int PosPair::GetStopSpaceLength(int stop_number) const
|
int PosPair::GetStopSpaceLength(int stop_number)
|
||||||
{
|
{
|
||||||
return 2 * (stop_rail_width + stop_rail_height) / stop_number;
|
return 2 * (stop_rail_width + stop_rail_height) / stop_number;
|
||||||
}
|
}
|
||||||
|
|
|
@ -131,15 +131,13 @@ BusStrategyBase *StrategyFactory::GetStrategy(const QString& file_name)
|
||||||
break;
|
break;
|
||||||
case BUS_SCAN:
|
case BUS_SCAN:
|
||||||
controller = new BusSCANStrategy;
|
controller = new BusSCANStrategy;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
controller = nullptr;
|
controller = nullptr;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(controller != nullptr)
|
controller->rails_model->CreateRails(distance, total_station);
|
||||||
{
|
controller->strategy = chosen_strategy;
|
||||||
controller->rails_model->CreateRails(distance, total_station);
|
|
||||||
controller->strategy = chosen_strategy;
|
|
||||||
}
|
|
||||||
return controller;
|
return controller;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,9 +13,7 @@ BusModel::BusModel()
|
||||||
}
|
}
|
||||||
|
|
||||||
BusModel::~BusModel()
|
BusModel::~BusModel()
|
||||||
{
|
= default;
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void BusModel::ResetBus(rail_node_t *head)
|
void BusModel::ResetBus(rail_node_t *head)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user