Code review feedback for Solver.

stephenbensley · Jun 18, 2023 · 79bd8f4 · 79bd8f4
1 parent 84beeb4
commit 79bd8f4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/QueahEngine/Solver/GameNode.cpp b/QueahEngine/Solver/GameNode.cpp
@@ -12,11 +12,6 @@ GameNode::GameNode(GamePosition pos) noexcept
 : pos_(pos)
 { }
 
-bool GameNode::terminal() const noexcept
-{
-   return children_.empty();
-}
-
 GamePosition GameNode::position() const noexcept
 {
    return pos_;
@@ -27,6 +22,11 @@ ValueType GameNode::value() const noexcept
    return value_;
 }
 
+bool GameNode::terminal() const noexcept
+{
+   return children_.empty();
+}
+
 ValueType GameNode::min_child_value() const noexcept
 {
    auto i = std::min_element(children_.begin(),

diff --git a/QueahEngine/Solver/Solve.cpp b/QueahEngine/Solver/Solve.cpp
@@ -76,8 +76,8 @@ GameNode* find_or_create(NodeMap& nodes, GamePosition pos)
 
    // Recursively find and insert the children. Note: We must insert the parent
    // node before creating the children since there may be loops in the graph.
-   for (auto m : key.moves()) {
-      node->insert_child(find_or_create(nodes, key.try_move(m)));
+   for (auto move : key.moves()) {
+      node->insert_child(find_or_create(nodes, key.try_move(move)));
    }
 
    // Return a pointer to the newly inserted node.

diff --git a/QueahEngine/Solver/Solve.h b/QueahEngine/Solver/Solve.h
@@ -9,7 +9,6 @@
 #define Solve_h
 
 #include "GameNode.h"
-#include "PositionEvaluator.h"
 #include <memory>
 #include <vector>
 
@@ -19,10 +18,10 @@ using GameNodePtrs = std::vector<GameNodePtr>;
 // Constructs all the nodes in the game tree.
 GameNodePtrs build_nodes();
 
-// Compute the value of all the game positions.
+// Computes the values of all the game positions.
 void compute_values(const GameNodePtrs& nodes) noexcept;
 
-// Convert GameNodePtrs to PositionValues.
+// Converts GameNodePtrs to PositionValues.
 PositionValues to_position_values(const GameNodePtrs& nodes);
 
 #endif /* Solve_h */
diff --git a/QueahEngine/Solver/main.cpp b/QueahEngine/Solver/main.cpp
@@ -11,7 +11,7 @@
 
 int main(int argc, const char * argv[])
 {
-   const char datafile[] = "queah.solution";
+   const char datafile[] = "queah.dat";
 
    std::cout << "Building nodes ..." << std::endl;
    auto nodes = build_nodes();
@@ -38,7 +38,7 @@ int main(int argc, const char * argv[])
    std::cout << "Done." << std::endl;
 
    if (!eval.load(datafile)) {
-      std::cout << "Verification failed." << std::endl;
+      std::cout << "Data file verification failed." << std::endl;
    }
 
    return 0;