Bit of tidying in TreeMixedStrategyProfileRep

Author: tturocy

src/games/gametree.cc

@@ -50,29 +50,34 @@ template <class T> MixedStrategyProfileRep<T> *TreeMixedStrategyProfileRep<T>::C
   return new TreeMixedStrategyProfileRep(*this);
 }
 
-template <class T> T TreeMixedStrategyProfileRep<T>::GetPayoff(int pl) const
+template <class T> void TreeMixedStrategyProfileRep<T>::MakeBehavior() const
 {
   if (mixed_behav_profile_sptr.get() == nullptr) {
     MixedStrategyProfile<T> tmp(Copy());
     mixed_behav_profile_sptr = std::make_shared<MixedBehaviorProfile<T>>(tmp);
   }
-  return mixed_behav_profile_sptr->GetPayoff(pl);
 }
 
 template <class T> void TreeMixedStrategyProfileRep<T>::InvalidateCache() const
 {
   mixed_behav_profile_sptr = nullptr;
 }
 
+template <class T> T TreeMixedStrategyProfileRep<T>::GetPayoff(int pl) const
+{
+  MakeBehavior();
+  return mixed_behav_profile_sptr->GetPayoff(pl);
+}
+
 template <class T>
 T TreeMixedStrategyProfileRep<T>::GetPayoffDeriv(int pl, const GameStrategy &strategy) const
 {
-  MixedStrategyProfile<T> foo(Copy());
-  for (auto s : this->m_support.GetStrategies(this->m_support.GetGame()->GetPlayer(pl))) {
-    foo[s] = static_cast<T>(0);
+  auto foo = std::make_unique<TreeMixedStrategyProfileRep>(*this);
+  for (auto s : this->m_support.GetStrategies(strategy->GetPlayer())) {
+    (*foo)[s] = static_cast<T>(0);
   }
-  foo[strategy] = static_cast<T>(1);
-  return foo.GetPayoff(pl);
+  (*foo)[strategy] = static_cast<T>(1);
+  return foo->GetPayoff(pl);
 }
 
 template <class T>
@@ -85,18 +90,18 @@ T TreeMixedStrategyProfileRep<T>::GetPayoffDeriv(int pl, const GameStrategy &str
     return T(0);
   }
 
-  MixedStrategyProfile<T> foo(Copy());
+  auto foo = std::make_unique<TreeMixedStrategyProfileRep>(*this);
   for (auto strategy : this->m_support.GetStrategies(player1)) {
-    foo[strategy] = T(0);
+    (*foo)[strategy] = T(0);
   }
-  foo[strategy1] = T(1);
+  (*foo)[strategy1] = T(1);
 
   for (auto strategy : this->m_support.GetStrategies(player2)) {
-    foo[strategy] = T(0);
+    (*foo)[strategy] = T(0);
   }
-  foo[strategy2] = T(1);
+  (*foo)[strategy2] = T(1);
 
-  return foo.GetPayoff(pl);
+  return foo->GetPayoff(pl);
 }
 
 template class TreeMixedStrategyProfileRep<double>;

src/games/gametree.h

@@ -320,10 +320,11 @@ template <class T> class TreeMixedStrategyProfileRep : public MixedStrategyProfi
   T GetPayoffDeriv(int pl, const GameStrategy &) const override;
   T GetPayoffDeriv(int pl, const GameStrategy &, const GameStrategy &) const override;
 
-  void InvalidateCache() const override;
-
-protected:
+private:
   mutable std::shared_ptr<MixedBehaviorProfile<T>> mixed_behav_profile_sptr;
+
+  void MakeBehavior() const;
+  void InvalidateCache() const override;
 };
 
 } // namespace Gambit