Move tuning code to tune directory.

Add braces to high level include files.
swift-nav · Mar 27, 2019 · 8becc67 · 8becc67
1 parent fad454e
commit 8becc67
Show file tree

Hide file tree

Showing 15 changed files with 66 additions and 40 deletions.
diff --git a/include/albatross/Common b/include/albatross/Common
@@ -36,8 +36,6 @@
 #include <random>
 
 #include <albatross/utils/map_utils.h>
-#include <albatross/core/indexing.h>
-#include <albatross/utils/random_utils.h>
 #include <albatross/cereal/eigen.h>
 
-#endif
+#endif
diff --git a/include/albatross/Core b/include/albatross/Core
@@ -16,13 +16,15 @@
 #include "Dataset"
 
 #include <type_traits>
-#include "core/declarations.h"
-#include "core/traits.h"
-#include "core/priors.h"
-#include "core/parameter_handling_mixin.h"
-#include "core/parameter_macros.h"
-#include "core/fit_model.h"
-#include "core/prediction.h"
-#include "core/model.h"
 
-#endif
+#include <albatross/core/declarations.h>
+#include <albatross/core/indexing.h>
+#include <albatross/core/traits.h>
+#include <albatross/core/priors.h>
+#include <albatross/core/parameter_handling_mixin.h>
+#include <albatross/core/parameter_macros.h>
+#include <albatross/core/fit_model.h>
+#include <albatross/core/prediction.h>
+#include <albatross/core/model.h>
+
+#endif
diff --git a/include/albatross/Dataset b/include/albatross/Dataset
@@ -13,8 +13,8 @@
 #ifndef ALBATROSS_DATASET_H
 #define ALBATROSS_DATASET_H
 
-#include "Distribution"
+#include <albatross/Distribution>
 
-#include "core/dataset.h"
+#include <albatross/core/dataset.h>
 
-#endif
+#endif
diff --git a/include/albatross/Distribution b/include/albatross/Distribution
@@ -15,11 +15,11 @@
 
 #include "Common"
 
-#include "cereal/traits.h"
-#include "eigen/serializable_diagonal_matrix.h"
+#include <albatross/cereal/traits.h>
+#include <albatross/eigen/serializable_diagonal_matrix.h>
 
-#include "core/declarations.h"
-#include "core/indexing.h"
-#include "core/distribution.h"
+#include <albatross/core/declarations.h>
+#include <albatross/core/indexing.h>
+#include <albatross/core/distribution.h>
 
-#endif
+#endif
diff --git a/include/albatross/Evaluation b/include/albatross/Evaluation
@@ -15,11 +15,11 @@
 
 #include "Core"
 
-#include "evaluation/likelihood.h"
-#include "evaluation/traits.h"
-#include "evaluation/folds.h"
-#include "evaluation/evaluate.h"
-#include "evaluation/cross_validation_utils.h"
-#include "evaluation/cross_validation.h"
+#include <albatross/evaluation/likelihood.h>
+#include <albatross/evaluation/traits.h>
+#include <albatross/evaluation/folds.h>
+#include <albatross/evaluation/evaluate.h>
+#include <albatross/evaluation/cross_validation_utils.h>
+#include <albatross/evaluation/cross_validation.h>
 
-#endif
+#endif
diff --git a/include/albatross/GP b/include/albatross/GP
@@ -13,11 +13,10 @@
 #ifndef ALBATROSS_GP_H
 #define ALBATROSS_GP_H
 
+#include "Core"
 #include "CovarianceFunctions"
-#include "Evaluation"
 
-#include "eigen/serializable_ldlt.h"
-#include "evaluation/cross_validation_utils.h"
-#include "models/gp.h"
+#include <albatross/eigen/serializable_ldlt.h>
+#include <albatross/models/gp.h>
 
-#endif
+#endif
diff --git a/include/albatross/LeastSquares b/include/albatross/LeastSquares
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2019 Swift Navigation Inc.
+ * Contact: Swift Navigation <dev@swiftnav.com>
+ *
+ * This source is subject to the license found in the file 'LICENSE' which must
+ * be distributed together with this source. All other rights reserved.
+ *
+ * THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
+ * EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef ALBATROSS_LEAST_SQUARES_H
+#define ALBATROSS_LEAST_SQUARES_H
+
+#include <albatross/models/least_squares.h>
+
+#endif
diff --git a/include/albatross/Ransac b/include/albatross/Ransac
@@ -13,6 +13,10 @@
 #ifndef ALBATROSS_RANSAC_H
 #define ALBATROSS_RANSAC_H
 
-#include "models/ransac.h"
+#include "Core"
+#include "Evaluation"
+
+#include <albatross/utils/random_utils.h>
+#include <albatross/models/ransac.h>
 
 #endif
diff --git a/include/albatross/Tune b/include/albatross/Tune
@@ -17,7 +17,7 @@
 
 #include <albatross/Core>
 #include <albatross/Evaluation>
-#include <albatross/utils/tuning_metrics.h>
-#include <albatross/utils/tune.h>
+#include <albatross/tune/tuning_metrics.h>
+#include <albatross/tune/tune.h>
 
-#endif
+#endif
diff --git a/include/albatross/utils/tune.h → include/albatross/tune/tune.h b/include/albatross/utils/tune.h → include/albatross/tune/tune.h
diff --git a/include/albatross/utils/tuning_metrics.h → include/albatross/tune/tuning_metrics.h b/include/albatross/utils/tuning_metrics.h → include/albatross/tune/tuning_metrics.h
diff --git a/tests/test_evaluate.cc b/tests/test_evaluate.cc
@@ -12,6 +12,7 @@
 
 #include <gtest/gtest.h>
 
+#include <albatross/Evaluation>
 #include "test_utils.h"
 
 namespace albatross {

diff --git a/tests/test_models.h b/tests/test_models.h
@@ -12,7 +12,7 @@
 
 #include <albatross/GP>
 #include <albatross/Ransac>
-#include <albatross/models/least_squares.h>
+#include <albatross/LeastSquares>
 #include <gtest/gtest.h>
 
 #include "test_utils.h"

diff --git a/tests/test_random_utils.cc b/tests/test_random_utils.cc
@@ -9,9 +9,13 @@
  * EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
  */
-#include <albatross/Common>
 #include <gtest/gtest.h>
 
+#include <albatross/Common>
+
+#include <albatross/core/indexing.h>
+#include <albatross/utils/random_utils.h>
+
 namespace albatross {
 
 TEST(test_random_utils, randint_without_replacement) {

diff --git a/tests/test_serializable_ldlt.cc b/tests/test_serializable_ldlt.cc
@@ -10,7 +10,7 @@
  * WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <albatross/Common>
+#include <albatross/Core>
 #include <albatross/eigen/serializable_ldlt.h>
 #include <gtest/gtest.h>