use str Enum inheritance for config readability

borglab · Jan 25, 2022 · ba1af74 · ba1af74
1 parent b3e3e78
commit ba1af74
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/gtsfm/configs/deep_front_end.yaml b/gtsfm/configs/deep_front_end.yaml
@@ -57,7 +57,7 @@ SceneOptimizer:
         reproj_error_threshold: 10
         mode:
           _target_: gtsfm.data_association.point3d_initializer.TriangulationSamplingMode
-          value: 1 # 1 corresponds to RANSAC_SAMPLE_UNIFORM
+          value: RANSAC_SAMPLE_UNIFORM
         max_num_hypotheses: 100
       save_track_patches_viz: False
 

diff --git a/gtsfm/configs/deep_front_end_astronet.yaml b/gtsfm/configs/deep_front_end_astronet.yaml
@@ -58,7 +58,7 @@ SceneOptimizer:
         reproj_error_threshold: 100
         mode:
           _target_: gtsfm.data_association.point3d_initializer.TriangulationSamplingMode
-          value: 1 # 1 corresponds to RANSAC_SAMPLE_UNIFORM
+          value: RANSAC_SAMPLE_UNIFORM
         max_num_hypotheses: 100
       save_track_patches_viz: False
 

diff --git a/gtsfm/configs/scene_optimizer_unit_test_config.yaml b/gtsfm/configs/scene_optimizer_unit_test_config.yaml
@@ -49,7 +49,7 @@ SceneOptimizer:
         reproj_error_threshold: 10
         mode:
           _target_: gtsfm.data_association.point3d_initializer.TriangulationSamplingMode
-          value: 0 # 0 corresponds to NO_RANSAC
+          value: NO_RANSAC
         max_num_hypotheses: 20
       save_track_patches_viz: False
 

diff --git a/gtsfm/configs/sift_front_end.yaml b/gtsfm/configs/sift_front_end.yaml
@@ -56,7 +56,7 @@ SceneOptimizer:
         reproj_error_threshold: 100
         mode:
           _target_: gtsfm.data_association.point3d_initializer.TriangulationSamplingMode
-          value: 1 # 1 corresponds to RANSAC_SAMPLE_UNIFORM
+          value: RANSAC_SAMPLE_UNIFORM
         max_num_hypotheses: 100
       save_track_patches_viz: False
 

diff --git a/gtsfm/data_association/point3d_initializer.py b/gtsfm/data_association/point3d_initializer.py
@@ -47,13 +47,19 @@ class TriangulationExitCode(Enum):
     EXCEEDS_REPROJ_THRESH = 4  # estimated 3d point exceeds reprojection threshold
 
 
-class TriangulationSamplingMode(Enum):
-    """Triangulation modes."""
+class TriangulationSamplingMode(str, Enum):
+    """Triangulation modes.
 
-    NO_RANSAC = 0  # do not use filtering
-    RANSAC_SAMPLE_UNIFORM = 1  # sample a pair of cameras uniformly at random
-    RANSAC_SAMPLE_BIASED_BASELINE = 2  # sample pair of cameras based on largest estimated baseline
-    RANSAC_TOPK_BASELINES = 3  # deterministically choose hypotheses with largest estimate baseline
+    NO_RANSAC: do not use filtering.
+    RANSAC_SAMPLE_UNIFORM: sample a pair of cameras uniformly at random.
+    RANSAC_SAMPLE_BIASED_BASELINE: sample pair of cameras based by largest estimated baseline.
+    RANSAC_TOPK_BASELINES: deterministically choose hypotheses with largest estimate baseline.
+    """
+
+    NO_RANSAC = "NO_RANSAC"
+    RANSAC_SAMPLE_UNIFORM = "RANSAC_SAMPLE_UNIFORM"
+    RANSAC_SAMPLE_BIASED_BASELINE = "RANSAC_SAMPLE_BIASED_BASELINE"
+    RANSAC_TOPK_BASELINES = "RANSAC_TOPK_BASELINES"
 
 
 class TriangulationOptions(NamedTuple):