format

cvg · Jan 6, 2025 · 5639380 · 5639380
1 parent d37734b
commit 5639380
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 32 deletions.
diff --git a/limap/base/line_linker.cc b/limap/base/line_linker.cc
@@ -1,6 +1,6 @@
 #include "limap/base/line_linker.h"
-#include "limap/base/line_dists.h"
 #include "limap/_limap/helpers.h"
+#include "limap/base/line_dists.h"
 #include <cmath>
 
 namespace limap {
@@ -10,7 +10,7 @@ double get_multiplier(const double &score_th) {
   // exp(- (val / sigma)^2 / 2.0) >= 0.5 <--> val <= 1.1774100 sigma
   return 1.0 / sqrt(-log(score_th) * 2.0);
 }
-}
+} // namespace
 
 double expscore(const double &val, const double &sigma) {
   return exp(-pow(val / sigma, 2) / 2.0);
@@ -33,9 +33,7 @@ LineLinker2dConfig::LineLinker2dConfig(py::dict dict) {
   ASSIGN_PYDICT_ITEM(dict, use_innerseg, bool);
 }
 
-LineLinker2dConfig::multipler() const {
-  return get_multiplier(score_th);
-}
+LineLinker2dConfig::multipler() const { return get_multiplier(score_th); }
 
 double LineLinker2d::compute_score_angle(const Line2d &l1,
                                          const Line2d &l2) const {
@@ -178,9 +176,7 @@ LineLinker3dConfig::LineLinker3dConfig(py::dict dict) {
   ASSIGN_PYDICT_ITEM(dict, use_scaleinv, bool);
 }
 
-LineLinker3dConfig::multiplier() const {
-  return get_multiplier(score_th);
-}
+LineLinker3dConfig::multiplier() const { return get_multiplier(score_th); }
 
 double LineLinker3d::compute_score_angle(const Line3d &l1,
                                          const Line3d &l2) const {

diff --git a/limap/base/pointtrack.h b/limap/base/pointtrack.h
@@ -18,10 +18,10 @@ template <typename PTYPE> struct Feature2dWith3dIndex {
   Feature2dWith3dIndex() {}
   Feature2dWith3dIndex(PTYPE p_, int point3D_id_ = -1)
       : p(p_), point3D_id(point3D_id_) {}
-  Feature2dWith3dIndex(py::dict dict){
-      ASSIGN_PYDICT_ITEM(dict, p, PTYPE);
-      ASSIGN_PYDICT_ITEM(dict, point3D_id, int);
-  } 
+  Feature2dWith3dIndex(py::dict dict) {
+    ASSIGN_PYDICT_ITEM(dict, p, PTYPE);
+    ASSIGN_PYDICT_ITEM(dict, point3D_id, int);
+  }
   py::dict as_dict() const {
     py::dict output;
     output["p"] = p;

diff --git a/limap/ceresbase/ceres_extensions.h b/limap/ceresbase/ceres_extensions.h
@@ -31,8 +31,10 @@ class PyLossFunction : public ceres::LossFunction {
 
 inline void AssignSolverOptionsFromDict(ceres::Solver::Options &solver_options,
                                         py::dict dict) {
-  ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict, function_tolerance, double);
-  ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict, gradient_tolerance, double);
+  ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict, function_tolerance,
+                               double);
+  ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict, gradient_tolerance,
+                               double);
   ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict, parameter_tolerance,
                                double);
   ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict,
@@ -44,7 +46,8 @@ inline void AssignSolverOptionsFromDict(ceres::Solver::Options &solver_options,
                                max_num_consecutive_invalid_steps, int);
   ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict,
                                max_consecutive_nonmonotonic_steps, int);
-  ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict, use_inner_iterations, bool);
+  ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict, use_inner_iterations,
+                               bool);
   ASSIGN_PYDICT_ITEM_TO_MEMBER(solver_options, dict, inner_iteration_tolerance,
                                double);
 }
diff --git a/limap/triangulation/base_line_triangulator.cc b/limap/triangulation/base_line_triangulator.cc
@@ -1,6 +1,6 @@
 #include "limap/triangulation/base_line_triangulator.h"
-#include "limap/triangulation/functions.h"
 #include "limap/_limap/helpers.h"
+#include "limap/triangulation/functions.h"
 
 #include <algorithm>
 #include <colmap/util/logging.h>
@@ -26,7 +26,8 @@ BaseLineTriangulationConfig::BaseLineTriangulationConfig(py::dict dict) {
   ASSIGN_PYDICT_ITEM(dict, IoU_threshold, double);
   ASSIGN_PYDICT_ITEM(dict, debug_mode, bool);
   ASSIGN_PYDICT_ITEM(dict, sensitivity_threshold, double);
-  ASSIGN_PYDICT_ITEM(dict, var2d, double);;
+  ASSIGN_PYDICT_ITEM(dict, var2d, double);
+  ;
 }
 
 void BaseLineTriangulator::offsetHalfPixel() {

diff --git a/limap/triangulation/global_line_triangulator.cc b/limap/triangulation/global_line_triangulator.cc
@@ -1,7 +1,7 @@
 #include "limap/triangulation/global_line_triangulator.h"
+#include "limap/_limap/helpers.h"
 #include "limap/merging/aggregator.h"
 #include "limap/merging/merging.h"
-#include "limap/_limap/helpers.h"
 
 #include <algorithm>
 #include <iostream>
@@ -12,9 +12,11 @@ namespace limap {
 
 namespace triangulation {
 
-GlobalLineTriangulatorConfig::GlobalLineTriangulatorConfig(): BaseLineTriangulatorConfig() {}
+GlobalLineTriangulatorConfig::GlobalLineTriangulatorConfig()
+    : BaseLineTriangulatorConfig() {}
 
-GlobalLineTriangulatorConfig::GlobalLineTriangulatorConfig(py::dict dict): BaseLineTriangulatorConfig(dict) {
+GlobalLineTriangulatorConfig::GlobalLineTriangulatorConfig(py::dict dict)
+    : BaseLineTriangulatorConfig(dict) {
   ASSIGN_PYDICT_ITEM(dict, fullscore_th, double);
   ASSIGN_PYDICT_ITEM(dict, max_valid_conns, int);
   ASSIGN_PYDICT_ITEM(dict, min_num_outer_edges, int);

diff --git a/limap/vplib/base_vp_detector.h b/limap/vplib/base_vp_detector.h
@@ -20,12 +20,12 @@ namespace vplib {
 class BaseVPDetectorConfig {
 public:
   BaseVPDetectorConfig() {}
-  BaseVPDetectorConfig(py::dict dict){
-      ASSIGN_PYDICT_ITEM(dict, min_length, double);
-      ASSIGN_PYDICT_ITEM(dict, inlier_threshold, double);
-      ASSIGN_PYDICT_ITEM(dict, min_num_supports, int);
-      ASSIGN_PYDICT_ITEM(dict, th_perp_supports, double);
-  } 
+  BaseVPDetectorConfig(py::dict dict) {
+    ASSIGN_PYDICT_ITEM(dict, min_length, double);
+    ASSIGN_PYDICT_ITEM(dict, inlier_threshold, double);
+    ASSIGN_PYDICT_ITEM(dict, min_num_supports, int);
+    ASSIGN_PYDICT_ITEM(dict, th_perp_supports, double);
+  }
   py::dict as_dict() const;
 
   double min_length = 40;        // in pixel

diff --git a/limap/vplib/vpbase.h b/limap/vplib/vpbase.h
@@ -27,7 +27,7 @@ class VPResult {
     output["vps"] = vps;
     return output;
   }
-  VPResult(py::dict dict){
+  VPResult(py::dict dict) {
     ASSIGN_PYDICT_ITEM(dict, labels, std::vector<int>);
     ASSIGN_PYDICT_ITEM(dict, vps, std::vector<V3D>);
   }

diff --git a/limap/vplib/vptrack.cc b/limap/vplib/vptrack.cc
@@ -12,13 +12,14 @@ py::dict VPTrack::as_dict() const {
   return output;
 }
 
-VPTrack::VPTrack(py::dict dict){
-    ASSIGN_PYDICT_ITEM(dict, direction, V3D);
-    ASSIGN_PYDICT_ITEM(dict, supports, std::vector<Node2d>);
+VPTrack::VPTrack(py::dict dict) {
+  ASSIGN_PYDICT_ITEM(dict, direction, V3D);
+  ASSIGN_PYDICT_ITEM(dict, supports, std::vector<Node2d>);
 }
 
-std::vector<VPTrack> MergeVPTracksByDirection(
-    const std::vector<VPTrack> &tracks, const double th_angle_merge) {
+std::vector<VPTrack>
+MergeVPTracksByDirection(const std::vector<VPTrack> &tracks,
+                         const double th_angle_merge) {
   std::vector<int> parent_nodes(tracks.size(), -1);
   std::vector<std::set<int>> images_in_track(tracks.size());
   for (size_t i = 0; i < tracks.size(); ++i) {