Merge pull request #87 from DragonAura/dev

style(CAPI): 🎨 change some different naming styles

CAPI/API/include/API.h

@@ -22,7 +22,7 @@
 
 #include "structures.h"
 
-const constexpr int num_of_grid_per_cell = 1000;
+const constexpr int numOfGridPerCell = 1000;
 
 class IAI;
 
@@ -39,7 +39,7 @@ public:
     virtual std::shared_ptr<const THUAI6::Butcher> ButcherGetSelfInfo() const = 0;
 
     virtual std::vector<std::vector<THUAI6::PlaceType>> GetFullMap() const = 0;
-    virtual THUAI6::PlaceType GetPlaceType(int32_t CellX, int32_t CellY) const = 0;
+    virtual THUAI6::PlaceType GetPlaceType(int32_t cellX, int32_t cellY) const = 0;
 
     // 供IAPI使用的操作相关的部分
     virtual bool Move(int64_t time, double angle) = 0;
@@ -99,8 +99,8 @@ public:
     virtual std::future<bool> Wait() = 0;
 
     // 获取视野内可见的人类/屠夫的信息
-    [[nodiscard]] virtual std::vector<std::shared_ptr<const THUAI6::Human>> GetHuman() const = 0;
-    [[nodiscard]] virtual std::vector<std::shared_ptr<const THUAI6::Butcher>> GetButcher() const = 0;
+    [[nodiscard]] virtual std::vector<std::shared_ptr<const THUAI6::Human>> GetHumans() const = 0;
+    [[nodiscard]] virtual std::vector<std::shared_ptr<const THUAI6::Butcher>> GetButchers() const = 0;
 
     // 获取视野内可见的道具信息
     [[nodiscard]] virtual std::vector<std::shared_ptr<const THUAI6::Prop>> GetProps() const = 0;
@@ -120,13 +120,13 @@ public:
     // 获取指定格子中心的坐标
     [[nodiscard]] static inline int CellToGrid(int cell) noexcept
     {
-        return cell * num_of_grid_per_cell + num_of_grid_per_cell / 2;
+        return cell * numOfGridPerCell + numOfGridPerCell / 2;
     }
 
     // 获取指定坐标点所位于的格子的 X 序号
     [[nodiscard]] static inline int GridToCell(int grid) noexcept
     {
-        return grid / num_of_grid_per_cell;
+        return grid / numOfGridPerCell;
     }
 
     // 用于DEBUG的输出函数，选手仅在开启Debug模式的情况下可以使用
@@ -205,8 +205,8 @@ public:
 
     std::future<bool> Wait() override;
 
-    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Human>> GetHuman() const override;
-    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Butcher>> GetButcher() const override;
+    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Human>> GetHumans() const override;
+    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Butcher>> GetButchers() const override;
 
     [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Prop>> GetProps() const override;
 
@@ -272,8 +272,8 @@ public:
 
     std::future<bool> Wait() override;
 
-    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Human>> GetHuman() const override;
-    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Butcher>> GetButcher() const override;
+    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Human>> GetHumans() const override;
+    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Butcher>> GetButchers() const override;
 
     [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Prop>> GetProps() const override;
 
@@ -331,8 +331,8 @@ public:
 
     std::future<bool> Wait() override;
 
-    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Human>> GetHuman() const override;
-    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Butcher>> GetButcher() const override;
+    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Human>> GetHumans() const override;
+    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Butcher>> GetButchers() const override;
 
     [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Prop>> GetProps() const override;
 
@@ -385,8 +385,8 @@ public:
 
     std::future<bool> Wait() override;
 
-    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Human>> GetHuman() const override;
-    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Butcher>> GetButcher() const override;
+    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Human>> GetHumans() const override;
+    [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Butcher>> GetButchers() const override;
 
     [[nodiscard]] std::vector<std::shared_ptr<const THUAI6::Prop>> GetProps() const override;
 

CAPI/API/src/API.cpp

@@ -157,22 +157,22 @@ std::future<bool> ButcherAPI::Wait()
                           { return logic.WaitThread(); });
 }
 
-std::vector<std::shared_ptr<const THUAI6::Butcher>> HumanAPI::GetButcher() const
+std::vector<std::shared_ptr<const THUAI6::Butcher>> HumanAPI::GetButchers() const
 {
     return logic.GetButchers();
 }
 
-std::vector<std::shared_ptr<const THUAI6::Human>> HumanAPI::GetHuman() const
+std::vector<std::shared_ptr<const THUAI6::Human>> HumanAPI::GetHumans() const
 {
     return logic.GetHumans();
 }
 
-std::vector<std::shared_ptr<const THUAI6::Butcher>> ButcherAPI::GetButcher() const
+std::vector<std::shared_ptr<const THUAI6::Butcher>> ButcherAPI::GetButchers() const
 {
     return logic.GetButchers();
 }
 
-std::vector<std::shared_ptr<const THUAI6::Human>> ButcherAPI::GetHuman() const
+std::vector<std::shared_ptr<const THUAI6::Human>> ButcherAPI::GetHumans() const
 {
     return logic.GetHumans();
 }
@@ -192,14 +192,14 @@ std::vector<std::vector<THUAI6::PlaceType>> HumanAPI::GetFullMap() const
     return logic.GetFullMap();
 }
 
-THUAI6::PlaceType HumanAPI::GetPlaceType(int32_t CellX, int32_t CellY) const
+THUAI6::PlaceType HumanAPI::GetPlaceType(int32_t cellX, int32_t cellY) const
 {
-    return logic.GetPlaceType(CellX, CellY);
+    return logic.GetPlaceType(cellX, cellY);
 }
 
-THUAI6::PlaceType ButcherAPI::GetPlaceType(int32_t CellX, int32_t CellY) const
+THUAI6::PlaceType ButcherAPI::GetPlaceType(int32_t cellX, int32_t cellY) const
 {
-    return logic.GetPlaceType(CellX, CellY);
+    return logic.GetPlaceType(cellX, cellY);
 }
 
 std::vector<std::vector<THUAI6::PlaceType>> ButcherAPI::GetFullMap() const

CAPI/API/src/DebugAPI.cpp

@@ -288,22 +288,22 @@ std::future<bool> ButcherDebugAPI::Wait()
                           { return logic.WaitThread(); });
 }
 
-std::vector<std::shared_ptr<const THUAI6::Butcher>> HumanDebugAPI::GetButcher() const
+std::vector<std::shared_ptr<const THUAI6::Butcher>> HumanDebugAPI::GetButchers() const
 {
     return logic.GetButchers();
 }
 
-std::vector<std::shared_ptr<const THUAI6::Human>> HumanDebugAPI::GetHuman() const
+std::vector<std::shared_ptr<const THUAI6::Human>> HumanDebugAPI::GetHumans() const
 {
     return logic.GetHumans();
 }
 
-std::vector<std::shared_ptr<const THUAI6::Butcher>> ButcherDebugAPI::GetButcher() const
+std::vector<std::shared_ptr<const THUAI6::Butcher>> ButcherDebugAPI::GetButchers() const
 {
     return logic.GetButchers();
 }
 
-std::vector<std::shared_ptr<const THUAI6::Human>> ButcherDebugAPI::GetHuman() const
+std::vector<std::shared_ptr<const THUAI6::Human>> ButcherDebugAPI::GetHumans() const
 {
     return logic.GetHumans();
 }
@@ -323,14 +323,14 @@ std::vector<std::vector<THUAI6::PlaceType>> HumanDebugAPI::GetFullMap() const
     return logic.GetFullMap();
 }
 
-THUAI6::PlaceType HumanDebugAPI::GetPlaceType(int32_t CellX, int32_t CellY) const
+THUAI6::PlaceType HumanDebugAPI::GetPlaceType(int32_t cellX, int32_t cellY) const
 {
-    return logic.GetPlaceType(CellX, CellY);
+    return logic.GetPlaceType(cellX, cellY);
 }
 
-THUAI6::PlaceType ButcherDebugAPI::GetPlaceType(int32_t CellX, int32_t CellY) const
+THUAI6::PlaceType ButcherDebugAPI::GetPlaceType(int32_t cellX, int32_t cellY) const
 {
-    return logic.GetPlaceType(CellX, CellY);
+    return logic.GetPlaceType(cellX, cellY);
 }
 
 std::vector<std::vector<THUAI6::PlaceType>> ButcherDebugAPI::GetFullMap() const