ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-27 18:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Regression of 'make test'

Browse Source
This commit is contained in:
eap 2016-11-10 15:02:48 +03:00
parent 6b1de62331
commit 773b227239
1 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/SMESHDS/SMESHDS_SubMesh.cxx
View File

@ -257,38 +257,44 @@ int SMESHDS_SubMesh::NbNodes() const
} }
/*! /*!
* template class used for iteration on submesh elements. Interface of iterator remains * Template class used for iteration on vector of elements which can resize
* unchanged after redesign of SMDS to avoid modification everywhere in SMESH. * during iteration. The iterator returns only elements present upon its creation.
* instances are stored in shared_ptr for automatic destruction.
* Container is copied for iteration, because original can be modified
* by addition of elements, for instance, and then reallocated (vector)
*/ */
template <class ELEM, typename TSET> class MySetIterator : public SMDS_Iterator<ELEM> template <class ELEM, typename TSET> class MySetIterator : public SMDS_Iterator<ELEM>
{ {
protected: protected:
typename TSET::const_iterator _it, _end; int _iCur, _iEnd, _iDelta;
TSET _table; const TSET& _table;
public: public:
MySetIterator(const TSET& table) MySetIterator(const TSET& table, bool reverse): _table( table )
{ {
_table = table; if ( reverse )
_it = _table.begin(); {
_end = _table.end(); _iCur = _table.size()-1;
while ((_it != _end) && (*_it == 0)) _iEnd = -1;
_it++; _iDelta = -1;
}
else
{
_iCur = 0;
_iEnd = _table.size();
_iDelta = 1;
}
if ( more() && !_table[ _iCur ])
next();
} }
virtual bool more() virtual bool more()
{ {
while ((_it != _end) && (*_it == 0)) return ( _iEnd - _iCur ) * _iDelta > 0;
_it++;
return (_it != _end);
} }
virtual ELEM next() virtual ELEM next()
{ {
ELEM e = *_it; ELEM e = more() ? _table[ _iCur ] : 0;
_it++; _iCur += _iDelta;
while ( more() && !_table[ _iCur ])
_iCur += _iDelta;
return e; return e;
} }
}; };
@ -366,18 +372,8 @@ SMDS_ElemIteratorPtr SMESHDS_SubMesh::GetElements( bool reverse ) const
if ( IsComplexSubmesh() ) if ( IsComplexSubmesh() )
return SMDS_ElemIteratorPtr( new MyElemIterator( mySubMeshes )); return SMDS_ElemIteratorPtr( new MyElemIterator( mySubMeshes ));
if ( reverse ) typedef MySetIterator< const SMDS_MeshElement*, std::vector<const SMDS_MeshElement*> > TIter;
{ return SMDS_ElemIteratorPtr( new TIter( myElements, reverse ));
typedef
SMDS_SetIterator< const SMDS_MeshElement*,
std::vector< const SMDS_MeshElement* >::const_reverse_iterator > RIter;
return SMDS_ElemIteratorPtr( new RIter( myElements.rbegin(), myElements.rend() ));
}
typedef
SMDS_SetIterator< const SMDS_MeshElement*,
std::vector< const SMDS_MeshElement* >::const_iterator > FIter;
return SMDS_ElemIteratorPtr( new FIter( myElements.begin(), myElements.end() ));
} }
//======================================================================= //=======================================================================
@ -390,18 +386,8 @@ SMDS_NodeIteratorPtr SMESHDS_SubMesh::GetNodes( bool reverse ) const
if ( IsComplexSubmesh() ) if ( IsComplexSubmesh() )
return SMDS_NodeIteratorPtr( new MyNodeIterator( mySubMeshes )); return SMDS_NodeIteratorPtr( new MyNodeIterator( mySubMeshes ));
if ( reverse ) typedef MySetIterator< const SMDS_MeshNode*, std::vector<const SMDS_MeshNode*> > TIter;
{ return SMDS_NodeIteratorPtr( new TIter( myNodes, reverse ));
typedef
SMDS_SetIterator< const SMDS_MeshNode*,
std::vector< const SMDS_MeshNode* >::const_reverse_iterator > RIter;
return SMDS_NodeIteratorPtr( new RIter( myNodes.rbegin(), myNodes.rend() ));
}
typedef
SMDS_SetIterator< const SMDS_MeshNode*,
std::vector< const SMDS_MeshNode* >::const_iterator > FIter;
return SMDS_NodeIteratorPtr( new FIter( myNodes.begin(), myNodes.end() ));
} }
//======================================================================= //=======================================================================