Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3a67e13da7ae
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dc59bf1e8327
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Aug 22, 2020

  1. More Clang voodoo.

    pleroy committed Aug 22, 2020
    Copy the full SHA
    1c33a5b View commit details
  2. Merge pull request #2687 from pleroy/Clang

    More Clang voodoo
    pleroy authored Aug 22, 2020
    Copy the full SHA
    dc59bf1 View commit details
Showing with 13 additions and 4 deletions.
  1. +9 −2 mathematica/mathematica.hpp
  2. +2 −1 numerics/poisson_series.hpp
  3. +2 −1 numerics/polynomial.hpp
11 changes: 9 additions & 2 deletions mathematica/mathematica.hpp
Original file line number Diff line number Diff line change
@@ -201,18 +201,25 @@ template<typename R,
std::string ToMathematica(R ref,
OptionalExpressIn express_in = std::nullopt);

// The default expression in this function and the next appears in the forward
// declaration found in polynomial.hpp and poisson_series.hpp. The reason is
// that the language wants that default to occur on the first declaration of the
// function. If a client doesn't use mathematica.hpp with polynomials or
// Poisson series, it doesn't care about the default. If it uses both together,
// polynomial.hpp and poisson_series.hpp will always be included before
// mathematica.hpp, so the default will properly be on the first declaration.
template<typename V, typename A, int d,
template<typename, typename, int> class E,
typename OptionalExpressIn = std::nullopt_t>
std::string ToMathematica(
PolynomialInMonomialBasis<V, A, d, E> const& polynomial,
OptionalExpressIn express_in = std::nullopt);
OptionalExpressIn express_in /*= std::nullopt*/);

template<typename V, int d,
template<typename, typename, int> class E,
typename OptionalExpressIn = std::nullopt_t>
std::string ToMathematica(PoissonSeries<V, d, E> const& series,
OptionalExpressIn express_in = std::nullopt);
OptionalExpressIn express_in /*= std::nullopt*/);

template<typename OptionalExpressIn = std::nullopt_t>
std::string ToMathematica(
3 changes: 2 additions & 1 deletion numerics/poisson_series.hpp
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

#include <algorithm>
#include <map>
#include <optional>
#include <string>
#include <vector>

@@ -29,7 +30,7 @@ FORWARD_DECLARE_FUNCTION_FROM(
typename OptionalExpressIn) std::string,
ToMathematica,
(numerics::PoissonSeries<Value, degree_, Evaluator> const& series,
OptionalExpressIn express_in));
OptionalExpressIn express_in = std::nullopt));
} // namespace mathematica

namespace numerics {
3 changes: 2 additions & 1 deletion numerics/polynomial.hpp
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
#pragma once

#include <algorithm>
#include <optional>
#include <string>
#include <tuple>
#include <utility>
@@ -31,7 +32,7 @@ FORWARD_DECLARE_FUNCTION_FROM(
(numerics::
PolynomialInMonomialBasis<Value, Argument, degree_, Evaluator> const&
polynomial,
OptionalExpressIn express_in));
OptionalExpressIn express_in = std::nullopt));
} // namespace mathematica

namespace numerics {