Worked on c++

shenzhen_solitaire/c++/include/board.hpp

@@ -1,27 +1,35 @@
+#pragma once
+#include "card.hpp"
+#include "goal.hpp"
+
 #include <array>
+#include <cassert>
 #include <optional>
 
 namespace solitaire {
-class Card {
-    bool isNormalCard();
-    bool isSpecialCard();
+
+struct BunkerField {
+  std::optional<Card> card;
+  bool empty{};
+  bool closed{};
 };
 
-struct BunkerField{
-    Card card;
-    bool empty;
-    bool closed;
+inline constexpr int MAX_ROW_SIZE = 13;
+inline constexpr int MAX_COLUMN_SIZE = 8;
+
+class Stack {
+  std::array<std::optional<Card>, MAX_COLUMN_SIZE> values{};
 };
 
-class Board {
-public:
-  static constexpr int MAX_ROW_SIZE = 13;
-  static constexpr int MAX_COLUMN_SIZE = 8;
+struct Board {
+  std::array<Stack, MAX_ROW_SIZE> field{};
+  std::array<BunkerField, 3> bunker{};
+  Goal goal{};
+  bool flower_gone{};
 
-private:
-  std::array<std::array<Card, MAX_COLUMN_SIZE>, MAX_ROW_SIZE> field;
-  std::array<BunkerField, 3> bunker;
-  std::array<std::optional<Card>, 3> goal; 
-  bool flower_gone;
+  [[nodiscard]] auto solved() const noexcept -> bool;
+  [[nodiscard]] auto hash() const noexcept -> std::size_t;
+  [[nodiscard]] auto correct() const noexcept -> bool;
 };
+
 } // namespace solitaire