Convert to std::array

diff --git a/include/deal.II/base/quadrature.h b/include/deal.II/base/quadrature.h
index 2fb29302b2c56d353e3db25caa407db31593bc9a..4aebe91b02728fbb655a36f4377785c790c6a8fe 100644 (file)
--- a/include/deal.II/base/quadrature.h
+++ b/include/deal.II/base/quadrature.h
@@ -21,6 +21,7 @@
 #include <deal.II/base/point.h>
 #include <deal.II/base/subscriptor.h>
 #include <vector>
+#include <array>
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -129,7 +130,7 @@ public:
   /**
    * Copy constructor.
    */
-  Quadrature (const Quadrature<dim> &q);
+  Quadrature (const Quadrature<dim> &q) = default;
 
   /**
    * Move constructor. Construct a new quadrature object by transferring the
@@ -163,13 +164,13 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~Quadrature ();
+  virtual ~Quadrature () = default;
 
   /**
    * Assignment operator. Copies contents of #weights and #quadrature_points
    * as well as size.
    */
-  Quadrature &operator = (const Quadrature<dim> &);
+  Quadrature &operator = (const Quadrature<dim> &) = default;
 
   /**
    * Test for equality of two quadratures.
@@ -232,7 +233,8 @@ public:
    * returns the one-dimensional basis objects.
    * Otherwise, calling this function is not allowed.
    */
-  const std::vector<Quadrature<1>> &get_tensor_basis() const;
+  typename std::conditional<dim==1, std::array<Quadrature<1>, dim>,const std::array<Quadrature<1>,dim>&>::type
+  get_tensor_basis() const;
 
 protected:
   /**
@@ -259,7 +261,7 @@ protected:
    * Stores the one-dimensional tensor basis objects in case this object
    * can be represented by a tensor product.
    */
-  std::vector<Quadrature<1> > tensor_basis;
+  typename std::conditional<dim==1, int, std::array<Quadrature<1>,dim>>::type tensor_basis;
 };
 
 
@@ -442,8 +444,6 @@ Quadrature<0>::Quadrature (const Quadrature<-1> &,
                            const Quadrature<1> &);
 template <>
 Quadrature<0>::Quadrature (const Quadrature<1> &);
-template <>
-Quadrature<0>::~Quadrature ();
 
 template <>
 Quadrature<1>::Quadrature (const Quadrature<0> &,

diff --git a/source/base/quadrature.cc b/source/base/quadrature.cc
index 4a107dc22aa84e5567d88cd646917226bfe9af40..7e6b09099792a833a507d21ed867971a3d08655e 100644 (file)
--- a/source/base/quadrature.cc
+++ b/source/base/quadrature.cc
@@ -26,25 +26,6 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-namespace
-{
-  template <int dim>
-  void
-  set_tensor_basis_1d(const Quadrature<dim> &,
-                      std::vector<Quadrature<1>> &)
-  {}
-
-  template <>
-  void
-  set_tensor_basis_1d(const Quadrature<1> &quadrature,
-                      std::vector<Quadrature<1>> &tensor_basis)
-  {
-    tensor_basis = std::vector<Quadrature<1> >(1, quadrature);
-  }
-}
-
-
-
 template <>
 Quadrature<0>::Quadrature (const unsigned int n_q)
   :
@@ -55,12 +36,6 @@ Quadrature<0>::Quadrature (const unsigned int n_q)
 
 
 
-template <>
-Quadrature<0>::~Quadrature ()
-{}
-
-
-
 template <int dim>
 Quadrature<dim>::Quadrature (const unsigned int n_q)
   :
@@ -68,7 +43,6 @@ Quadrature<dim>::Quadrature (const unsigned int n_q)
   weights (n_q, 0),
   is_tensor_product_flag (dim==1)
 {
-  set_tensor_basis_1d(*this, this->tensor_basis);
 }
 
 
@@ -95,7 +69,6 @@ Quadrature<dim>::Quadrature (const std::vector<Point<dim> > &points,
 {
   Assert (weights.size() == points.size(),
           ExcDimensionMismatch(weights.size(), points.size()));
-  set_tensor_basis_1d(*this, this->tensor_basis);
 }
 
 
@@ -109,7 +82,6 @@ Quadrature<dim>::Quadrature (const std::vector<Point<dim> > &points)
 {
   Assert(weights.size() == points.size(),
          ExcDimensionMismatch(weights.size(), points.size()));
-  set_tensor_basis_1d(*this, this->tensor_basis);
 }
 
 
@@ -119,9 +91,23 @@ Quadrature<dim>::Quadrature (const Point<dim> &point)
   :
   quadrature_points(std::vector<Point<dim> > (1, point)),
   weights(std::vector<double> (1, 1.)),
-  is_tensor_product_flag (dim==1)
+  is_tensor_product_flag (true)
+{
+  for (unsigned int i=0; i<dim; ++i)
+    {
+      const std::vector<Point<1> > quad_vec_1d (1, Point<1>(point[i]));
+      tensor_basis[i] = Quadrature<1>(quad_vec_1d, weights);
+    }
+}
+
+
+template <>
+Quadrature<1>::Quadrature (const Point<1> &point)
+  :
+  quadrature_points(std::vector<Point<1> > (1, point)),
+  weights(std::vector<double> (1, 1.)),
+  is_tensor_product_flag (true)
 {
-  set_tensor_basis_1d(*this, this->tensor_basis);
 }
 
 
@@ -175,8 +161,9 @@ Quadrature<dim>::Quadrature (const SubQuadrature &q1,
 
   if (is_tensor_product_flag)
     {
-      tensor_basis = q1.get_tensor_basis();
-      tensor_basis.push_back(q2);
+      for (unsigned int i=0; i<dim-1; ++i)
+        tensor_basis[i] = q1.get_tensor_basis()[i];
+      tensor_basis[dim-1] = q2;;
     }
 }
 
@@ -188,8 +175,7 @@ Quadrature<1>::Quadrature (const SubQuadrature &,
   :
   quadrature_points (q2.size()),
   weights (q2.size()),
-  is_tensor_product_flag (true),
-  tensor_basis(std::vector<Quadrature<1> >(1,q2))
+  is_tensor_product_flag (true)
 {
   unsigned int present_index = 0;
   for (unsigned int i2=0; i2<q2.size(); ++i2)
@@ -276,23 +262,37 @@ Subscriptor(),
           ++k;
         }
   for (unsigned int i=0; i<dim; ++i)
-    tensor_basis = std::vector<Quadrature<1> >(dim, q);
+    tensor_basis[i] = q;
 }
 
 
 
-template <int dim>
+/*template <int dim>
 Quadrature<dim>::Quadrature (const Quadrature<dim> &q)
   :
   Subscriptor(),
   quadrature_points (q.quadrature_points),
   weights (q.weights),
-  is_tensor_product_flag (q.is_tensor_product_flag),
-  tensor_basis (q.tensor_basis)
-{}
+  is_tensor_product_flag (q.is_tensor_product_flag)
+{
+  if (is_tensor_product_flag)
+    tensor_basis = q.tensor_basis;
+}
 
 
-template <int dim>
+
+template <>
+Quadrature<1>::Quadrature (const Quadrature<1> &q)
+  :
+  Subscriptor(),
+  quadrature_points (q.quadrature_points),
+  weights (q.weights),
+  is_tensor_product_flag (q.is_tensor_product_flag)
+{}*/
+
+
+
+/*template <int dim>
 Quadrature<dim> &
 Quadrature<dim>::operator= (const Quadrature<dim> &q)
 {
@@ -303,6 +303,38 @@ Quadrature<dim>::operator= (const Quadrature<dim> &q)
   return *this;
 }
 
+template <>
+Quadrature<1> &
+Quadrature<1>::operator= (const Quadrature<1> &q)
+{
+  std::cout << tensor_basis << std::endl;
+
+  Assert (q.size() == q.weights.size(), ExcInternalError());
+  Assert (q.size() == q.quadrature_points.size(), ExcInternalError());
+  for (unsigned int i=0; i<q.size(); ++i)
+    {
+      std::cout << q.weights[i] << std::endl;
+      std::cout << q.quadrature_points[i] << std::endl;
+    }
+
+  Assert (size() == weights.size(),
+          ExcDimensionMismatch (size(), weights.size()));
+  Assert (size() == quadrature_points.size(),
+          ExcDimensionMismatch(size(), quadrature_points.size()));
+  for (unsigned int i=0; i<size(); ++i)
+    {
+      std::cout << weights[i] << std::endl;
+      std::cout << quadrature_points[i] << std::endl;
+    }
+
+  weights = q.weights;
+  quadrature_points = q.quadrature_points;
+  is_tensor_product_flag = q.is_tensor_product_flag;
+  tensor_basis = q.tensor_basis;
+  return *this;
+}*/
+
+
 
 
 template <int dim>
@@ -316,12 +348,6 @@ Quadrature<dim>::operator == (const Quadrature<dim> &q) const
 
 
 
-template <int dim>
-Quadrature<dim>::~Quadrature ()
-{}
-
-
-
 template <int dim>
 std::size_t
 Quadrature<dim>::memory_consumption () const
@@ -333,19 +359,31 @@ Quadrature<dim>::memory_consumption () const
 
 
 template <int dim>
-const std::vector<Quadrature<1> > &
+typename std::conditional<dim==1, std::array<Quadrature<1>, dim>,const std::array<Quadrature<1>,dim>&>::type
 Quadrature<dim>::get_tensor_basis () const
 {
   Assert (this->is_tensor_product_flag == true,
           ExcMessage("This function only makes sense if "
                      "this object represents a tensor product!"));
-  Assert (tensor_basis.size()==dim, ExcInternalError());
 
   return tensor_basis;
 }
 
 
 
+template <>
+std::array<Quadrature<1>, 1>
+Quadrature<1>::get_tensor_basis () const
+{
+  Assert (this->is_tensor_product_flag == true,
+          ExcMessage("This function only makes sense if "
+                     "this object represents a tensor product!"));
+
+  return std::array<Quadrature<1>, 1> {*this};
+}
+
+
+
 //---------------------------------------------------------------------------
 template <int dim>
 QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx)
@@ -360,18 +398,25 @@ QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx)
     }
   Assert (k==this->size(), ExcInternalError());
   this->is_tensor_product_flag = true;
-  this->tensor_basis.resize(1);
-  this->tensor_basis[0] = qx;
+  //this->tensor_basis[0] = qx;
 }
 
 
 
 template <int dim>
-QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx,
-                                const Quadrature<1> &qy)
-  :  Quadrature<dim>(qx.size()*qy.size())
+QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &,
+                                const Quadrature<1> &)
 {
   Assert (dim==2, ExcImpossibleInDim(dim));
+}
+
+
+
+template <>
+QAnisotropic<2>::QAnisotropic(const Quadrature<1> &qx,
+                              const Quadrature<1> &qy)
+  :  Quadrature<2>(qx.size()*qy.size())
+{
   unsigned int k=0;
   for (unsigned int k2=0; k2<qy.size(); ++k2)
     for (unsigned int k1=0; k1<qx.size(); ++k1)
@@ -382,7 +427,6 @@ QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx,
       }
   Assert (k==this->size(), ExcInternalError());
   this->is_tensor_product_flag = true;
-  this->tensor_basis.resize(2);
   this->tensor_basis[0] = qx;
   this->tensor_basis[1] = qy;
 }
@@ -396,6 +440,16 @@ QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx,
   : Quadrature<dim>(qx.size()*qy.size()*qz.size())
 {
   Assert (dim==3, ExcImpossibleInDim(dim));
+}
+
+
+
+template <>
+QAnisotropic<3>::QAnisotropic(const Quadrature<1> &qx,
+                              const Quadrature<1> &qy,
+                              const Quadrature<1> &qz)
+  : Quadrature<3>(qx.size()*qy.size()*qz.size())
+{
   unsigned int k=0;
   for (unsigned int k3=0; k3<qz.size(); ++k3)
     for (unsigned int k2=0; k2<qy.size(); ++k2)
@@ -408,7 +462,6 @@ QAnisotropic<dim>::QAnisotropic(const Quadrature<1> &qx,
         }
   Assert (k==this->size(), ExcInternalError());
   this->is_tensor_product_flag = true;
-  this->tensor_basis.resize(3);
   this->tensor_basis[0] = qx;
   this->tensor_basis[1] = qy;
   this->tensor_basis[2] = qz;
@@ -1812,7 +1865,6 @@ QIterated<1>::QIterated (const Quadrature<1> &base_quadrature,
   Assert (std::fabs(sum_of_weights-1) < 1e-13,
           ExcInternalError());
 #endif
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 

diff --git a/source/base/quadrature_lib.cc b/source/base/quadrature_lib.cc
index 8e198267221cd355ad14db2a794a61668b2a38b6..23fc5b2ba67397e6f543e0d4ae8879fac955adbe 100644 (file)
--- a/source/base/quadrature_lib.cc
+++ b/source/base/quadrature_lib.cc
@@ -159,7 +159,6 @@ QGauss<1>::QGauss (const unsigned int n)
       this->weights[i-1] = w;
       this->weights[n-i] = w;
     }
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -180,7 +179,6 @@ QGaussLobatto<1>::QGaussLobatto (const unsigned int n)
       this->quadrature_points[i] = Point<1>(0.5 + 0.5*static_cast<double>(points[i]));
       this->weights[i]           = 0.5*w[i];
     }
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -338,7 +336,6 @@ QMidpoint<1>::QMidpoint ()
 {
   this->quadrature_points[0] = Point<1>(0.5);
   this->weights[0] = 1.0;
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -356,7 +353,6 @@ QTrapez<1>::QTrapez ()
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
     };
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -374,7 +370,6 @@ QSimpson<1>::QSimpson ()
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
     };
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -392,7 +387,6 @@ QMilne<1>::QMilne ()
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
     };
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -412,7 +406,6 @@ QWeddle<1>::QWeddle ()
       this->quadrature_points[i] = Point<1>(xpts[i]);
       this->weights[i] = wts[i];
     };
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -433,7 +426,6 @@ QGaussLog<1>::QGaussLog(const unsigned int n,
       this->quadrature_points[i] = revert ? Point<1>(1-p[n-1-i]) : Point<1>(p[i]);
       this->weights[i]           = revert ? w[n-1-i] : w[i];
     }
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 template <>
@@ -770,7 +762,6 @@ QGaussLogR<1>::QGaussLogR(const unsigned int n,
                            "factor out the singularity, which is zero at one point."));
         this->weights[i] /= denominator;
       }
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -948,6 +939,10 @@ QSorted<dim>::QSorted(const Quadrature<dim> &quad) :
                       std::placeholders::_1,
                       std::placeholders::_2));
 
+  this->quadrature_points = quad.get_points();
+  Assert (quad.size() == quad.get_points().size(), ExcInternalError());
+  Assert (quad.size() == quad.get_weights().size(), ExcInternalError());
+  Assert (this->quadrature_points.size()==quad.size(), ExcInternalError());
   for (unsigned int i=0; i<quad.size(); ++i)
     {
       this->weights[i]           = quad.weight(permutation[i]);
@@ -1129,7 +1124,6 @@ QTelles<1>::QTelles (
       weights[q] = J * weights[q];
 
     }
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -1184,7 +1178,6 @@ QGaussChebyshev<1>::QGaussChebyshev(const unsigned int n)
       this->quadrature_points[i] = Point<1>(p[i]);
       this->weights[i]           = w[i];
     }
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -1274,7 +1267,6 @@ QGaussRadauChebyshev<1>::QGaussRadauChebyshev(const unsigned int n,
       this->quadrature_points[i] = Point<1>(p[i]);
       this->weights[i]           = w[i];
     }
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 
@@ -1339,7 +1331,6 @@ QGaussLobattoChebyshev<1>::QGaussLobattoChebyshev(const unsigned int n)
       this->quadrature_points[i] = Point<1>(p[i]);
       this->weights[i]           = w[i];
     }
-  this->tensor_basis = std::vector<Quadrature<1> >(1, *this);
 }
 
 

diff --git a/tests/base/quadrature_is_tensor_product.cc b/tests/base/quadrature_is_tensor_product.cc
index d551d15f6f2bf9079fd5db2266afae80d1f26119..0f076b59f8bab16854d2190b64bcdff32205864d 100644 (file)
--- a/tests/base/quadrature_is_tensor_product.cc
+++ b/tests/base/quadrature_is_tensor_product.cc
@@ -28,7 +28,7 @@ template <int dim>
 void
 print_is_tensor_product()
 {
-  Quadrature<dim> q_0;
+  Quadrature<dim> q_0 (1);
   deallog << "Quadrature<" << dim << ">: "
           << q_0.is_tensor_product() << std::endl;
 
@@ -76,7 +76,7 @@ print_is_tensor_product()
   deallog << "QGaussLobattoChebyshev<" << dim << ">: "
           << q_11.is_tensor_product() << std::endl;
 
-  QSorted<dim> q_16(q_0);
+  QSorted<dim> q_16(QGauss<dim>(2));
   deallog << "QSorted<" << dim << ">: "
           << q_16.is_tensor_product() << std::endl;
 
@@ -90,7 +90,7 @@ int main()
   initlog();
   deallog << std::boolalpha;
 
-  Quadrature<1> q;
+  QGauss<1> q(1);
 
   print_is_tensor_product<1>();
   QAnisotropic<1> q_1(q);
@@ -103,7 +103,7 @@ int main()
   print_is_tensor_product<2>();
   QAnisotropic<2> q_2(q, q);
   deallog << "QAnisotropic<2>: " << q_2.is_tensor_product() << std::endl;
-  QGaussOneOverR<2> q_15(1, Point<2>());
+  QGaussOneOverR<2> q_15(2, Point<2>());
   deallog << "QGaussOneOverR<2>: " << q_15.is_tensor_product() << std::endl;
 
   print_is_tensor_product<3>();