From 495ff5489c59393fe906336dc338a29fa758137f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kl=C3=B6fkorn?= <robertk@dune-project.org>
Date: Thu, 16 Feb 2006 16:43:00 +0000
Subject: [PATCH] removed operator ++(int) calls. also check GridInterface when
grid is interpreted as GridDefaultImplementation.
[[Imported from SVN: r4104]]
---
grid/test/gridcheck.cc | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/grid/test/gridcheck.cc b/grid/test/gridcheck.cc
index 6c367da7a..a0abec096 100644
--- a/grid/test/gridcheck.cc
+++ b/grid/test/gridcheck.cc
@@ -509,7 +509,7 @@ struct GridInterface
g.levelIndexSet(0).geomTypes(codim);
// Instantiate all methods of LeafIndexSet
- g.leafIndexSet().index(*g.template lbegin<0>(0));
+ g.leafIndexSet().index(*g.template leafbegin<0>());
/** \todo Test for subindex is missing, because I don't know yet
how to test for the existence of certain codims */
g.leafIndexSet().size(0, Dune::NewGeometryType(Dune::NewGeometryType::simplex,Grid::dimension));
@@ -778,10 +778,12 @@ void iterate(Grid &g)
for (; it != endit; ++it)
{
LevelIterator l1 = it;
- LevelIterator l2 = l1++;
+ //LevelIterator l2 = l1++;
+ LevelIterator l2 = l1; ++l1;
assert(l2 == it);
assert(l1 != it);
- l2++;
+ //l2++;
+ ++l2;
assert(l1 == l2);
result = it->geometry().local(it->geometry().global(origin));
typename Grid::ctype error = (result-origin).two_norm();
@@ -815,10 +817,12 @@ void iterate(Grid &g)
for (; lit != lend; ++lit)
{
LeafIterator l1 = lit;
- LeafIterator l2 = l1++;
+ //LeafIterator l2 = l1++;
+ LeafIterator l2 = l1; ++l1;
assert(l2 == lit);
assert(l1 != lit);
- l2++;
+ //l2++;
+ ++l2;
assert(l1 == l2);
result = lit->geometry().local(lit->geometry().global(origin));
@@ -892,6 +896,17 @@ void gridcheck (Grid &g)
*/
GridInterface<Grid>();
+ enum { dim = Grid :: dimension };
+ enum { dimworld = Grid :: dimensionworld };
+ typedef typename Grid :: ctype ctype;
+ typedef typename Grid :: GridFamily GridFamily;
+
+ // type of GridInterface == GridDefaultImplementation
+ typedef Dune::GridDefaultImplementation<dim,dimworld,ctype,GridFamily> GridIF;
+ GridIF & gridIF = g;
+ // check functionality when grid is interpreted as reference to interface
+ GridInterface<GridIF>::check(gridIF);
+
/*
* now the runtime-tests
*/
--
GitLab