Fix for ubuntu coredump

gambitproject · May 24, 2024 · 7215256 · 7215256
1 parent a945950
commit 7215256
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,15 @@
 {
   "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
   "features": {
+    "ghcr.io/devcontainers/features/python:1": {
+      "installTools": true,
+      "version": "3.11"
+    },
+    "ghcr.io/devcontainers-contrib/features/gdbgui:2": {
+      "version": "latest"
+    },
+    "ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
+      "packages": "automake,autoconf,gdb"
+    }
   }
 }
diff --git a/src/solvers/logit/efglogit.cc b/src/solvers/logit/efglogit.cc
@@ -355,9 +355,10 @@ List<LogitQREMixedBehaviorProfile> LogitBehaviorSolve(const LogitQREMixedBehavio
     p_regret *= scale;
   }
 
+  Game game = p_start.GetGame();
   Vector<double> x(ProfileToPoint(p_start));
-  TracingCallbackFunction callback(p_start.GetGame(), p_observer);
-  EquationSystem system(p_start.GetGame());
+  TracingCallbackFunction callback(game, p_observer);
+  EquationSystem system(game);
   tracer.TracePath(
       [&system](const Vector<double> &p_point, Vector<double> &p_lhs) {
         system.GetValue(p_point, p_lhs);
@@ -366,12 +367,11 @@ List<LogitQREMixedBehaviorProfile> LogitBehaviorSolve(const LogitQREMixedBehavio
         system.GetJacobian(p_point, p_jac);
       },
       x, p_omega,
-      [p_start, p_regret](const Vector<double> &p_point) {
-        return RegretTerminationFunction(p_start.GetGame(), p_point, p_regret);
+      [game, p_regret](const Vector<double> &p_point) {
+        return RegretTerminationFunction(game, p_point, p_regret);
       },
       [&callback](const Vector<double> &p_point) -> void { callback.AppendPoint(p_point); });
-  // return callback.GetProfiles();
-  return List<LogitQREMixedBehaviorProfile>();
+  return callback.GetProfiles();
 }
 
 LogitQREMixedBehaviorProfile LogitBehaviorSolveLambda(const LogitQREMixedBehaviorProfile &p_start,
@@ -383,9 +383,10 @@ LogitQREMixedBehaviorProfile LogitBehaviorSolveLambda(const LogitQREMixedBehavio
   tracer.SetMaxDecel(p_maxAccel);
   tracer.SetStepsize(p_firstStep);
 
+  Game game = p_start.GetGame();
   Vector<double> x(ProfileToPoint(p_start));
-  TracingCallbackFunction callback(p_start.GetGame(), p_observer);
-  EquationSystem system(p_start.GetGame());
+  TracingCallbackFunction callback(game, p_observer);
+  EquationSystem system(game);
   tracer.TracePath(
       [&system](const Vector<double> &p_point, Vector<double> &p_lhs) {
         system.GetValue(p_point, p_lhs);