From ba061666041ee8e3c1839b0d091c53a0bbc88d69 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 5 Jan 2017 00:39:27 +0100 Subject: [PATCH] Get rid off typeid in symmetric_tensor_36 --- tests/base/symmetric_tensor_36.cc | 29 ++-- tests/base/symmetric_tensor_36.output | 192 +++++++++++++------------- 2 files changed, 110 insertions(+), 111 deletions(-) diff --git a/tests/base/symmetric_tensor_36.cc b/tests/base/symmetric_tensor_36.cc index 43b0d332fb..93ca72f929 100644 --- a/tests/base/symmetric_tensor_36.cc +++ b/tests/base/symmetric_tensor_36.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2016 by the deal.II authors +// Copyright (C) 2016 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -27,7 +27,6 @@ #include #include #include -#include // Some number types cannot be converted to floats/doubles; // for example, complex numbers cannot be converted to primitive numbers @@ -38,7 +37,7 @@ template typename boost::disable_if,void>::type -test_tensor_constructor () +test_tensor_constructor (const std::string &, const std::string &) {} template typename boost::enable_if,void>::type -test_tensor_constructor () +test_tensor_constructor (const std::string &type1, const std::string &type2) { deallog << "Rank " << rank << ", " << "Dim " << dim << ":" - << " From " << typeid(NumberType2).name() - << " To " << typeid(NumberType1).name() + << " From " << type2 + << " To " << type1 << " ... " << std::flush; TensorType tmp2; @@ -64,12 +63,12 @@ template class TensorType, typename NumberType1> void -test_fixed_NT_2() +test_fixed_NT_2(const std::string &type1) { - test_tensor_constructor(); - test_tensor_constructor(); - test_tensor_constructor >(); - test_tensor_constructor >(); + test_tensor_constructor(type1, "float"); + test_tensor_constructor(type1, "double"); + test_tensor_constructor >(type1, "std::complex"); + test_tensor_constructor >(type1, "std::complex"); } template(); - test_fixed_NT_2(); - test_fixed_NT_2 >(); - test_fixed_NT_2 >(); + test_fixed_NT_2("float"); + test_fixed_NT_2("double"); + test_fixed_NT_2 >("std::complex"); + test_fixed_NT_2 >("std::complex"); } template diff --git a/tests/base/symmetric_tensor_36.output b/tests/base/symmetric_tensor_36.output index 4ba392bbc9..36670d3bd9 100644 --- a/tests/base/symmetric_tensor_36.output +++ b/tests/base/symmetric_tensor_36.output @@ -1,98 +1,98 @@ -DEAL::Rank 2, Dim 2: From f To f ... OK -DEAL::Rank 2, Dim 2: From d To f ... OK -DEAL::Rank 2, Dim 2: From f To d ... OK -DEAL::Rank 2, Dim 2: From d To d ... OK -DEAL::Rank 2, Dim 2: From f To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 2: From d To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 2: From NSt3__17complexIfEE To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 2: From NSt3__17complexIdEE To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 2: From f To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 2: From d To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 2: From NSt3__17complexIfEE To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 2: From NSt3__17complexIdEE To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 2: From f To f ... OK -DEAL::Rank 2, Dim 2: From d To f ... OK -DEAL::Rank 2, Dim 2: From f To d ... OK -DEAL::Rank 2, Dim 2: From d To d ... OK -DEAL::Rank 2, Dim 2: From f To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 2: From d To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 2: From NSt3__17complexIfEE To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 2: From NSt3__17complexIdEE To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 2: From f To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 2: From d To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 2: From NSt3__17complexIfEE To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 2: From NSt3__17complexIdEE To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 2: From f To f ... OK -DEAL::Rank 4, Dim 2: From d To f ... OK -DEAL::Rank 4, Dim 2: From f To d ... OK -DEAL::Rank 4, Dim 2: From d To d ... OK -DEAL::Rank 4, Dim 2: From f To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 2: From d To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 2: From NSt3__17complexIfEE To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 2: From NSt3__17complexIdEE To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 2: From f To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 2: From d To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 2: From NSt3__17complexIfEE To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 2: From NSt3__17complexIdEE To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 2: From f To f ... OK -DEAL::Rank 4, Dim 2: From d To f ... OK -DEAL::Rank 4, Dim 2: From f To d ... OK -DEAL::Rank 4, Dim 2: From d To d ... OK -DEAL::Rank 4, Dim 2: From f To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 2: From d To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 2: From NSt3__17complexIfEE To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 2: From NSt3__17complexIdEE To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 2: From f To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 2: From d To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 2: From NSt3__17complexIfEE To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 2: From NSt3__17complexIdEE To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 3: From f To f ... OK -DEAL::Rank 2, Dim 3: From d To f ... OK -DEAL::Rank 2, Dim 3: From f To d ... OK -DEAL::Rank 2, Dim 3: From d To d ... OK -DEAL::Rank 2, Dim 3: From f To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 3: From d To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 3: From NSt3__17complexIfEE To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 3: From NSt3__17complexIdEE To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 3: From f To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 3: From d To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 3: From NSt3__17complexIfEE To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 3: From NSt3__17complexIdEE To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 3: From f To f ... OK -DEAL::Rank 2, Dim 3: From d To f ... OK -DEAL::Rank 2, Dim 3: From f To d ... OK -DEAL::Rank 2, Dim 3: From d To d ... OK -DEAL::Rank 2, Dim 3: From f To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 3: From d To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 3: From NSt3__17complexIfEE To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 3: From NSt3__17complexIdEE To NSt3__17complexIfEE ... OK -DEAL::Rank 2, Dim 3: From f To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 3: From d To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 3: From NSt3__17complexIfEE To NSt3__17complexIdEE ... OK -DEAL::Rank 2, Dim 3: From NSt3__17complexIdEE To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 3: From f To f ... OK -DEAL::Rank 4, Dim 3: From d To f ... OK -DEAL::Rank 4, Dim 3: From f To d ... OK -DEAL::Rank 4, Dim 3: From d To d ... OK -DEAL::Rank 4, Dim 3: From f To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 3: From d To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 3: From NSt3__17complexIfEE To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 3: From NSt3__17complexIdEE To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 3: From f To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 3: From d To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 3: From NSt3__17complexIfEE To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 3: From NSt3__17complexIdEE To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 3: From f To f ... OK -DEAL::Rank 4, Dim 3: From d To f ... OK -DEAL::Rank 4, Dim 3: From f To d ... OK -DEAL::Rank 4, Dim 3: From d To d ... OK -DEAL::Rank 4, Dim 3: From f To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 3: From d To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 3: From NSt3__17complexIfEE To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 3: From NSt3__17complexIdEE To NSt3__17complexIfEE ... OK -DEAL::Rank 4, Dim 3: From f To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 3: From d To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 3: From NSt3__17complexIfEE To NSt3__17complexIdEE ... OK -DEAL::Rank 4, Dim 3: From NSt3__17complexIdEE To NSt3__17complexIdEE ... OK +DEAL::Rank 2, Dim 2: From float To float ... OK +DEAL::Rank 2, Dim 2: From double To float ... OK +DEAL::Rank 2, Dim 2: From float To double ... OK +DEAL::Rank 2, Dim 2: From double To double ... OK +DEAL::Rank 2, Dim 2: From float To std::complex ... OK +DEAL::Rank 2, Dim 2: From double To std::complex ... OK +DEAL::Rank 2, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 2: From float To std::complex ... OK +DEAL::Rank 2, Dim 2: From double To std::complex ... OK +DEAL::Rank 2, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 2: From float To float ... OK +DEAL::Rank 2, Dim 2: From double To float ... OK +DEAL::Rank 2, Dim 2: From float To double ... OK +DEAL::Rank 2, Dim 2: From double To double ... OK +DEAL::Rank 2, Dim 2: From float To std::complex ... OK +DEAL::Rank 2, Dim 2: From double To std::complex ... OK +DEAL::Rank 2, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 2: From float To std::complex ... OK +DEAL::Rank 2, Dim 2: From double To std::complex ... OK +DEAL::Rank 2, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 2: From float To float ... OK +DEAL::Rank 4, Dim 2: From double To float ... OK +DEAL::Rank 4, Dim 2: From float To double ... OK +DEAL::Rank 4, Dim 2: From double To double ... OK +DEAL::Rank 4, Dim 2: From float To std::complex ... OK +DEAL::Rank 4, Dim 2: From double To std::complex ... OK +DEAL::Rank 4, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 2: From float To std::complex ... OK +DEAL::Rank 4, Dim 2: From double To std::complex ... OK +DEAL::Rank 4, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 2: From float To float ... OK +DEAL::Rank 4, Dim 2: From double To float ... OK +DEAL::Rank 4, Dim 2: From float To double ... OK +DEAL::Rank 4, Dim 2: From double To double ... OK +DEAL::Rank 4, Dim 2: From float To std::complex ... OK +DEAL::Rank 4, Dim 2: From double To std::complex ... OK +DEAL::Rank 4, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 2: From float To std::complex ... OK +DEAL::Rank 4, Dim 2: From double To std::complex ... OK +DEAL::Rank 4, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 2: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 3: From float To float ... OK +DEAL::Rank 2, Dim 3: From double To float ... OK +DEAL::Rank 2, Dim 3: From float To double ... OK +DEAL::Rank 2, Dim 3: From double To double ... OK +DEAL::Rank 2, Dim 3: From float To std::complex ... OK +DEAL::Rank 2, Dim 3: From double To std::complex ... OK +DEAL::Rank 2, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 3: From float To std::complex ... OK +DEAL::Rank 2, Dim 3: From double To std::complex ... OK +DEAL::Rank 2, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 3: From float To float ... OK +DEAL::Rank 2, Dim 3: From double To float ... OK +DEAL::Rank 2, Dim 3: From float To double ... OK +DEAL::Rank 2, Dim 3: From double To double ... OK +DEAL::Rank 2, Dim 3: From float To std::complex ... OK +DEAL::Rank 2, Dim 3: From double To std::complex ... OK +DEAL::Rank 2, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 3: From float To std::complex ... OK +DEAL::Rank 2, Dim 3: From double To std::complex ... OK +DEAL::Rank 2, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 2, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 3: From float To float ... OK +DEAL::Rank 4, Dim 3: From double To float ... OK +DEAL::Rank 4, Dim 3: From float To double ... OK +DEAL::Rank 4, Dim 3: From double To double ... OK +DEAL::Rank 4, Dim 3: From float To std::complex ... OK +DEAL::Rank 4, Dim 3: From double To std::complex ... OK +DEAL::Rank 4, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 3: From float To std::complex ... OK +DEAL::Rank 4, Dim 3: From double To std::complex ... OK +DEAL::Rank 4, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 3: From float To float ... OK +DEAL::Rank 4, Dim 3: From double To float ... OK +DEAL::Rank 4, Dim 3: From float To double ... OK +DEAL::Rank 4, Dim 3: From double To double ... OK +DEAL::Rank 4, Dim 3: From float To std::complex ... OK +DEAL::Rank 4, Dim 3: From double To std::complex ... OK +DEAL::Rank 4, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 3: From float To std::complex ... OK +DEAL::Rank 4, Dim 3: From double To std::complex ... OK +DEAL::Rank 4, Dim 3: From std::complex To std::complex ... OK +DEAL::Rank 4, Dim 3: From std::complex To std::complex ... OK DEAL::All OK -- 2.39.5