Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/temperature_example/temperature_example.cc
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) {
auto covariance = elevation_scaled_mean + noise + spatial_cov;
auto model = gp_from_covariance(covariance);

model.set_param("sigma_exponential", {1., std::make_shared<FixedPrior>()});
model.set_param("sigma_exponential", {1., FixedPrior()});

// These parameters are that came from tuning the model to the leave
// one out negative log likelihood. which can be done like this:
Expand Down
7 changes: 3 additions & 4 deletions examples/temperature_example/temperature_example_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,9 @@ class StationDistance : public DistanceMetricType {
class ElevationScalingFunction : public albatross::ScalingFunction {
public:
ElevationScalingFunction(double center = 1000., double factor = 3.5 / 300) {
this->params_["elevation_scaling_center"] = {
center, std::make_shared<UniformPrior>(0., 5000.)};
this->params_["elevation_scaling_factor"] = {
factor, std::make_shared<PositivePrior>()};
this->params_["elevation_scaling_center"] = {center,
UniformPrior(0., 5000.)};
this->params_["elevation_scaling_factor"] = {factor, PositivePrior()};
};

std::string get_name() const { return "elevation_scaled"; }
Expand Down
22 changes: 6 additions & 16 deletions include/albatross/Common
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
#ifndef ALBATROSS_COMMON_H
#define ALBATROSS_COMMON_H

#include <cereal/cereal.hpp>
#include <cereal/archives/binary.hpp>
#include <cereal/archives/json.hpp>
#include <cereal/archives/xml.hpp>
#include <cereal/types/polymorphic.hpp>
#include <cereal/types/map.hpp>
#include <cereal/types/vector.hpp>

#include <gzip/compress.hpp>
#include <gzip/decompress.hpp>

Expand All @@ -32,6 +24,7 @@
#include <math.h>
#include <iomanip>
#include <map>
#include <set>
#include <string>
#include <iostream>
#include <unordered_map>
Expand All @@ -41,15 +34,12 @@
#include <numeric>
#include <random>

#include "src/core/declarations.hpp"
#include <albatross/src/core/declarations.hpp>

#include "src/details/traits.hpp"
#include "src/details/has_any_macros.hpp"
#include "src/details/error_handling.hpp"
#include <albatross/src/details/traits.hpp>
#include <albatross/src/details/has_any_macros.hpp>
#include <albatross/src/details/error_handling.hpp>

#include "src/utils/map_utils.hpp"
#include "src/cereal/eigen.hpp"
#include "src/cereal/traits.hpp"
#include "src/cereal/variant.hpp"
#include <albatross/src/utils/map_utils.hpp>

#endif
18 changes: 9 additions & 9 deletions include/albatross/Core
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@

#include <type_traits>

#include "src/core/declarations.hpp"
#include "src/core/indexing.hpp"
#include "src/core/traits.hpp"
#include "src/core/priors.hpp"
#include "src/core/parameter_handling_mixin.hpp"
#include "src/core/parameter_macros.hpp"
#include "src/core/fit_model.hpp"
#include "src/core/prediction.hpp"
#include "src/core/model.hpp"
#include <albatross/src/core/declarations.hpp>
#include <albatross/src/core/indexing.hpp>
#include <albatross/src/core/traits.hpp>
#include <albatross/src/core/priors.hpp>
#include <albatross/src/core/parameter_handling_mixin.hpp>
#include <albatross/src/core/parameter_macros.hpp>
#include <albatross/src/core/fit_model.hpp>
#include <albatross/src/core/prediction.hpp>
#include <albatross/src/core/model.hpp>

#endif
30 changes: 15 additions & 15 deletions include/albatross/CovarianceFunctions
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@

#include "Common"

#include "src/core/declarations.hpp"
#include "src/core/traits.hpp"
#include "src/core/priors.hpp"
#include "src/core/parameter_handling_mixin.hpp"
#include "src/core/parameter_macros.hpp"
#include <albatross/src/core/declarations.hpp>
#include <albatross/src/core/traits.hpp>
#include <albatross/src/core/priors.hpp>
#include <albatross/src/core/parameter_handling_mixin.hpp>
#include <albatross/src/core/parameter_macros.hpp>

#include "src/covariance_functions/traits.hpp"
#include "src/covariance_functions/callers.hpp"
#include "src/covariance_functions/covariance_function.hpp"
#include "src/covariance_functions/call_trace.hpp"
#include "src/covariance_functions/measurement.hpp"
#include "src/covariance_functions/distance_metrics.hpp"
#include "src/covariance_functions/noise.hpp"
#include "src/covariance_functions/polynomials.hpp"
#include "src/covariance_functions/radial.hpp"
#include "src/covariance_functions/scaling_function.hpp"
#include <albatross/src/covariance_functions/traits.hpp>
#include <albatross/src/covariance_functions/callers.hpp>
#include <albatross/src/covariance_functions/covariance_function.hpp>
#include <albatross/src/covariance_functions/call_trace.hpp>
#include <albatross/src/covariance_functions/measurement.hpp>
#include <albatross/src/covariance_functions/distance_metrics.hpp>
#include <albatross/src/covariance_functions/noise.hpp>
#include <albatross/src/covariance_functions/polynomials.hpp>
#include <albatross/src/covariance_functions/radial.hpp>
#include <albatross/src/covariance_functions/scaling_function.hpp>

#endif
4 changes: 2 additions & 2 deletions include/albatross/Dataset
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include "Distribution"

#include "src/core/concatenate.hpp"
#include "src/core/dataset.hpp"
#include <albatross/src/core/concatenate.hpp>
#include <albatross/src/core/dataset.hpp>

#endif
9 changes: 3 additions & 6 deletions include/albatross/Distribution
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@

#include "Common"

#include "src/cereal/traits.hpp"
#include "src/eigen/serializable_diagonal_matrix.hpp"

#include "src/core/declarations.hpp"
#include "src/core/indexing.hpp"
#include "src/core/distribution.hpp"
#include <albatross/src/core/declarations.hpp>
#include <albatross/src/core/indexing.hpp>
#include <albatross/src/core/distribution.hpp>

#endif
18 changes: 9 additions & 9 deletions include/albatross/Evaluation
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@

#include "Core"

#include "src/evaluation/likelihood.hpp"
#include "src/evaluation/differential_entropy.hpp"
#include "src/covariance_functions/traits.hpp"
#include "src/evaluation/traits.hpp"
#include "src/evaluation/folds.hpp"
#include "src/evaluation/prediction_metrics.hpp"
#include "src/evaluation/model_metrics.hpp"
#include "src/evaluation/cross_validation_utils.hpp"
#include "src/evaluation/cross_validation.hpp"
#include <albatross/src/evaluation/likelihood.hpp>
#include <albatross/src/evaluation/differential_entropy.hpp>
#include <albatross/src/covariance_functions/traits.hpp>
#include <albatross/src/evaluation/traits.hpp>
#include <albatross/src/evaluation/folds.hpp>
#include <albatross/src/evaluation/prediction_metrics.hpp>
#include <albatross/src/evaluation/model_metrics.hpp>
#include <albatross/src/evaluation/cross_validation_utils.hpp>
#include <albatross/src/evaluation/cross_validation.hpp>

#endif
10 changes: 5 additions & 5 deletions include/albatross/GP
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#include "Core"
#include "CovarianceFunctions"

#include "src/evaluation/likelihood.hpp"
#include "src/eigen/serializable_ldlt.hpp"
#include "src/utils/block_utils.hpp"
#include "src/covariance_functions/representations.hpp"
#include "src/models/gp.hpp"
#include <albatross/src/evaluation/likelihood.hpp>
#include <albatross/src/eigen/serializable_ldlt.hpp>
#include <albatross/src/utils/block_utils.hpp>
#include <albatross/src/covariance_functions/representations.hpp>
#include <albatross/src/models/gp.hpp>

#endif
2 changes: 1 addition & 1 deletion include/albatross/LeastSquares
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

#include "Core"

#include "src/models/least_squares.hpp"
#include <albatross/src/models/least_squares.hpp>

#endif
6 changes: 3 additions & 3 deletions include/albatross/Ransac
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#include "Core"
#include "Evaluation"

#include "src/utils/random_utils.hpp"
#include "src/models/ransac.hpp"
#include "src/models/ransac_gp.hpp"
#include <albatross/src/utils/random_utils.hpp>
#include <albatross/src/models/ransac.hpp>
#include <albatross/src/models/ransac_gp.hpp>

#endif
6 changes: 3 additions & 3 deletions include/albatross/SparseGP
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

#include "GP"

#include "src/utils/block_utils.hpp"
#include "src/utils/eigen_utils.hpp"
#include "src/models/sparse_gp.hpp"
#include <albatross/src/utils/block_utils.hpp>
#include <albatross/src/utils/eigen_utils.hpp>
#include <albatross/src/models/sparse_gp.hpp>

#endif
4 changes: 2 additions & 2 deletions include/albatross/Tune
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "Core"
#include "Evaluation"

#include "src/tune/tuning_metrics.hpp"
#include "src/tune/tune.hpp"
#include <albatross/src/tune/tuning_metrics.hpp>
#include <albatross/src/tune/tune.hpp>

#endif
27 changes: 27 additions & 0 deletions include/albatross/serialize/Common
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* 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_SERIALIZE_COMMON_H
#define ALBATROSS_SERIALIZE_COMMON_H

#include <cereal/cereal.hpp>
#include <cereal/archives/binary.hpp>
#include <cereal/archives/json.hpp>
#include <cereal/archives/xml.hpp>
#include <cereal/types/map.hpp>
#include <cereal/types/string.hpp>
#include <cereal/types/vector.hpp>

#include "../src/cereal/traits.hpp"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relative paths like this in include paths aren't great (they tend to break when porting to different systems(, and cause generally be avoided by setting the include paths you want. Would a path like albatross/src/cereal/traits.hpp work?

#include "../src/cereal/eigen.hpp"

#endif
26 changes: 26 additions & 0 deletions include/albatross/serialize/Core
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* 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_SERIALIZE_CORE_H
#define ALBATROSS_SERIALIZE_CORE_H

#include "Common"

#include "../src/cereal/dataset.hpp"
#include "../src/cereal/distribution.hpp"
#include "../src/cereal/fit_model.hpp"
#include "../src/cereal/priors.hpp"
#include "../src/cereal/model.hpp"
#include "../src/cereal/parameters.hpp"
#include "../src/cereal/variant.hpp"

#endif
20 changes: 20 additions & 0 deletions include/albatross/serialize/Evaluation
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* 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_SERIALIZE_EVALUATION_H
#define ALBATROSS_SERIALIZE_EVALUATION_H

#include "Core"

#include "../src/cereal/evaluation.hpp"

#endif
23 changes: 23 additions & 0 deletions include/albatross/serialize/GP
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* 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_SERIALIZE_GP_H
#define ALBATROSS_SERIALIZE_GP_H

#include "Core"

#include "../src/cereal/block_utils.hpp"
#include "../src/cereal/serializable_ldlt.hpp"
#include "../src/cereal/gp.hpp"
#include "../src/cereal/representations.hpp"

#endif
20 changes: 20 additions & 0 deletions include/albatross/serialize/LeastSquares
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* 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_SERIALIZE_LEAST_SQUARES_H
#define ALBATROSS_SERIALIZE_LEAST_SQUARES_H

#include "Core"

#include "../src/cereal/least_squares.hpp"

#endif
20 changes: 20 additions & 0 deletions include/albatross/serialize/Ransac
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* 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_SERIALIZE_RANSAC_H
#define ALBATROSS_SERIALIZE_RANSAC_H

#include "Core"

#include "../src/cereal/ransac.hpp"

#endif
Loading