diff options
| -rw-r--r-- | host/include/uhd/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/include/uhd/cal/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | host/include/uhd/cal/container.hpp | 94 | ||||
| -rw-r--r-- | host/include/uhd/cal/power_container.hpp | 68 | ||||
| -rw-r--r-- | host/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/lib/cal/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | host/lib/cal/interpolation.hpp | 61 | ||||
| -rw-r--r-- | host/lib/cal/interpolation.ipp | 193 | ||||
| -rw-r--r-- | host/lib/cal/power_container_impl.cpp | 70 | ||||
| -rw-r--r-- | host/lib/cal/power_container_impl.hpp | 67 | ||||
| -rw-r--r-- | host/tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/tests/cal_container_test.cpp | 195 |
12 files changed, 0 insertions, 786 deletions
diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt index b63b07ecb..e4a186f8a 100644 --- a/host/include/uhd/CMakeLists.txt +++ b/host/include/uhd/CMakeLists.txt @@ -8,7 +8,6 @@ add_subdirectory(rfnoc) add_subdirectory(transport) add_subdirectory(types) -add_subdirectory(cal) add_subdirectory(usrp) add_subdirectory(usrp_clock) add_subdirectory(utils) diff --git a/host/include/uhd/cal/CMakeLists.txt b/host/include/uhd/cal/CMakeLists.txt deleted file mode 100644 index 7d27ffaf1..000000000 --- a/host/include/uhd/cal/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright 2016 Ettus Research -# Copyright 2018 Ettus Research, a National Instruments Company -# -# SPDX-License-Identifier: GPL-3.0-or-later -# - -UHD_INSTALL(FILES - container.hpp - power_container.hpp - DESTINATION ${INCLUDE_DIR}/uhd/cal - COMPONENT headers -) diff --git a/host/include/uhd/cal/container.hpp b/host/include/uhd/cal/container.hpp deleted file mode 100644 index 75ce566e2..000000000 --- a/host/include/uhd/cal/container.hpp +++ /dev/null @@ -1,94 +0,0 @@ -// -// Copyright 2016 Ettus Research -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#ifndef INCLUDED_UHD_CAL_CONTAINER_HPP -#define INCLUDED_UHD_CAL_CONTAINER_HPP - -#include <uhd/config.hpp> -#include <boost/archive/text_iarchive.hpp> -#include <boost/archive/text_oarchive.hpp> -#include <boost/serialization/map.hpp> -#include <boost/serialization/serialization.hpp> -#include <boost/serialization/string.hpp> -#include <boost/serialization/vector.hpp> -#include <boost/shared_ptr.hpp> - -namespace uhd { namespace cal { - -class base_container -{ -public: - typedef std::map<std::string, std::string> metadata_t; - typedef boost::shared_ptr<base_container> sptr; -}; - -/*! - * An interface for creating and managing a generic calibration - * data container. - * - * These containers are used to represent N dimensional data structures - * in order to accommodate a mapping from multi-variable input to a scalar - * value (e.g. gain, frequency, temperature -> power level [dBm]). - * - * The container only supports inputs of the same type to be mapped. - * - */ -template <typename in_type, typename out_type> -class UHD_API cal_container : public base_container -{ -public: - typedef std::map<in_type, out_type> container_t; - - /*! - * Get the mapping from an input to an output - * from the calibration container. - * - * \param args input values - * \returns the output of the mapping (a scalar value) - * \throws uhd::assertion_error if the dimensions of the input args - * are incorrect for this container - */ - virtual out_type get(const in_type& args) = 0; - - /*! - * Add a data point to the container. - * This function records a mapping R^n -> R between an input vector - * and output scalar. - * - * \param output the output of the data point mapping - * \param args input values - */ - virtual void add(const out_type output, const in_type& args) = 0; - - /*! - * Associate some metadata with the container. - * - * \param data a map of metadata (string -> string). - */ - virtual void add_metadata(const metadata_t& data) = 0; - - /*! - * Retrieve metadata from the container. - * - * \returns map of metadata. - */ - virtual const metadata_t& get_metadata() = 0; - -public: - typedef boost::archive::text_iarchive iarchive_type; - typedef boost::archive::text_oarchive oarchive_type; - -protected: - friend class boost::serialization::access; - - virtual void serialize(iarchive_type& ar, const unsigned int) = 0; - virtual void serialize(oarchive_type& ar, const unsigned int) = 0; -}; - -}} // namespace uhd::cal - -#endif /* INCLUDED_UHD_CAL_CONTAINER_HPP */ diff --git a/host/include/uhd/cal/power_container.hpp b/host/include/uhd/cal/power_container.hpp deleted file mode 100644 index 052c68e6c..000000000 --- a/host/include/uhd/cal/power_container.hpp +++ /dev/null @@ -1,68 +0,0 @@ -// -// Copyright 2016 Ettus Research -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#ifndef INCLUDED_UHD_CAL_POWER_CONTAINER_HPP -#define INCLUDED_UHD_CAL_POWER_CONTAINER_HPP - -#include <uhd/cal/container.hpp> -#include <uhd/config.hpp> -#include <boost/shared_ptr.hpp> - -namespace uhd { namespace cal { - -class UHD_API power_container : public cal_container<std::vector<double>, double> -{ -public: - typedef boost::shared_ptr<power_container> sptr; - - /*! - * Create a container for data related to power calibration. - * - * \returns shared pointer to the container - */ - static sptr make(); - - /*! - * Get the mapping from an input to an output - * from the calibration container. - * - * \param args input values - * \returns the output of the mapping (a scalar value) - * \throws uhd::assertion_error if the number of input values are incorrect - * for the container type - */ - virtual double get(const std::vector<double>& args) = 0; - - /*! - * Add a data point to the container. - * This function records a mapping R^n -> R between an input vector - * and output scalar. For example, a mapping might be - * (power level, frequency, temperature) -> gain. - * - * \param output the output of the data point mapping - * \param args input values - */ - virtual void add(const double output, const std::vector<double>& args) = 0; - - /*! - * Associate some metadata with the container. - * - * \param data a map of metadata (string -> string). - */ - virtual void add_metadata(const metadata_t& data) = 0; - - /*! - * Retrieve metadata from the container. - * - * \returns map of metadata. - */ - virtual const metadata_t& get_metadata() = 0; -}; - -}} // namespace uhd::cal - -#endif /* INCLUDED_UHD_CAL_POWER_CONTAINER_HPP */ diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 359ad7da8..85e07c242 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -89,7 +89,6 @@ INCLUDE_SUBDIRECTORY(ic_reg_maps) INCLUDE_SUBDIRECTORY(types) INCLUDE_SUBDIRECTORY(convert) INCLUDE_SUBDIRECTORY(rfnoc) -INCLUDE_SUBDIRECTORY(cal) INCLUDE_SUBDIRECTORY(usrp) INCLUDE_SUBDIRECTORY(usrp_clock) INCLUDE_SUBDIRECTORY(utils) diff --git a/host/lib/cal/CMakeLists.txt b/host/lib/cal/CMakeLists.txt deleted file mode 100644 index 48f5ffd0c..000000000 --- a/host/lib/cal/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright 2016 Ettus Research -# Copyright 2018 Ettus Research, a National Instruments Company -# -# SPDX-License-Identifier: GPL-3.0-or-later -# - -######################################################################## -# This file included, use CMake directory variables -######################################################################## -include(CheckIncludeFileCXX) -message(STATUS "") - -######################################################################## -# Convert types generation -######################################################################## -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -LIBUHD_APPEND_SOURCES( - ${CMAKE_CURRENT_SOURCE_DIR}/power_container_impl.cpp -) diff --git a/host/lib/cal/interpolation.hpp b/host/lib/cal/interpolation.hpp deleted file mode 100644 index d0c9b5b47..000000000 --- a/host/lib/cal/interpolation.hpp +++ /dev/null @@ -1,61 +0,0 @@ -// -// Copyright 2016 Ettus Research -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#ifndef INCLUDED_UHD_INTERPOLATION_HPP -#define INCLUDED_UHD_INTERPOLATION_HPP - -#include <uhd/exception.hpp> -#include <boost/format.hpp> -#include <map> -#include <cmath> - -namespace uhd { -namespace cal { - -template<typename in_type, typename out_type> -struct interp -{ -public: - typedef std::vector<in_type> args_t; - typedef std::map<args_t, out_type> container_t; - - /*! - * Nearest neighbor interpolation given a mapping: R^n -> R - * - * 1) search for the nearest point in R^n - * 2) find the nearest output scalars in R - * - * \param data input data container - * \param args input data point - * \returns interpolated output value - */ - const out_type nn_interp(container_t &data, const args_t &args); - - /*! - * Bilinear interpolation given a mapping: R^2 -> R - * - * 1) search for 4 surrounding points in R^2 - * 2) find the output scalars in R - * 3) solve the system of equations given our input mappings - * - * \param data input data container - * \param args input data point - * \returns interpolated output value - */ - const out_type bl_interp(container_t &data, const args_t &args); - -private: - /*! - * Calculate the distance between two points - */ - static in_type calc_dist(const args_t &a, const args_t &b); -}; - -} // namespace cal -} // namespace uhd - -#endif /* INCLUDED_UHD_INTERPOLATION_HPP */ diff --git a/host/lib/cal/interpolation.ipp b/host/lib/cal/interpolation.ipp deleted file mode 100644 index 13993d979..000000000 --- a/host/lib/cal/interpolation.ipp +++ /dev/null @@ -1,193 +0,0 @@ -// -// Copyright 2016 Ettus Research -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#ifndef INCLUDED_UHD_INTERPOLATION_IPP -#define INCLUDED_UHD_INTERPOLATION_IPP - -#include "interpolation.hpp" -#include <uhd/utils/log.hpp> -// This is a bugfix for Boost 1.64, maybe future Boosts won't need this -#if BOOST_VERSION >= 106400 -# include <boost/serialization/array_wrapper.hpp> -#endif // end of bugfix -#include <boost/numeric/ublas/io.hpp> -#include <boost/numeric/ublas/matrix.hpp> -#include <boost/numeric/ublas/lu.hpp> - -using namespace boost::numeric; - -namespace uhd { -namespace cal { - -#define CAL_INTERP_METHOD(return_type, method, args, ...) \ - template<typename in_type, typename out_type> \ - return_type interp<in_type, out_type>::\ - method(args, __VA_ARGS__) - -#define ARGS_T typename interp<in_type, out_type>::args_t -#define CONTAINER_T typename interp<in_type, out_type>::container_t - -CAL_INTERP_METHOD(in_type, calc_dist, const ARGS_T &a, const ARGS_T &b) -{ - in_type dist = 0; - for (size_t i = 0; i < std::min(a.size(), b.size()); i++) - { - dist += std::abs(a[i] - b[i]); - } - return dist; -} - -CAL_INTERP_METHOD(const out_type, nn_interp, CONTAINER_T &data, const ARGS_T &args) -{ - // Check the cache for the output - if (data.find(args) != data.end()) { - return data[args]; - } - - out_type output = 0; - in_type min_dist = 0; - typename container_t::const_iterator citer; - for (citer = data.begin(); citer != data.end(); citer++) - { - in_type dist = calc_dist(citer->first, args); - if (citer == data.begin() || dist < min_dist) { - min_dist = dist; - output = data[citer->first]; - } - } - - return output; -} - -CAL_INTERP_METHOD(const out_type, bl_interp, CONTAINER_T &data, const ARGS_T &args) -{ - if (args.size() != 2) { - throw uhd::assertion_error(str(boost::format( - "Bilinear interpolation expects 2D values. Received %d.") - % args.size() - )); - } - - if (data.size() < 4) { - throw uhd::assertion_error(str(boost::format( - "Bilinear interpolation requires at least 4 input points. Found %d.") - % data.size() - )); - } - - // Locate the nearest 4 points - typedef std::pair<interp<in_type, out_type>::args_t, out_type> cal_pair_t; - typename std::vector<cal_pair_t> nearest; - - // Initialize the resulting pair to something - cal_pair_t pair = *data.begin(); - - for (size_t i = 0; i < 4; i++) { - bool init = true; - in_type min_dist = 0; - typename container_t::const_iterator citer; - for (citer = data.begin(); citer != data.end(); citer++) - { - cal_pair_t temp = *citer; - if (std::find(nearest.begin(), nearest.end(), temp) == nearest.end()) - { - in_type dist = calc_dist(citer->first, args); - if (dist < min_dist || init) - { - min_dist = dist; - pair = temp; - init = false; - } - } - } - // Push back the nearest pair - nearest.push_back(pair); - } - - // - // Since these points are not grid aligned, - // we perform irregular bilinear interpolation. - // This math involves finding our interpolation - // function using lagrange multipliers: - // - // f(x, y) = ax^2 + bxy + cy^2 + dx + ey + f - // - // The solution is to solve the following system: - // - // A x b - // | E X' | | s | - | 0 | - // | X 0 | | l | - | z | - // - // where s is a vector of the above coefficients. - // - typename ublas::matrix<in_type> A(10, 10, 0.0); - - // E - A(0, 0) = 1.0; A(1, 1) = 1.0; A(2, 2) = 1.0; - - in_type x1, x2, x3, x4; - in_type y1, y2, y3, y4; - - x1 = nearest[0].first[0]; y1 = nearest[0].first[1]; - x2 = nearest[1].first[0]; y2 = nearest[1].first[1]; - x3 = nearest[2].first[0]; y3 = nearest[2].first[1]; - x4 = nearest[3].first[0]; y4 = nearest[3].first[1]; - - // X - A(0, 6) = x1*x1; A(1, 6) = x1*y1; A(2, 6) = y1*y1; A(3, 6) = x1; A(4, 6) = y1; A(5, 6) = 1.0; - A(0, 7) = x2*x2; A(1, 7) = x2*y2; A(2, 7) = y2*y2; A(3, 7) = x2; A(4, 7) = y2; A(5, 7) = 1.0; - A(0, 8) = x3*x3; A(1, 8) = x3*y3; A(2, 8) = y3*y3; A(3, 8) = x3; A(4, 8) = y3; A(5, 8) = 1.0; - A(0, 9) = x4*x4; A(1, 9) = x4*y4; A(2, 9) = y4*y4; A(3, 9) = x4; A(4, 9) = y4; A(5, 9) = 1.0; - - // X' - A(6, 0) = x1*x1; A(6, 1) = x1*y1; A(6, 2) = y1*y1; A(6, 3) = x1; A(6, 4) = y1; A(6, 5) = 1.0; - A(7, 0) = x2*x2; A(7, 1) = x2*y2; A(7, 2) = y2*y2; A(7, 3) = x2; A(7, 4) = y2; A(7, 5) = 1.0; - A(8, 0) = x3*x3; A(8, 1) = x3*y3; A(8, 2) = y3*y3; A(8, 3) = x3; A(8, 4) = y3; A(8, 5) = 1.0; - A(9, 0) = x4*x4; A(9, 1) = x4*y4; A(9, 2) = y4*y4; A(9, 3) = x4; A(9, 4) = y4; A(9, 5) = 1.0; - - // z - typename ublas::vector<in_type> b(10, 0.0); - b(6) = nearest[0].second; - b(7) = nearest[1].second; - b(8) = nearest[2].second; - b(9) = nearest[3].second; - - typename ublas::matrix<in_type> A_t = A; - typename ublas::vector<in_type> s = b; - typename ublas::permutation_matrix<in_type> P(A_t.size1()); - - // Use LUP factorization to solve for the coefficients - // We're solving the problem in the form of Ax = b - bool is_singular = ublas::lu_factorize(A_t, P); - - out_type output = 0; - - // Fall back to 1D interpolation if the matrix is singular - if (is_singular) { - // Warn the user that the A matrix is singular - UHD_LOGGER_WARNING("CAL") << "Bilinear interpolation: singular matrix detected. " - << "Performing 1D linear interpolation against the nearest measurements. " - << "Provide calibration data with more measurements"; - - output = (b[7] - b[6]) / 2.0; - output += b[6]; - return output; - } - ublas::lu_substitute(A_t, P, s); - - in_type x = args[0]; - in_type y = args[1]; - - // Utilize the solution to calculate the interpolation function - output = s[0]*x*x + s[1]*x*y + s[2]*y*y + s[3]*x + s[4]*y + s[5]; - return output; -} - -} // namespace cal -} // namespace uhd - -#endif /* INCLUDED_UHD_INTERPOLATION_IPP */ diff --git a/host/lib/cal/power_container_impl.cpp b/host/lib/cal/power_container_impl.cpp deleted file mode 100644 index f5dd68ae9..000000000 --- a/host/lib/cal/power_container_impl.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// -// Copyright 2016 Ettus Research -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#include "power_container_impl.hpp" -#include <uhd/exception.hpp> -#include <boost/format.hpp> - -using namespace uhd; -using namespace uhd::cal; - -power_container::sptr power_container::make() -{ - return power_container::sptr(new power_container_impl()); -} - -power_container_impl::power_container_impl() : - _nargs(0), _mode(interp_mode_t::NEAREST) -{ - /* NOP */ -} - -double power_container_impl::get(const std::vector<double> &args) -{ - this->verify_nargs(args); - switch (_mode) - { - case interp_mode_t::BILINEAR : - return _interpolator.bl_interp(_data, args); - case interp_mode_t::NEAREST : - return _interpolator.nn_interp(_data, args); - default: - return _interpolator.nn_interp(_data, args); - } -} - -void power_container_impl::add(const double output, const std::vector<double> &args) -{ - if (_nargs == 0) - { - _nargs = args.size(); - _mode = _nargs == 2 ? interp_mode_t::BILINEAR : interp_mode_t::NEAREST; - } - this->verify_nargs(args); - _data[args] = output; -} - -void power_container_impl::add_metadata(const power_container::metadata_t &data) -{ - _metadata = data; -} - -const power_container_impl::metadata_t &power_container_impl::get_metadata() -{ - return _metadata; -} - -void power_container_impl::verify_nargs(const std::vector<double> &args) -{ - // Check that the number of arguments expected are correct - if (args.size() != _nargs) { - throw uhd::assertion_error(str(boost::format( - "power_container_impl: Expected %d number of arguments/values instead of %d") - % _nargs % args.size() - )); - } -} diff --git a/host/lib/cal/power_container_impl.hpp b/host/lib/cal/power_container_impl.hpp deleted file mode 100644 index c75fe69c2..000000000 --- a/host/lib/cal/power_container_impl.hpp +++ /dev/null @@ -1,67 +0,0 @@ -// -// Copyright 2016 Ettus Research -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#ifndef INCLUDED_UHD_CAL_POWER_CONTAINER_IMPL_HPP -#define INCLUDED_UHD_CAL_POWER_CONTAINER_IMPL_HPP - -#include "interpolation.ipp" -#include <uhd/cal/power_container.hpp> - -namespace uhd { -namespace cal { - -enum interp_mode_t -{ - BILINEAR, //! linear interpolation - NEAREST //! nearest neighbor interpolation -}; - -class power_container_impl : public power_container { -public: - typedef std::map<std::vector<double>, double> container_t; - - power_container_impl(); - - double get(const std::vector<double> &args); - const metadata_t &get_metadata(); - - void add(const double output, const std::vector<double> &args); - void add_metadata(const metadata_t &data); - -private: - // Container data to be serialized - size_t _nargs; - metadata_t _metadata; - interp_mode_t _mode; - container_t _data; - - interp<double, double> _interpolator; - - void verify_nargs(const std::vector<double> &args); - -protected: - friend class boost::serialization::access; - - void serialize(iarchive_type & ar, const unsigned int) { - ar & _nargs; - ar & _metadata; - ar & _mode; - ar & _data; - } - - void serialize(oarchive_type & ar, const unsigned int) { - ar & _nargs; - ar & _metadata; - ar & _mode; - ar & _data; - } -}; - -} // namespace cal -} // namespace uhd - -#endif /* INCLUDED_UHD_CAL_POWER_CONTAINER_IMPL_HPP */ diff --git a/host/tests/CMakeLists.txt b/host/tests/CMakeLists.txt index dfd5bafdd..8a67e3f85 100644 --- a/host/tests/CMakeLists.txt +++ b/host/tests/CMakeLists.txt @@ -25,7 +25,6 @@ set(test_sources buffer_test.cpp byteswap_test.cpp cast_test.cpp - cal_container_test.cpp chdr_test.cpp constrained_device_args_test.cpp convert_test.cpp diff --git a/host/tests/cal_container_test.cpp b/host/tests/cal_container_test.cpp deleted file mode 100644 index 4957b0b0d..000000000 --- a/host/tests/cal_container_test.cpp +++ /dev/null @@ -1,195 +0,0 @@ -// -// Copyright 2016 Ettus Research -// Copyright 2018 Ettus Research, a National Instruments Company -// -// SPDX-License-Identifier: GPL-3.0-or-later -// - -#include <uhd/cal/power_container.hpp> -#include <uhd/exception.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/test/unit_test.hpp> -#include <fstream> -#include <vector> - -using namespace uhd; -using namespace uhd::cal; - -static const double eps = 1e-8; - -//////////////////////////////////////////////////////////////////////// -BOOST_AUTO_TEST_CASE(test_power_container_bilinear) -{ - //////////////////////////////////////////////////////////////////////// - - // Create the data container - power_container::sptr container = power_container::make(); - - // Create some data points to add - std::vector<double> pt0(2, 0.0); - std::vector<double> pt1(2, 0.0); - std::vector<double> pt2(2, 0.0); - std::vector<double> pt3(2, 2.0); - - pt1[0] = 2.0; - pt2[1] = 2.0; - - container->add(1.0, pt0); - container->add(1.0, pt1); - container->add(0.0, pt2); - container->add(0.0, pt3); - - // Add points to interpolate against - std::vector<double> test0(2, 1.0); - std::vector<double> test1(2, 1.5); - std::vector<double> test2(2, 0.0); - test2[1] = 1.0; - - BOOST_CHECK_CLOSE(container->get(test0), 0.50, eps); - BOOST_CHECK_CLOSE(container->get(test1), 0.25, eps); - BOOST_CHECK_CLOSE(container->get(test2), 0.50, eps); -} - - -//////////////////////////////////////////////////////////////////////// -BOOST_AUTO_TEST_CASE(test_power_temp_container) -{ - //////////////////////////////////////////////////////////////////////// - - // Create the data container - power_container::sptr container = power_container::make(); - - // Create some data points to add - std::vector<double> pt0(3, 1.0); - std::vector<double> pt1(3, 2.0); - std::vector<double> pt2(3, 3.0); - - container->add(1.0, pt0); - container->add(2.0, pt1); - container->add(5.0, pt2); - - // Add points to interpolate against - std::vector<double> test0(3, 1.99); - std::vector<double> test1(3, 1.29); - std::vector<double> test2; - test2.push_back(2.59); - test2.push_back(1.29); - test2.push_back(2.99); - - BOOST_CHECK_CLOSE(container->get(test0), 2.0, eps); - BOOST_CHECK_CLOSE(container->get(test1), 1.0, eps); - BOOST_CHECK_CLOSE(container->get(test2), 5.0, eps); -} - -//////////////////////////////////////////////////////////////////////// -BOOST_AUTO_TEST_CASE(test_power_container_metadata) -{ - //////////////////////////////////////////////////////////////////////// - - // Create the data container - power_container::sptr container = power_container::make(); - - // Create some metadata to add - base_container::metadata_t data; - - std::string fake_serial = "F2A432"; - data["x300"] = fake_serial; - - // Add some metadata - container->add_metadata(data); - - // Check to see if the metadata matches - power_container::metadata_t recovered_data = container->get_metadata(); - - BOOST_CHECK_EQUAL(recovered_data["x300"], fake_serial); -} - -//////////////////////////////////////////////////////////////////////// -BOOST_AUTO_TEST_CASE(test_power_serialization) -{ - //////////////////////////////////////////////////////////////////////// - - // Create the data container - power_container::sptr container = power_container::make(); - - // Create some metadata to add - base_container::metadata_t data; - - std::string fake_serial = "F2A432"; - data["x300"] = fake_serial; - - // Add some metadata - container->add_metadata(data); - - // Create some data points to add - std::vector<double> pt0(3, 1.0); - std::vector<double> pt1(3, 2.0); - std::vector<double> pt2(3, 3.0); - - container->add(1.0, pt0); - container->add(2.0, pt1); - container->add(5.0, pt2); - - std::string filename("test_power_serialization"); - - // Create/open a file to store the container - { - std::ofstream ofile(filename.c_str()); - - boost::archive::text_oarchive oarchive(ofile); - oarchive << *container; - } - - // Restore to another data container - power_container::sptr new_container = power_container::make(); - - { - std::ifstream ifile(filename.c_str()); - boost::archive::text_iarchive iarchive(ifile); - - iarchive >> *new_container; - } - - // Add points to interpolate against - std::vector<double> test0(3, 1.99); - std::vector<double> test1(3, 1.29); - std::vector<double> test2; - test2.push_back(2.59); - test2.push_back(1.29); - test2.push_back(2.99); - - power_container::metadata_t recovered_data = new_container->get_metadata(); - - BOOST_CHECK_CLOSE(new_container->get(test0), 2.0, eps); - BOOST_CHECK_CLOSE(new_container->get(test1), 1.0, eps); - BOOST_CHECK_CLOSE(new_container->get(test2), 5.0, eps); - - // Check to see if the metadata matches - BOOST_CHECK_EQUAL(recovered_data["x300"], fake_serial); - - std::remove(filename.c_str()); -} - -//////////////////////////////////////////////////////////////////////// -BOOST_AUTO_TEST_CASE(test_interp_singular) -{ - //////////////////////////////////////////////////////////////////////// - - // Create the data container - power_container::sptr container = power_container::make(); - - // Create some data points to add - // that result in a singular matrix - std::vector<double> pt0(2, 1.0); - std::vector<double> pt1(2, 2.0); - std::vector<double> pt2(2, 3.0); - std::vector<double> pt3(2, 4.0); - - container->add(1.0, pt0); - container->add(2.0, pt1); - container->add(3.0, pt2); - container->add(4.0, pt3); - - std::vector<double> test(2, 2.5); - BOOST_CHECK_CLOSE(container->get(test), 2.5, eps); -} |