STLize setting and normalisation of chance probabilities

Author: tturocy

src/games/gametree.cc

@@ -1079,52 +1079,44 @@ Game GameTreeRep::SetChanceProbs(const GameInfoset &p_infoset, const Array<Numbe
     throw DimensionException("The number of probabilities given must match the number of actions");
   }
   IncrementVersion();
-  Rational sum(0);
-  for (auto prob : p_probs) {
-    if (static_cast<Rational>(prob) < Rational(0)) {
-      throw ValueException("Probabilities must be non-negative numbers");
-    }
-    sum += static_cast<Rational>(prob);
+  if (std::any_of(p_probs.begin(), p_probs.end(),
+                  [](const Number &x) { return static_cast<Rational>(x) < Rational(0); })) {
+    throw ValueException("Probabilities must be non-negative numbers");
   }
+  auto sum = std::accumulate(
+      p_probs.begin(), p_probs.end(), Rational(0),
+      [](const Rational &r, const Number &n) { return r + static_cast<Rational>(n); });
   if (sum != Rational(1)) {
     throw ValueException("Probabilities must sum to exactly one");
   }
-  for (int act = 1; act <= p_infoset->NumActions(); act++) {
-    dynamic_cast<GameTreeInfosetRep &>(*p_infoset).m_probs[act] = p_probs[act];
-  }
+  std::copy(p_probs.begin(), p_probs.end(),
+            dynamic_cast<GameTreeInfosetRep &>(*p_infoset).m_probs.begin());
   ClearComputedValues();
   return this;
 }
 
-Game GameTreeRep::NormalizeChanceProbs(const GameInfoset &m_infoset)
+Game GameTreeRep::NormalizeChanceProbs(const GameInfoset &p_infoset)
 {
-  if (m_infoset->GetGame() != this) {
+  if (p_infoset->GetGame() != this) {
     throw MismatchException();
   }
-  if (!m_infoset->IsChanceInfoset()) {
+  if (!p_infoset->IsChanceInfoset()) {
     throw UndefinedException(
         "Action probabilities can only be normalized for chance information sets");
   }
   IncrementVersion();
-  Rational sum(0);
-  for (int act = 1; act <= m_infoset->NumActions(); act++) {
-    Rational action_prob(m_infoset->GetActionProb(act));
-    sum += action_prob;
-  }
-  Array<Number> m_probs(m_infoset->NumActions());
+  auto &probs = dynamic_cast<GameTreeInfosetRep &>(*p_infoset).m_probs;
+  auto sum = std::accumulate(
+      probs.begin(), probs.end(), Rational(0),
+      [](const Rational &s, const Number &n) { return s + static_cast<Rational>(n); });
   if (sum == Rational(0)) {
     // all remaining moves have prob zero; split prob 1 equally among them
-    for (int act = 1; act <= m_infoset->NumActions(); act++) {
-      m_probs[act] = Rational(1, m_infoset->NumActions());
-    }
+    std::fill(probs.begin(), probs.end(), Rational(1, probs.size()));
   }
   else {
-    for (int act = 1; act <= m_infoset->NumActions(); act++) {
-      Rational prob(m_infoset->GetActionProb(act));
-      m_probs[act] = prob / sum;
-    }
+    std::transform(probs.begin(), probs.end(), probs.begin(),
+                   [&sum](const Number &n) { return static_cast<Rational>(n) / sum; });
   }
-  m_infoset->GetGame()->SetChanceProbs(m_infoset, m_probs);
   return this;
 }