diff --git a/conanfile.py b/conanfile.py index 404a0c00..c02f7a67 100644 --- a/conanfile.py +++ b/conanfile.py @@ -89,7 +89,7 @@ class UnitsConan(ConanFile): self.build_requires("Catch2/2.11.0@catchorg/stable") # TODO update doxygen to the latest version when available self.build_requires("doxygen_installer/1.8.17@bincrafters/stable") - self.build_requires("linear_algebra/0.6.0@public-conan/stable") + self.build_requires("linear_algebra/0.7.0@public-conan/testing") def build(self): cmake = self._configure_cmake() diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 9ab03556..c434d4fb 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,7 +1,7 @@ # Release notes - **0.6.0 WIP** - + - linear_algebra updated to 0.7.0/testing - **0.5.0 May 17, 2020** - Major refactoring and rewrite of the library diff --git a/docs/use_cases/linear_algebra.rst b/docs/use_cases/linear_algebra.rst index 402f3851..804bf8b5 100644 --- a/docs/use_cases/linear_algebra.rst +++ b/docs/use_cases/linear_algebra.rst @@ -14,7 +14,7 @@ enough to be used with other Linear Algebra libraries existing on the market. or `Conan `_. Also, to simplify the examples all of them assume:: - using namespace std::experimental::math; + using namespace std::math; Linear Algebra of Quantities diff --git a/example/linear_algebra.cpp b/example/linear_algebra.cpp index b93794c6..13a4ffc3 100644 --- a/example/linear_algebra.cpp +++ b/example/linear_algebra.cpp @@ -30,10 +30,10 @@ namespace { template -std::ostream& operator<<(std::ostream& os, const std::experimental::math::vector& v) +std::ostream& operator<<(std::ostream& os, const std::math::vector& v) { os << "|"; - for (size_t i = 0; i < v.size(); ++i) { + for (auto i = 0; i < v.size(); ++i) { os << fmt::format(" {:>9}", v(i)); } os << " |"; @@ -41,11 +41,11 @@ std::ostream& operator<<(std::ostream& os, const std::experimental::math::vector } template -std::ostream& operator<<(std::ostream& os, const std::experimental::math::matrix& v) +std::ostream& operator<<(std::ostream& os, const std::math::matrix& v) { - for (size_t i = 0; i < v.rows(); ++i) { + for (auto i = 0; i < v.rows(); ++i) { os << "|"; - for (size_t j = 0; j < v.columns(); ++j) { + for (auto j = 0; j < v.columns(); ++j) { os << fmt::format(" {:>9}", v(i, j)); } os << (i != v.rows() - 1 ? " |\n" : " |"); @@ -54,7 +54,7 @@ std::ostream& operator<<(std::ostream& os, const std::experimental::math::matrix } -using namespace std::experimental::math; +using namespace std::math; using namespace units::physical; using namespace units::physical::si::literals;