First implementation of AQRE fitting complete.

gambitproject · Apr 16, 2024 · 7c3b1fb · 7c3b1fb
1 parent 0acc8ac
commit 7c3b1fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/pygambit/nash.h b/src/pygambit/nash.h
@@ -49,10 +49,10 @@ std::shared_ptr<LogitQREMixedBehaviorProfile> LogitBehaviorAtLambdaHelper(const
   AgentQREPathTracer alg;
   alg.SetMaxDecel(p_maxAccel);
   alg.SetStepsize(p_firstStep);
-  // NullBuffer null_buffer;
-  // std::ostream null_stream(&null_buffer);
+  NullBuffer null_buffer;
+  std::ostream null_stream(&null_buffer);
   return make_shared<LogitQREMixedBehaviorProfile>(
-      alg.SolveAtLambda(start, std::cout, p_lambda, 1.0));
+      alg.SolveAtLambda(start, null_stream, p_lambda, 1.0));
 }
 
 std::shared_ptr<LogitQREMixedStrategyProfile>

diff --git a/src/solvers/logit/efglogit.cc b/src/solvers/logit/efglogit.cc
@@ -300,7 +300,7 @@ class AgentQREPathTracer::LambdaCriterion : public PathTracer::CriterionFunction
 
   double operator()(const Vector<double> &p_point, const Vector<double> &p_tangent) const override
   {
-    return p_point[p_point.Length()] - m_lambda;
+    return p_point.back() - m_lambda;
   }
 
 private:

diff --git a/src/solvers/logit/efglogit.h b/src/solvers/logit/efglogit.h
@@ -101,7 +101,7 @@ LogitBehaviorEstimate(const MixedBehaviorProfile<double> &p_frequencies, double
   alg.SetMaxDecel(p_maxAccel);
   alg.SetStepsize(p_firstStep);
   std::ostringstream ostream;
-  return alg.Estimate(start, p_frequencies, ostream, 1.0, 1.0);
+  return alg.Estimate(start, p_frequencies, ostream, 1000000.0, 1.0);
 }
 
 inline List<MixedBehaviorProfile<double>> LogitBehaviorSolve(const Game &p_game, double p_epsilon,