fixing merge issues

HJReachability · Sep 9, 2021 · 2aa1e70 · 2aa1e70
1 parent b09ff06
commit 2aa1e70
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/include/ilqgames/solver/problem.h b/include/ilqgames/solver/problem.h
@@ -142,9 +142,7 @@ class Problem {
   //    std::unique_ptr<std::vector<Strategy>> strategies_;
 
  protected:
-  // Problem();
-  Problem(Time adversarial_time = 0.0)
-      : initialized_(false), adversarial_time_(adversarial_time) {}
+  Problem() : initialized_(false) {}
 
   // Functions for initialization. By default, operating point and strategies
   // are initialized to zero.

diff --git a/src/problem.cpp b/src/problem.cpp
@@ -59,8 +59,6 @@
 
 namespace ilqgames {
 
-Problem::Problem() : initialized_(false) {}
-
 size_t Problem::SyncToExistingProblem(const VectorXf& x0, Time t0,
                                       Time planner_runtime,
                                       OperatingPoint& op) {