rename _structure to _landmarks for homogeneity

alicevision · Dec 14, 2023 · 28b8688 · 28b8688
1 parent c8d57ce
commit 28b8688
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/aliceVision/sfmData/SfMData.cpp b/src/aliceVision/sfmData/SfMData.cpp
@@ -79,12 +79,12 @@ bool SfMData::operator==(const SfMData& other) const
     }
 
     // Points IDs are not preserved
-    if (_structure.size() != other._structure.size())
+    if (_landmarks.size() != other._landmarks.size())
         return false;
 
-    Landmarks::const_iterator landMarkIt = _structure.begin();
-    Landmarks::const_iterator otherLandmarkIt = other._structure.begin();
-    for (; landMarkIt != _structure.end() && otherLandmarkIt != other._structure.end(); ++landMarkIt, ++otherLandmarkIt)
+    Landmarks::const_iterator landMarkIt = _landmarks.begin();
+    Landmarks::const_iterator otherLandmarkIt = other._landmarks.begin();
+    for (; landMarkIt != _landmarks.end() && otherLandmarkIt != other._landmarks.end(); ++landMarkIt, ++otherLandmarkIt)
     {
         // Points IDs are not preserved
         // Landmark
@@ -267,7 +267,7 @@ void SfMData::combine(const SfMData& sfmData)
     _rigs.insert(sfmData._rigs.begin(), sfmData._rigs.end());
 
     // structure
-    _structure.insert(sfmData._structure.begin(), sfmData._structure.end());
+    _landmarks.insert(sfmData._landmarks.begin(), sfmData._landmarks.end());
 
     // constraints
     constraints2d.insert(constraints2d.end(), sfmData.constraints2d.begin(), sfmData.constraints2d.end());
@@ -277,7 +277,7 @@ void SfMData::clear()
 {
     _views.clear();
     _intrinsics.clear();
-    _structure.clear();
+    _landmarks.clear();
     _posesUncertainty.clear();
     _landmarksUncertainty.clear();
     constraints2d.clear();
@@ -297,7 +297,7 @@ void SfMData::resetParameterStates()
         pp.second.initializeState();
     }
 
-    for (auto& pl : _structure)
+    for (auto& pl : _landmarks)
     {
         pl.second.state = EEstimatorParameterState::REFINED;
     }

diff --git a/src/aliceVision/sfmData/SfMData.hpp b/src/aliceVision/sfmData/SfMData.hpp
@@ -117,8 +117,8 @@ class SfMData
      * @brief Get landmarks
      * @return landmarks
      */
-    const Landmarks& getLandmarks() const { return _structure; }
-    Landmarks& getLandmarks() { return _structure; }
+    const Landmarks& getLandmarks() const { return _landmarks; }
+    Landmarks& getLandmarks() { return _landmarks; }
 
     /**
      * @brief Get Constraints2D
@@ -521,7 +521,7 @@ class SfMData
 
   private:
     /// Structure (3D points with their 2D observations)
-    Landmarks _structure;
+    Landmarks _landmarks;
     /// Considered camera intrinsics (indexed by view.getIntrinsicId())
     Intrinsics _intrinsics;
     /// Considered views