Bumping to C++17

keenon · Jan 12, 2025 · 7f3ac81 · 7f3ac81
1 parent fd8d370
commit 7f3ac81
Show file tree

Hide file tree

Showing 48 changed files with 1,750 additions and 32,635 deletions.
diff --git a/dart/biomechanics/MarkerFitter.cpp b/dart/biomechanics/MarkerFitter.cpp
@@ -7657,7 +7657,13 @@ std::vector<std::map<std::string, Eigen::Vector3s>> MarkerFitter::pickSubset(
   // the elements we want
   std::vector<unsigned int> indices(markerObservations.size());
   std::iota(indices.begin(), indices.end(), 0);
-  std::random_shuffle(indices.begin(), indices.end());
+
+  // Create a random number generator
+  std::random_device rd; // Seed
+  std::mt19937 g(rd());  // Mersenne Twister engine
+
+  // Shuffle the vector
+  std::shuffle(indices.begin(), indices.end(), g);
 
   std::vector<std::map<std::string, Eigen::Vector3s>> result;
   for (int i = 0; i < maxSize; i++)

diff --git a/dart/biomechanics/SubjectOnDisk.cpp b/dart/biomechanics/SubjectOnDisk.cpp
@@ -1227,13 +1227,13 @@ void FramePass::readFromProto(
   markerRMS = 0.0;
   if (header.mTrials[trial]->mTrialPasses[pass]->mMarkerRMS.size() > t)
   {
-    header.mTrials[trial]->mTrialPasses[pass]->mMarkerRMS[t];
+    markerRMS = header.mTrials[trial]->mTrialPasses[pass]->mMarkerRMS[t];
   }
   // s_t markerMax;
   markerMax = 0.0;
   if (header.mTrials[trial]->mTrialPasses[pass]->mMarkerMax.size() > t)
   {
-    header.mTrials[trial]->mTrialPasses[pass]->mMarkerMax[t];
+    markerMax = header.mTrials[trial]->mTrialPasses[pass]->mMarkerMax[t];
   }
   // s_t linearResidual;
   linearResidual = 0.0;

diff --git a/dart/external/CMakeLists.txt b/dart/external/CMakeLists.txt
@@ -1,3 +1,2 @@
-add_subdirectory(imgui)
 add_subdirectory(lodepng)
 add_subdirectory(odelcpsolver)
diff --git a/dart/external/imgui/CMakeLists.txt b/dart/external/imgui/CMakeLists.txt
diff --git a/dart/external/imgui/imconfig.h b/dart/external/imgui/imconfig.h