From: ana Date: Thu, 15 Apr 2010 16:11:55 +0000 (+0000) Subject: Use the prefix std:: instead of the directive using namespace std; X-Git-Tag: V5_1_main_FINAL~128 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d52ff0c8e3a1e4b6b9977d94b38b103c3af24249;p=tools%2Fmedcoupling.git Use the prefix std:: instead of the directive using namespace std; --- diff --git a/src/INTERP_KERNEL/BoundingBox.cxx b/src/INTERP_KERNEL/BoundingBox.cxx index 06e18cd98..ea42bb2d0 100644 --- a/src/INTERP_KERNEL/BoundingBox.cxx +++ b/src/INTERP_KERNEL/BoundingBox.cxx @@ -37,7 +37,6 @@ namespace INTERP_KERNEL BoundingBox::BoundingBox(const double** pts, const unsigned numPts) :_coords(new double[6]) { - using namespace std; assert(numPts > 1); // initialize with first two points @@ -46,8 +45,8 @@ namespace INTERP_KERNEL for(BoxCoord c = XMIN ; c <= ZMIN ; c = BoxCoord(c + 1)) { - _coords[c] = min(pt1[c], pt2[c]); - _coords[c + 3] = max(pt1[c], pt2[c]); + _coords[c] = std::min(pt1[c], pt2[c]); + _coords[c + 3] = std::max(pt1[c], pt2[c]); } for(unsigned i = 2 ; i < numPts ; ++i) @@ -67,13 +66,12 @@ namespace INTERP_KERNEL BoundingBox::BoundingBox(const BoundingBox& box1, const BoundingBox& box2) : _coords(new double[6]) { - using namespace std; assert(_coords != 0); for(BoxCoord c = XMIN ; c <= ZMIN ; c = BoxCoord(c + 1)) { - _coords[c] = min(box1._coords[c], box2._coords[c]); - _coords[c + 3] = max(box1._coords[c + 3], box2._coords[c + 3]); + _coords[c] = std::min(box1._coords[c], box2._coords[c]); + _coords[c + 3] = std::max(box1._coords[c + 3], box2._coords[c + 3]); } assert(isValid()); @@ -131,15 +129,13 @@ namespace INTERP_KERNEL */ void BoundingBox::updateWithPoint(const double* pt) { - using namespace std; - for(BoxCoord c = XMIN ; c <= ZMIN ; c = BoxCoord(c + 1)) { const double ptVal = pt[c]; // update min and max coordinates - _coords[c] = min(_coords[c], ptVal); - _coords[c + 3] = max(_coords[c + 3], ptVal); + _coords[c] = std::min(_coords[c], ptVal); + _coords[c + 3] = std::max(_coords[c + 3], ptVal); } } diff --git a/src/INTERP_KERNEL/CellModel.cxx b/src/INTERP_KERNEL/CellModel.cxx index 61adf534d..30d307bca 100644 --- a/src/INTERP_KERNEL/CellModel.cxx +++ b/src/INTERP_KERNEL/CellModel.cxx @@ -24,8 +24,6 @@ #include #include -using namespace std; - namespace INTERP_KERNEL { std::map CellModel::_map_of_unique_instance; @@ -34,10 +32,10 @@ namespace INTERP_KERNEL { if(_map_of_unique_instance.empty()) buildUniqueInstance(); - const map::iterator iter=_map_of_unique_instance.find(type); + const std::map::iterator iter=_map_of_unique_instance.find(type); if(iter==_map_of_unique_instance.end()) { - ostringstream stream; stream << "no cellmodel for normalized type " << type; + std::ostringstream stream; stream << "no cellmodel for normalized type " << type; throw Exception(stream.str().c_str()); } return (*iter).second; @@ -64,23 +62,23 @@ namespace INTERP_KERNEL void CellModel::buildUniqueInstance() { - _map_of_unique_instance.insert(make_pair(NORM_POINT0,CellModel(NORM_POINT0))); - _map_of_unique_instance.insert(make_pair(NORM_SEG2,CellModel(NORM_SEG2))); - _map_of_unique_instance.insert(make_pair(NORM_SEG3,CellModel(NORM_SEG3))); - _map_of_unique_instance.insert(make_pair(NORM_TRI3,CellModel(NORM_TRI3))); - _map_of_unique_instance.insert(make_pair(NORM_QUAD4,CellModel(NORM_QUAD4))); - _map_of_unique_instance.insert(make_pair(NORM_TRI6,CellModel(NORM_TRI6))); - _map_of_unique_instance.insert(make_pair(NORM_QUAD8,CellModel(NORM_QUAD8))); - _map_of_unique_instance.insert(make_pair(NORM_TETRA4,CellModel(NORM_TETRA4))); - _map_of_unique_instance.insert(make_pair(NORM_HEXA8,CellModel(NORM_HEXA8))); - _map_of_unique_instance.insert(make_pair(NORM_PYRA5,CellModel(NORM_PYRA5))); - _map_of_unique_instance.insert(make_pair(NORM_PENTA6,CellModel(NORM_PENTA6))); - _map_of_unique_instance.insert(make_pair(NORM_TETRA10,CellModel(NORM_TETRA10))); - _map_of_unique_instance.insert(make_pair(NORM_PYRA13,CellModel(NORM_PYRA13))); - _map_of_unique_instance.insert(make_pair(NORM_PENTA15,CellModel(NORM_PENTA15))); - _map_of_unique_instance.insert(make_pair(NORM_HEXA20,CellModel(NORM_HEXA20))); - _map_of_unique_instance.insert(make_pair(NORM_POLYGON,CellModel(NORM_POLYGON))); - _map_of_unique_instance.insert(make_pair(NORM_POLYHED,CellModel(NORM_POLYHED))); + _map_of_unique_instance.insert(std::make_pair(NORM_POINT0,CellModel(NORM_POINT0))); + _map_of_unique_instance.insert(std::make_pair(NORM_SEG2,CellModel(NORM_SEG2))); + _map_of_unique_instance.insert(std::make_pair(NORM_SEG3,CellModel(NORM_SEG3))); + _map_of_unique_instance.insert(std::make_pair(NORM_TRI3,CellModel(NORM_TRI3))); + _map_of_unique_instance.insert(std::make_pair(NORM_QUAD4,CellModel(NORM_QUAD4))); + _map_of_unique_instance.insert(std::make_pair(NORM_TRI6,CellModel(NORM_TRI6))); + _map_of_unique_instance.insert(std::make_pair(NORM_QUAD8,CellModel(NORM_QUAD8))); + _map_of_unique_instance.insert(std::make_pair(NORM_TETRA4,CellModel(NORM_TETRA4))); + _map_of_unique_instance.insert(std::make_pair(NORM_HEXA8,CellModel(NORM_HEXA8))); + _map_of_unique_instance.insert(std::make_pair(NORM_PYRA5,CellModel(NORM_PYRA5))); + _map_of_unique_instance.insert(std::make_pair(NORM_PENTA6,CellModel(NORM_PENTA6))); + _map_of_unique_instance.insert(std::make_pair(NORM_TETRA10,CellModel(NORM_TETRA10))); + _map_of_unique_instance.insert(std::make_pair(NORM_PYRA13,CellModel(NORM_PYRA13))); + _map_of_unique_instance.insert(std::make_pair(NORM_PENTA15,CellModel(NORM_PENTA15))); + _map_of_unique_instance.insert(std::make_pair(NORM_HEXA20,CellModel(NORM_HEXA20))); + _map_of_unique_instance.insert(std::make_pair(NORM_POLYGON,CellModel(NORM_POLYGON))); + _map_of_unique_instance.insert(std::make_pair(NORM_POLYHED,CellModel(NORM_POLYHED))); } CellModel::CellModel(NormalizedCellType type):_type(type) diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.cxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.cxx index d22347451..b8740ddf5 100644 --- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.cxx +++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DComposedEdge.cxx @@ -26,12 +26,11 @@ #include #include -using namespace std; using namespace INTERP_KERNEL; ComposedEdge::ComposedEdge(const ComposedEdge& other) { - for(list::const_iterator iter=other._sub_edges.begin();iter!=other._sub_edges.end();iter++) + for(std::list::const_iterator iter=other._sub_edges.begin();iter!=other._sub_edges.end();iter++) _sub_edges.push_back((*iter)->clone()); } @@ -42,7 +41,7 @@ ComposedEdge::~ComposedEdge() void ComposedEdge::setValueAt(int i, Edge *e, bool direction) { - list::iterator it=_sub_edges.begin(); + std::list::iterator it=_sub_edges.begin(); for(int j=0;j::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) { if(find_if(other._sub_edges.begin(),other._sub_edges.end(),AbsEdgeCmp(*iter))!=other._sub_edges.end()) { @@ -89,13 +88,13 @@ void ComposedEdge::pushBack(ElementaryEdge *elem) void ComposedEdge::pushBack(ComposedEdge *elem) { - list *elemsOfElem=elem->getListBehind(); + std::list *elemsOfElem=elem->getListBehind(); _sub_edges.insert(_sub_edges.end(),elemsOfElem->begin(),elemsOfElem->end()); } ElementaryEdge *ComposedEdge::operator[](int i) const { - list::const_iterator iter=_sub_edges.begin(); + std::list::const_iterator iter=_sub_edges.begin(); for(int ii=0;ii::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) (*iter)->reverse(); } void ComposedEdge::initLocations() const { - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) (*iter)->initLocations(); } @@ -122,7 +121,7 @@ ComposedEdge *ComposedEdge::clone() const bool ComposedEdge::isNodeIn(Node *n) const { bool ret=false; - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end() && !ret;iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end() && !ret;iter++) ret=(*iter)->isNodeIn(n); return ret; } @@ -145,7 +144,7 @@ bool ComposedEdge::isNodeIn(Node *n) const double ComposedEdge::getArea() const { double ret=0.; - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) ret+=(*iter)->getAreaOfZone(); return ret; } @@ -153,7 +152,7 @@ double ComposedEdge::getArea() const double ComposedEdge::getPerimeter() const { double ret=0.; - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) ret+=(*iter)->getCurveLength(); return ret; } @@ -187,7 +186,7 @@ void ComposedEdge::getBarycenter(double *bary) const bary[0]=0.; bary[1]=0.; double area=0.; - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) { (*iter)->getBarycenterOfZone(bary); area+=(*iter)->getAreaOfZone(); @@ -225,7 +224,7 @@ double ComposedEdge::normalize(ComposedEdge *other, double& xBary, double& yBary void ComposedEdge::dumpInXfigFile(std::ostream& stream, int resolution, const Bounds& box) const { stream.precision(10); - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) (*iter)->dumpInXfigFile(stream,resolution,box); } @@ -251,7 +250,7 @@ bool ComposedEdge::changeStartNodeWith(Node *node) const void ComposedEdge::fillBounds(Bounds& output) const { - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) (*iter)->fillBounds(output); } @@ -260,7 +259,7 @@ void ComposedEdge::fillBounds(Bounds& output) const */ void ComposedEdge::applySimilarity(double xBary, double yBary, double dimChar) { - for(list::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) (*iter)->applySimilarity(xBary,yBary,dimChar); } @@ -269,11 +268,11 @@ void ComposedEdge::applySimilarity(double xBary, double yBary, double dimChar) */ void ComposedEdge::applyGlobalSimilarity(double xBary, double yBary, double dimChar) { - set allNodes; + std::set allNodes; getAllNodes(allNodes); - for(set::iterator iter=allNodes.begin();iter!=allNodes.end();iter++) + for(std::set::iterator iter=allNodes.begin();iter!=allNodes.end();iter++) (*iter)->applySimilarity(xBary,yBary,dimChar); - for(list::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) (*iter)->applySimilarity(xBary,yBary,dimChar); } @@ -283,7 +282,7 @@ void ComposedEdge::applyGlobalSimilarity(double xBary, double yBary, double dimC */ void ComposedEdge::dispatchPerimeter(double& partConsidered) const { - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) { TypeOfEdgeLocInPolygon loc=(*iter)->getLoc(); if(loc==FULL_IN_1 || loc==FULL_ON_1) @@ -296,7 +295,7 @@ void ComposedEdge::dispatchPerimeter(double& partConsidered) const */ void ComposedEdge::dispatchPerimeterExcl(double& partConsidered, double& commonPart) const { - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) { TypeOfEdgeLocInPolygon loc=(*iter)->getLoc(); if(loc==FULL_IN_1) @@ -308,7 +307,7 @@ void ComposedEdge::dispatchPerimeterExcl(double& partConsidered, double& commonP void ComposedEdge::getAllNodes(std::set& output) const { - list::const_iterator iter=_sub_edges.begin(); + std::list::const_iterator iter=_sub_edges.begin(); for(;iter!=_sub_edges.end();iter++) (*iter)->getAllNodes(output); } @@ -317,7 +316,7 @@ void ComposedEdge::getBarycenter(double *bary, double& weigh) const { weigh=0.; bary[0]=0.; bary[1]=0.; double tmp1,tmp2[2]; - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) { (*iter)->getBarycenter(tmp2,tmp1); weigh+=tmp1; @@ -335,32 +334,32 @@ bool ComposedEdge::isInOrOut(Node *nodeToTest) const if(b.nearlyWhere((*nodeToTest)[0],(*nodeToTest)[1])==OUT) return false; // searching for e1 - set nodes; + std::set nodes; getAllNodes(nodes); - set radialDistributionOfNodes; - set::const_iterator iter; + std::set radialDistributionOfNodes; + std::set::const_iterator iter; for(iter=nodes.begin();iter!=nodes.end();iter++) radialDistributionOfNodes.insert(nodeToTest->getSlope(*(*iter))); - vector radialDistrib(radialDistributionOfNodes.begin(),radialDistributionOfNodes.end()); + std::vector radialDistrib(radialDistributionOfNodes.begin(),radialDistributionOfNodes.end()); radialDistributionOfNodes.clear(); - vector radialDistrib2(radialDistrib.size()); + std::vector radialDistrib2(radialDistrib.size()); copy(radialDistrib.begin()+1,radialDistrib.end(),radialDistrib2.begin()); radialDistrib2.back()=M_PI+radialDistrib.front(); - vector radialDistrib3(radialDistrib.size()); - transform(radialDistrib2.begin(),radialDistrib2.end(),radialDistrib.begin(),radialDistrib3.begin(),minus()); - vector::iterator iter3=max_element(radialDistrib3.begin(),radialDistrib3.end()); + std::vector radialDistrib3(radialDistrib.size()); + std::transform(radialDistrib2.begin(),radialDistrib2.end(),radialDistrib.begin(),radialDistrib3.begin(),std::minus()); + std::vector::iterator iter3=max_element(radialDistrib3.begin(),radialDistrib3.end()); int i=iter3-radialDistrib3.begin(); // ok for e1 - Let's go. EdgeInfLin *e1=new EdgeInfLin(nodeToTest,radialDistrib[i]+radialDistrib3[i]/2.); double ref=e1->getCharactValue(*nodeToTest); - set< IntersectElement > inOutSwitch; - for(list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) + std::set< IntersectElement > inOutSwitch; + for(std::list::const_iterator iter=_sub_edges.begin();iter!=_sub_edges.end();iter++) { ElementaryEdge *val=(*iter); if(val) { Edge *e=val->getPtr(); - auto_ptr intersc(Edge::buildIntersectorWith(e1,e)); + std::auto_ptr intersc(Edge::buildIntersectorWith(e1,e)); bool obviousNoIntersection,areOverlapped; intersc->areOverlappedOrOnlyColinears(0,obviousNoIntersection,areOverlapped); if(obviousNoIntersection) @@ -369,8 +368,8 @@ bool ComposedEdge::isInOrOut(Node *nodeToTest) const } if(!areOverlapped) { - list< IntersectElement > listOfIntesc=intersc->getIntersectionsCharacteristicVal(); - for(list< IntersectElement >::iterator iter2=listOfIntesc.begin();iter2!=listOfIntesc.end();iter2++) + std::list< IntersectElement > listOfIntesc=intersc->getIntersectionsCharacteristicVal(); + for(std::list< IntersectElement >::iterator iter2=listOfIntesc.begin();iter2!=listOfIntesc.end();iter2++) if((*iter2).isIncludedByBoth()) inOutSwitch.insert(*iter2); } @@ -381,7 +380,7 @@ bool ComposedEdge::isInOrOut(Node *nodeToTest) const } e1->decrRef(); bool ret=false; - for(set< IntersectElement >::iterator iter=inOutSwitch.begin();iter!=inOutSwitch.end();iter++) + for(std::set< IntersectElement >::iterator iter=inOutSwitch.begin();iter!=inOutSwitch.end();iter++) { if((*iter).getVal1()intresincEqCoarse(other); } -void ComposedEdge::clearAll(list::iterator startToDel) +void ComposedEdge::clearAll(std::list::iterator startToDel) { - for(list::iterator iter=startToDel;iter!=_sub_edges.end();iter++) + for(std::list::iterator iter=startToDel;iter!=_sub_edges.end();iter++) delete (*iter); } diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx index b0952fccf..4ac4d53e7 100644 --- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx +++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdge.cxx @@ -25,7 +25,6 @@ #include -using namespace std; using namespace INTERP_KERNEL; MergePoints::MergePoints():_ass1Start1(0),_ass1End1(0),_ass1Start2(0),_ass1End2(0), @@ -303,8 +302,8 @@ bool IntersectElement::isIncludedByBoth() const bool EdgeIntersector::intersect(const Bounds *whereToFind, std::vector& newNodes, bool& order, MergePoints& commonNode) { - list< IntersectElement > listOfIntesc=getIntersectionsCharacteristicVal(); - list< IntersectElement >::iterator iter; + std::list< IntersectElement > listOfIntesc=getIntersectionsCharacteristicVal(); + std::list< IntersectElement >::iterator iter; for(iter=listOfIntesc.begin();iter!=listOfIntesc.end();) { if((*iter).isOnMergedExtremity()) @@ -342,10 +341,10 @@ bool EdgeIntersector::intersect(const Bounds *whereToFind, std::vector& } else { - vector vecOfIntesc(listOfIntesc.begin(),listOfIntesc.end()); + std::vector vecOfIntesc(listOfIntesc.begin(),listOfIntesc.end()); listOfIntesc.clear(); sort(vecOfIntesc.begin(),vecOfIntesc.end()); - for(vector::iterator iterV=vecOfIntesc.begin();iterV!=vecOfIntesc.end();iterV++) + for(std::vector::iterator iterV=vecOfIntesc.begin();iterV!=vecOfIntesc.end();iterV++) newNodes.push_back((*iterV).getNodeAndReleaseIt()); order=vecOfIntesc.front().isLowerOnOther(vecOfIntesc.back()); } @@ -532,10 +531,10 @@ void Edge::addSubEdgeInVector(Node *start, Node *end, ComposedEdge& vec) const */ void Edge::getNormalVector(double *vectOutput) const { - copy((const double *)(*_end),(const double *)(*_end)+2,vectOutput); - transform(vectOutput,vectOutput+2,(const double *)(*_start),vectOutput,minus()); + std::copy((const double *)(*_end),(const double *)(*_end)+2,vectOutput); + std::transform(vectOutput,vectOutput+2,(const double *)(*_start),vectOutput,std::minus()); double norm=1./Node::norm(vectOutput); - transform(vectOutput,vectOutput+2,vectOutput,bind2nd(multiplies(),norm)); + std::transform(vectOutput,vectOutput+2,vectOutput,bind2nd(std::multiplies(),norm)); double tmp=vectOutput[0]; vectOutput[0]=vectOutput[1]; vectOutput[1]=-tmp; @@ -607,7 +606,7 @@ void Edge::interpolate1DLin(const std::vector& distrib1, const std::vect MergePoints commonNode; for(int i=0;i::const_iterator iter=find_if(distrib2.begin()+1,distrib2.end(),bind2nd(greater_equal(),distrib1[i])); + std::vector::const_iterator iter=find_if(distrib2.begin()+1,distrib2.end(),bind2nd(std::greater_equal(),distrib1[i])); if(iter!=distrib2.end()) { for(int j=(iter-1)-distrib2.begin();j newNodes; + std::vector newNodes; bool order; if(intersector->intersect(whereToFind,newNodes,order,commonNode)) { if(newNodes.empty()) throw Exception("Internal error occured - error in intersector implementation!");// This case should never happen - vector::iterator iter=newNodes.begin(); - vector::reverse_iterator iterR=newNodes.rbegin(); + std::vector::iterator iter=newNodes.begin(); + std::vector::reverse_iterator iterR=newNodes.rbegin(); f1->addSubEdgeInVector(f1->getStartNode(),*iter,outValForF1); f2->addSubEdgeInVector(f2->getStartNode(),order?*iter:*iterR,outValForF2); - for(vector::iterator iter=newNodes.begin();iter!=newNodes.end();iter++,iterR++) + for(std::vector::iterator iter=newNodes.begin();iter!=newNodes.end();iter++,iterR++) { if((iter+1)==newNodes.end()) { diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.cxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.cxx index 29830f4e1..5b75b6849 100644 --- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.cxx +++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeArcCircle.cxx @@ -24,7 +24,6 @@ #include #include -using namespace std; using namespace INTERP_KERNEL; ArcCArcCIntersector::ArcCArcCIntersector(const EdgeArcCircle& e1, const EdgeArcCircle& e2):SameTypeEdgeIntersector(e1,e2),_dist(0.) @@ -153,7 +152,7 @@ bool ArcCArcCIntersector::areArcsOverlapped(const EdgeArcCircle& a1, const EdgeA a=EdgeArcCircle::normalizeAngle(phi-angle0L+M_PI); if(EdgeArcCircle::isIn2Pi(angle0L,angleL,a)) cmpContainer[sizeOfCmpContainer++]=cst-cst2; - a=*max_element(cmpContainer,cmpContainer+sizeOfCmpContainer); + a=*std::max_element(cmpContainer,cmpContainer+sizeOfCmpContainer); return Node::areDoubleEqualsWP(a,1.,2.); } @@ -507,7 +506,7 @@ void EdgeArcCircle::dumpInXfigFile(std::ostream& stream, bool direction, int res middle->dumpInXfigFile(stream,resolution,box); middle->decrRef(); direction?_end->dumpInXfigFile(stream,resolution,box):_start->dumpInXfigFile(stream,resolution,box); - stream << endl; + stream << std::endl; } void EdgeArcCircle::update(Node *m) diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx index 49be5bc87..1cb23d5c0 100644 --- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx +++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DEdgeLin.cxx @@ -20,7 +20,6 @@ #include "InterpKernelGeo2DNode.hxx" #include "InterpKernelException.hxx" -using namespace std; using namespace INTERP_KERNEL; namespace INTERP_KERNEL @@ -209,10 +208,10 @@ void EdgeLin::dumpInXfigFile(std::ostream& stream, bool direction, int resolutio { stream << "2 1 0 1 "; fillXfigStreamForLoc(stream); - stream << " 7 50 -1 -1 0.000 0 0 -1 0 0 2" << endl; + stream << " 7 50 -1 -1 0.000 0 0 -1 0 0 2" << std::endl; direction?_start->dumpInXfigFile(stream,resolution,box):_end->dumpInXfigFile(stream,resolution,box); direction?_end->dumpInXfigFile(stream,resolution,box):_start->dumpInXfigFile(stream,resolution,box); - stream << endl; + stream << std::endl; } void EdgeLin::update(Node *m) diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.cxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.cxx index d8d82ae71..94628b217 100644 --- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.cxx +++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.cxx @@ -19,7 +19,6 @@ #include "InterpKernelGeo2DNode.hxx" #include "InterpKernelGeo2DEdgeArcCircle.hxx" -using namespace std; using namespace INTERP_KERNEL; Node::Node(double x, double y):_cnt(1),_loc(UNKNOWN) diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.cxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.cxx index f694e5483..8ca5c5cf4 100644 --- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.cxx +++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DQuadraticPolygon.cxx @@ -29,7 +29,6 @@ #include #include -using namespace std; using namespace INTERP_KERNEL; namespace INTERP_KERNEL @@ -40,8 +39,8 @@ namespace INTERP_KERNEL QuadraticPolygon::QuadraticPolygon(const char *file) { char currentLine[MAX_SIZE_OF_LINE_XFIG_FILE]; - ifstream stream(file); - stream.exceptions(ios_base::eofbit); + std::ifstream stream(file); + stream.exceptions(std::ios_base::eofbit); try { do @@ -56,7 +55,7 @@ QuadraticPolygon::QuadraticPolygon(const char *file) } while(1); } - catch(ifstream::failure&) + catch(std::ifstream::failure&) { } front()->changeStartNodeWith(back()->getEndNode()); @@ -101,16 +100,16 @@ QuadraticPolygon *QuadraticPolygon::buildArcCirclePolygon(std::vector& n void QuadraticPolygon::buildDbgFile(const std::vector& nodes, const char *fileName) { - ofstream file(fileName); - file << setprecision(16); - file << " double coords[]=" << endl << " { "; - for(vector::const_iterator iter=nodes.begin();iter!=nodes.end();iter++) + std::ofstream file(fileName); + file << std::setprecision(16); + file << " double coords[]=" << std::endl << " { "; + for(std::vector::const_iterator iter=nodes.begin();iter!=nodes.end();iter++) { if(iter!=nodes.begin()) - file << "," << endl << " "; + file << "," << std::endl << " "; file << (*(*iter))[0] << ", " << (*(*iter))[1]; } - file << "};" << endl; + file << "};" << std::endl; } void QuadraticPolygon::closeMe() const @@ -157,7 +156,7 @@ bool QuadraticPolygon::isButterfly() const void QuadraticPolygon::dumpInXfigFileWithOther(const ComposedEdge& other, const char *fileName) const { - ofstream file(fileName); + std::ofstream file(fileName); const int resolution=1200; Bounds box; box.prepareForAggregation(); @@ -169,7 +168,7 @@ void QuadraticPolygon::dumpInXfigFileWithOther(const ComposedEdge& other, const void QuadraticPolygon::dumpInXfigFile(const char *fileName) const { - ofstream file(fileName); + std::ofstream file(fileName); const int resolution=1200; Bounds box; box.prepareForAggregation(); @@ -179,15 +178,15 @@ void QuadraticPolygon::dumpInXfigFile(const char *fileName) const void QuadraticPolygon::dumpInXfigFile(std::ostream& stream, int resolution, const Bounds& box) const { - stream << "#FIG 3.2 Produced by xfig version 3.2.5-alpha5" << endl; - stream << "Landscape" << endl; - stream << "Center" << endl; - stream << "Metric" << endl; - stream << "Letter" << endl; - stream << "100.00" << endl; - stream << "Single" << endl; - stream << "-2" << endl; - stream << resolution << " 2" << endl; + stream << "#FIG 3.2 Produced by xfig version 3.2.5-alpha5" << std::endl; + stream << "Landscape" << std::endl; + stream << "Center" << std::endl; + stream << "Metric" << std::endl; + stream << "Letter" << std::endl; + stream << "100.00" << std::endl; + stream << "Single" << std::endl; + stream << "-2" << std::endl; + stream << resolution << " 2" << std::endl; ComposedEdge::dumpInXfigFile(stream,resolution,box); } @@ -198,8 +197,8 @@ double QuadraticPolygon::intersectWithAbs(QuadraticPolygon& other) { double ret=0.,xBaryBB,yBaryBB; double fact=normalize(&other,xBaryBB,yBaryBB); - vector polygs=intersectMySelfWith(other); - for(vector::iterator iter=polygs.begin();iter!=polygs.end();iter++) + std::vector polygs=intersectMySelfWith(other); + for(std::vector::iterator iter=polygs.begin();iter!=polygs.end();iter++) { ret+=fabs((*iter)->getArea()); delete *iter; @@ -215,8 +214,8 @@ double QuadraticPolygon::intersectWithAbs(QuadraticPolygon& other, double* baryc double ret=0.,bary[2],area,xBaryBB,yBaryBB; barycenter[0] = barycenter[1] = 0.; double fact=normalize(&other,xBaryBB,yBaryBB); - vector polygs=intersectMySelfWith(other); - for(vector::iterator iter=polygs.begin();iter!=polygs.end();iter++) + std::vector polygs=intersectMySelfWith(other); + for(std::vector::iterator iter=polygs.begin();iter!=polygs.end();iter++) { area=fabs((*iter)->getArea()); (*iter)->getBarycenter(bary); @@ -242,8 +241,8 @@ double QuadraticPolygon::intersectWithAbs(QuadraticPolygon& other, double* baryc double QuadraticPolygon::intersectWith(const QuadraticPolygon& other) const { double ret=0.; - vector polygs=intersectMySelfWith(other); - for(vector::iterator iter=polygs.begin();iter!=polygs.end();iter++) + std::vector polygs=intersectMySelfWith(other); + for(std::vector::iterator iter=polygs.begin();iter!=polygs.end();iter++) { ret+=fabs((*iter)->getArea()); delete *iter; @@ -260,8 +259,8 @@ double QuadraticPolygon::intersectWith(const QuadraticPolygon& other, double* ba { double ret=0., bary[2]; barycenter[0] = barycenter[1] = 0.; - vector polygs=intersectMySelfWith(other); - for(vector::iterator iter=polygs.begin();iter!=polygs.end();iter++) + std::vector polygs=intersectMySelfWith(other); + for(std::vector::iterator iter=polygs.begin();iter!=polygs.end();iter++) { double area = fabs((*iter)->getArea()); (*iter)->getBarycenter(bary); @@ -450,8 +449,8 @@ void QuadraticPolygon::performLocatingOperation(QuadraticPolygon& pol2) const */ std::vector QuadraticPolygon::buildIntersectionPolygons(const QuadraticPolygon& pol1, const QuadraticPolygon& pol2) const { - vector ret; - list pol2Zip=pol2.zipConsecutiveInSegments(); + std::vector ret; + std::list pol2Zip=pol2.zipConsecutiveInSegments(); if(!pol2Zip.empty()) closePolygons(pol2Zip,pol1,ret); else @@ -473,7 +472,7 @@ std::vector QuadraticPolygon::buildIntersectionPolygons(cons */ std::list QuadraticPolygon::zipConsecutiveInSegments() const { - list ret; + std::list ret; IteratorOnComposedEdge it((ComposedEdge *)this); int nbOfTurns=recursiveSize(); int i=0; @@ -514,7 +513,7 @@ void QuadraticPolygon::closePolygons(std::list& pol2Zip, con { bool directionKnownInPol1=false; bool directionInPol1; - for(list::iterator iter=pol2Zip.begin();iter!=pol2Zip.end();) + for(std::list::iterator iter=pol2Zip.begin();iter!=pol2Zip.end();) { if((*iter)->completed()) { @@ -530,8 +529,8 @@ void QuadraticPolygon::closePolygons(std::list& pol2Zip, con else directionKnownInPol1=true; } - list::iterator iter2=iter; iter2++; - list::iterator iter3=(*iter)->fillAsMuchAsPossibleWith(pol1,iter2,pol2Zip.end(),directionInPol1); + std::list::iterator iter2=iter; iter2++; + std::list::iterator iter3=(*iter)->fillAsMuchAsPossibleWith(pol1,iter2,pol2Zip.end(),directionInPol1); if(iter3!=pol2Zip.end()) { (*iter)->pushBack(*iter3); @@ -630,7 +629,7 @@ std::list::iterator QuadraticPolygon::fillAsMuchAsPossibleWi std::list::iterator QuadraticPolygon::checkInList(Node *n, std::list::iterator iStart, std::list::iterator iEnd) { - for(list::iterator iter=iStart;iter!=iEnd;iter++) + for(std::list::iterator iter=iStart;iter!=iEnd;iter++) if((*iter)->isNodeIn(n)) return iter; return iEnd; diff --git a/src/INTERP_KERNEL/TetraAffineTransform.cxx b/src/INTERP_KERNEL/TetraAffineTransform.cxx index d35d022b1..323dcf07d 100644 --- a/src/INTERP_KERNEL/TetraAffineTransform.cxx +++ b/src/INTERP_KERNEL/TetraAffineTransform.cxx @@ -210,17 +210,15 @@ namespace INTERP_KERNEL */ void TetraAffineTransform::dump() const { - using namespace std; - std::cout << "A = " << std::endl << "["; for(int i = 0; i < 3; ++i) { std::cout << _linear_transform[3*i] << ", " << _linear_transform[3*i + 1] << ", " << _linear_transform[3*i + 2]; - if(i != 2 ) std::cout << endl; + if(i != 2 ) std::cout << std::endl; } - std::cout << "]" << endl; + std::cout << "]" << std::endl; - std::cout << "b = " << "[" << _translation[0] << ", " << _translation[1] << ", " << _translation[2] << "]" << endl; + std::cout << "b = " << "[" << _translation[0] << ", " << _translation[1] << ", " << _translation[2] << "]" << std::endl; } ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/INTERP_KERNEL/UnitTetraIntersectionBary.cxx b/src/INTERP_KERNEL/UnitTetraIntersectionBary.cxx index 74b6a7908..3dbcd7f91 100644 --- a/src/INTERP_KERNEL/UnitTetraIntersectionBary.cxx +++ b/src/INTERP_KERNEL/UnitTetraIntersectionBary.cxx @@ -31,7 +31,6 @@ //#define DMP_UNITTETRAINTERSECTIONBARY -using namespace std; namespace INTERP_KERNEL { @@ -103,14 +102,14 @@ namespace INTERP_KERNEL } // check if polygon orientation is same as the one of triangle - vector::const_iterator p = pPolygonA->begin(), pEnd = pPolygonA->end(); + std::vector::const_iterator p = pPolygonA->begin(), pEnd = pPolygonA->end(); #ifdef DMP_UNITTETRAINTERSECTIONBARY - cout.precision(18); - cout << "**** int polygon() " << endl; + std::cout.precision(18); + std::cout << "**** int polygon() " << std::endl; while ( p != pEnd ) { double* pp = *p++; - cout << pEnd - p << ": ( " << pp[0] << ", " << pp[1] << ", " << pp[2] << " )" << endl; + std::cout << pEnd - p << ": ( " << pp[0] << ", " << pp[1] << ", " << pp[2] << " )" << std::endl; } p = pPolygonA->begin(); #endif @@ -121,7 +120,7 @@ namespace INTERP_KERNEL if ( p == pEnd ) { #ifdef DMP_UNITTETRAINTERSECTIONBARY - cout << "All points equal" << endl; + std::cout << "All points equal" << std::endl; #endif clearPolygons(); return; @@ -132,7 +131,7 @@ namespace INTERP_KERNEL if ( p == pEnd ) { #ifdef DMP_UNITTETRAINTERSECTIONBARY - cout << "Only two points differ" << endl; + std::cout << "Only two points differ" << std::endl; #endif clearPolygons(); return ; @@ -142,14 +141,14 @@ namespace INTERP_KERNEL if (_isTetraInversed) reverse = !reverse; // store polygon - _faces.push_back( vector< double* > () ); - vector< double* >& faceCorner = _faces.back(); + _faces.push_back( std::vector< double* > () ); + std::vector< double* >& faceCorner = _faces.back(); faceCorner.resize( pPolygonA->size()/* + 1*/ ); int i = 0; if ( reverse ) { - vector::const_reverse_iterator polyF = pPolygonA->rbegin(), polyEnd; + std::vector::const_reverse_iterator polyF = pPolygonA->rbegin(), polyEnd; for ( polyEnd = pPolygonA->rend(); polyF != polyEnd; ++i, ++polyF ) if ( i==0 || !samePoint( *polyF, faceCorner[i-1] )) copyVector3( *polyF, faceCorner[i] = new double[3] ); @@ -161,7 +160,7 @@ namespace INTERP_KERNEL } else { - vector::const_iterator polyF = pPolygonA->begin(), polyEnd; + std::vector::const_iterator polyF = pPolygonA->begin(), polyEnd; for ( polyEnd = pPolygonA->end(); polyF != polyEnd; ++i, ++polyF ) if ( i==0 || !samePoint( *polyF, faceCorner[i-1] )) copyVector3( *polyF, faceCorner[i] = new double[3] ); @@ -181,17 +180,17 @@ namespace INTERP_KERNEL if ( _polyNormals.empty() ) _polyNormals.reserve(4); - _polyNormals.push_back( vector< double >( polyNormal, polyNormal+3 )); + _polyNormals.push_back( std::vector< double >( polyNormal, polyNormal+3 )); } #ifdef DMP_UNITTETRAINTERSECTIONBARY - cout << "**** addSide() " << _faces.size() << endl; + std::cout << "**** addSide() " << _faces.size() << std::endl; for ( int i = 0; i < faceCorner.size(); ++i ) { double* p = faceCorner[i]; - cout << i << ": ( " << p[0] << ", " << p[1] << ", " << p[2] << " )" << endl; + std::cout << i << ": ( " << p[0] << ", " << p[1] << ", " << p[2] << " )" << std::endl; } - cout << "NORM: ( " << _polyNormals.back()[0] << ", " << _polyNormals.back()[1] << ", " << _polyNormals.back()[2] << " )" << endl; + std::cout << "NORM: ( " << _polyNormals.back()[0] << ", " << _polyNormals.back()[1] << ", " << _polyNormals.back()[2] << " )" << std::endl; #endif clearPolygons(); } @@ -227,17 +226,17 @@ namespace INTERP_KERNEL baryCenter[0] = baryCenter[1] = baryCenter[2] = 0.; - list< vector< double* > >::iterator f = _faces.begin(), fEnd = _faces.end(); + std::list< std::vector< double* > >::iterator f = _faces.begin(), fEnd = _faces.end(); double * P = f->at(0); for ( ++f; f != fEnd; ++f ) { - vector< double* >& polygon = *f; + std::vector< double* >& polygon = *f; if ( polygon.empty() ) continue; bool pBelongsToPoly = false; - vector::iterator v = polygon.begin(), vEnd = polygon.end(); + std::vector::iterator v = polygon.begin(), vEnd = polygon.end(); for ( ; !pBelongsToPoly && v != vEnd; ++v ) pBelongsToPoly = samePoint( P, *v ); if ( pBelongsToPoly ) @@ -281,10 +280,10 @@ namespace INTERP_KERNEL baryCenter[2] /= _int_volume; #ifdef DMP_UNITTETRAINTERSECTIONBARY - cout.precision(5); - cout << "**** Barycenter " << baryCenter[0] <<", "<< baryCenter[1] <<", "<< baryCenter[2] - << "\t **** Volume " << _int_volume << endl; - cout << "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" << endl; + std::cout.precision(5); + std::cout << "**** Barycenter " << baryCenter[0] <<", "<< baryCenter[1] <<", "<< baryCenter[2] + << "\t **** Volume " << _int_volume << std::endl; + std::cout << "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" << std::endl; #endif return true; } @@ -310,10 +309,10 @@ namespace INTERP_KERNEL bool sideAdded[NB_TETRA_SIDES] = { false, false, false, false }; int nbAddedSides = 0; - list< vector< double* > >::iterator f = _faces.begin(), fEnd = _faces.end(); + std::list< std::vector< double* > >::iterator f = _faces.begin(), fEnd = _faces.end(); for ( ; f != fEnd; ++f ) { - vector< double* >& polygon = *f; + std::vector< double* >& polygon = *f; double coordSum[3] = {0,0,0}; for ( int i = 0; i < (int)polygon.size(); ++i ) { @@ -340,20 +339,20 @@ namespace INTERP_KERNEL int nbIntersectPolygs = _faces.size(); - vector< double* > * sideFaces[ 4 ]; // future polygons on sides of tetra + std::vector< double* > * sideFaces[ 4 ]; // future polygons on sides of tetra for ( int i = 0; i < NB_TETRA_SIDES; ++i ) { sideFaces[ i ]=0; if ( !sideAdded[ i ] ) { - _faces.push_back( vector< double* > () ); + _faces.push_back( std::vector< double* > () ); sideFaces[ i ] = &_faces.back(); } } f = _faces.begin(), fEnd = _faces.end(); for ( int iF = 0; iF < nbIntersectPolygs; ++f, ++iF ) // loop on added intersection polygons { - vector< double* >& polygon = *f; + std::vector< double* >& polygon = *f; for ( int i = 0; i < (int)polygon.size(); ++i ) { // segment ends @@ -389,21 +388,21 @@ namespace INTERP_KERNEL } } #ifdef DMP_UNITTETRAINTERSECTIONBARY - cout << "**** after Add segments to sides " << endl; + std::cout << "**** after Add segments to sides " << std::endl; for ( int i = 0; i < NB_TETRA_SIDES; ++i ) { - cout << "\t Side " << i << endl; + std::cout << "\t Side " << i << std::endl; if ( !sideFaces[i] ) { - cout << "\t cut by triagle" << endl; + std::cout << "\t cut by triagle" << std::endl; } else { - vector< double* >& sideFace = *sideFaces[i]; + std::vector< double* >& sideFace = *sideFaces[i]; for ( int i = 0; i < sideFace.size(); ++i ) { double* p = sideFace[i]; - cout << "\t" << i << ": ( " << p[0] << ", " << p[1] << ", " << p[2] << " )" << endl; + std::cout << "\t" << i << ": ( " << p[0] << ", " << p[1] << ", " << p[2] << " )" << std::endl; } } } @@ -430,7 +429,7 @@ namespace INTERP_KERNEL f = _faces.begin(), fEnd = _faces.end(); for ( int iF = 0; iF < nbIntersectPolygs; ++f, ++iF ) // loop on added intersection polygons { - vector< double* >& polygon = *f; + std::vector< double* >& polygon = *f; double corner2Poly[3] = { polygon[0][0], polygon[0][1], polygon[0][2] }; if ( ic ) corner2Poly[ ic-1 ] -= 1.0; @@ -440,7 +439,7 @@ namespace INTERP_KERNEL if ( dot < -DEFAULT_ABS_TOL*DEFAULT_ABS_TOL ) { #ifdef DMP_UNITTETRAINTERSECTIONBARY - cout << "side " << iF+1 << ": cut " << ic << endl; + std::cout << "side " << iF+1 << ": cut " << ic << std::endl; #endif cutOffCorners[ ic ] = true; nbCutOffCorners++; @@ -452,7 +451,7 @@ namespace INTERP_KERNEL for ( int i = 0; i < 3; ++i ) // loop on orthogonal faces of the unit tetra { if ( !sideFaces[i] ) continue; - vector< double* >& sideFace = *sideFaces[i]; + std::vector< double* >& sideFace = *sideFaces[i]; int nbPoints = sideFace.size(); if ( nbPoints == 0 ) @@ -533,7 +532,7 @@ namespace INTERP_KERNEL nbCutOffCorners--; cutOffCorners[ passThIndex ] = false; #ifdef DMP_UNITTETRAINTERSECTIONBARY - cout << "PASS THROUGH " << passThIndex << endl; + std::cout << "PASS THROUGH " << passThIndex << std::endl; #endif } } @@ -580,7 +579,7 @@ namespace INTERP_KERNEL for ( int i = 0; i < NB_TETRA_SIDES; ++i ) { if ( !sideFaces[ i ] ) continue; - vector< double* >& sideFace = *sideFaces[i]; + std::vector< double* >& sideFace = *sideFaces[i]; int excludeCorner = (i + 1) % NB_TETRA_NODES; for ( int ic = 0; ic < NB_TETRA_NODES; ++ic ) @@ -597,30 +596,30 @@ namespace INTERP_KERNEL } #ifdef DMP_UNITTETRAINTERSECTIONBARY - cout << "**** after Add corners to sides " << endl; + std::cout << "**** after Add corners to sides " << std::endl; for ( int i = 0; i < NB_TETRA_SIDES; ++i ) { - cout << "\t Side " << i << endl; + std::cout << "\t Side " << i << std::endl; if ( !sideFaces[i] ) { - cout << "\t cut by triagle" << endl; + std::cout << "\t cut by triagle" << std::endl; } else { - vector< double* >& sideFace = *sideFaces[i]; + std::vector< double* >& sideFace = *sideFaces[i]; for ( int i = 0; i < sideFace.size(); ++i ) { double* p = sideFace[i]; - cout << "\t" << i << ": ( " << p[0] << ", " << p[1] << ", " << p[2] << " )" << endl; + std::cout << "\t" << i << ": ( " << p[0] << ", " << p[1] << ", " << p[2] << " )" << std::endl; } } } - cout << "Cut off corners: "; + std::cout << "Cut off corners: "; if ( nbCutOffCorners == 0 ) - cout << "NO"; + std::cout << "NO"; else for ( int ic = 0; ic < NB_TETRA_NODES; ++ic ) - cout << cutOffCorners[ ic ]; - cout << endl; + std::cout << cutOffCorners[ ic ]; + std::cout << std::endl; #endif // ------------------------------------------------------------------------ // Sort corners of filled up faces on tetra sides and exclude equal points @@ -629,7 +628,7 @@ namespace INTERP_KERNEL int iF = 0; for ( f = _faces.begin(); f != fEnd; ++f, ++iF ) { - vector< double* >& face = *f; + std::vector< double* >& face = *f; if ( face.size() >= 3 ) { clearPolygons(); // free memory of _polygonA @@ -643,7 +642,7 @@ namespace INTERP_KERNEL sortIntersectionPolygon( A, _barycenterA ); } // exclude equal points - vector< double* >::iterator v = _polygonA.begin(), vEnd = _polygonA.end(); + std::vector< double* >::iterator v = _polygonA.begin(), vEnd = _polygonA.end(); face.push_back( *v ); *v = 0; for ( ++v; v != vEnd; ++v ) @@ -669,15 +668,15 @@ namespace INTERP_KERNEL } } #ifdef DMP_UNITTETRAINTERSECTIONBARY - cout << "**** after HEALING all faces " << endl; + std::cout << "**** after HEALING all faces " << std::endl; for (iF=0, f = _faces.begin(); f != fEnd; ++f, ++iF ) { - cout << "\t Side " << iF << endl; - vector< double* >& sideFace = *f; + std::cout << "\t Side " << iF << std::endl; + std::vector< double* >& sideFace = *f; for ( int i = 0; i < sideFace.size(); ++i ) { double* p = sideFace[i]; - cout << "\t" << i << ": ( " << p[0] << ", " << p[1] << ", " << p[2] << " )" << endl; + std::cout << "\t" << i << ": ( " << p[0] << ", " << p[1] << ", " << p[2] << " )" << std::endl; } } #endif @@ -712,11 +711,11 @@ namespace INTERP_KERNEL void UnitTetraIntersectionBary::clearPolygons(bool andFaces) { - for(vector::iterator it = _polygonA.begin() ; it != _polygonA.end() ; ++it) + for(std::vector::iterator it = _polygonA.begin() ; it != _polygonA.end() ; ++it) { delete[] *it; *it = 0; } - for(vector::iterator it = _polygonB.begin() ; it != _polygonB.end() ; ++it) + for(std::vector::iterator it = _polygonB.begin() ; it != _polygonB.end() ; ++it) { delete[] *it; *it = 0; @@ -727,11 +726,11 @@ namespace INTERP_KERNEL if ( andFaces ) { - list< vector< double* > >::iterator f = this->_faces.begin(), fEnd = this->_faces.end(); + std::list< std::vector< double* > >::iterator f = this->_faces.begin(), fEnd = this->_faces.end(); for ( ; f != fEnd; ++f ) { - vector< double* >& polygon = *f; - for(vector::iterator it = polygon.begin() ; it != polygon.end() ; ++it) + std::vector< double* >& polygon = *f; + for(std::vector::iterator it = polygon.begin() ; it != polygon.end() ; ++it) { delete[] *it; *it = 0; diff --git a/src/INTERP_KERNELTest/ExprEvalInterpTest.cxx b/src/INTERP_KERNELTest/ExprEvalInterpTest.cxx index 9bf31ed00..5d143f0ac 100644 --- a/src/INTERP_KERNELTest/ExprEvalInterpTest.cxx +++ b/src/INTERP_KERNELTest/ExprEvalInterpTest.cxx @@ -19,14 +19,13 @@ #include "ExprEvalInterpTest.hxx" #include "InterpKernelExprParser.hxx" -using namespace std; using namespace INTERP_TEST; void ExprEvalInterpTest::testBuildStringFromFortran() { char toto1[]="123456 "; char result[]="123456"; - string titi; + std::string titi; titi=INTERP_KERNEL::ExprParser::buildStringFromFortran(toto1,8); CPPUNIT_ASSERT_EQUAL(6,(int)titi.length()); CPPUNIT_ASSERT(titi==result); @@ -57,8 +56,8 @@ void ExprEvalInterpTest::testDeleteWhiteSpaces() { char toto[]=" jkhjkh ooooppp l "; char result[]="jkhjkhoooopppl"; - string totoS(toto); - string totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS); + std::string totoS(toto); + std::string totoR=INTERP_KERNEL::ExprParser::deleteWhiteSpaces(totoS); CPPUNIT_ASSERT(totoR==result); CPPUNIT_ASSERT_EQUAL(14,(int)totoR.length()); // diff --git a/src/INTERP_KERNELTest/Interpolation3DTest.cxx b/src/INTERP_KERNELTest/Interpolation3DTest.cxx index a538c6fdb..21f3317fa 100644 --- a/src/INTERP_KERNELTest/Interpolation3DTest.cxx +++ b/src/INTERP_KERNELTest/Interpolation3DTest.cxx @@ -42,7 +42,6 @@ //#define VOL_PREC 1.0e-6 using namespace MEDMEM; -using namespace std; using namespace INTERP_KERNEL; using namespace MED_EN; @@ -53,7 +52,7 @@ double Interpolation3DTest::sumRow(const IntersectionMatrix& m, int i) const { if(iter->count(i) != 0.0) { - map::const_iterator iter2 = iter->find(i); + std::map::const_iterator iter2 = iter->find(i); vol += iter2->second; } } @@ -64,7 +63,7 @@ double Interpolation3DTest::sumCol(const IntersectionMatrix& m, int i) const { double vol = 0.0; const std::map& col = m[i]; - for(map::const_iterator iter = col.begin() ; iter != col.end() ; ++iter) + for(std::map::const_iterator iter = col.begin() ; iter != col.end() ; ++iter) { vol += std::fabs(iter->second); } @@ -84,10 +83,10 @@ void Interpolation3DTest::getVolumes(MESH& mesh, double* tab) const double Interpolation3DTest::sumVolume(const IntersectionMatrix& m) const { - vector volumes; + std::vector volumes; for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { volumes.push_back(iter2->second); // vol += std::abs(iter2->second); @@ -146,7 +145,7 @@ bool Interpolation3DTest::areCompatitable(const IntersectionMatrix& m1, const In int i = 0; for(IntersectionMatrix::const_iterator iter = m1.begin() ; iter != m1.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { int j = iter2->first; if(m2.at(j-1).count(i+1) == 0) @@ -181,13 +180,13 @@ bool Interpolation3DTest::testSymmetric(const IntersectionMatrix& m1, const Inte for(IntersectionMatrix::const_iterator iter = m1.begin() ; iter != m1.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { int j = iter2->first; const double v1 = iter2->second; //if(m2[j - 1].count(i+1) > 0) // { - map theMap = m2.at(j-1); + std::map theMap = m2.at(j-1); const double v2 = theMap[i + 1]; if(v1 != v2) { @@ -215,7 +214,7 @@ bool Interpolation3DTest::testDiagonal(const IntersectionMatrix& m) const bool isDiagonal = true; for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { int j = iter2->first; const double vol = iter2->second; @@ -241,13 +240,13 @@ bool Interpolation3DTest::testDiagonal(const IntersectionMatrix& m) const void Interpolation3DTest::dumpIntersectionMatrix(const IntersectionMatrix& m) const { int i = 0; - std::cout << "Intersection matrix is " << endl; + std::cout << "Intersection matrix is " << std::endl; for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { - std::cout << "V(" << i << ", " << iter2->first << ") = " << iter2->second << endl; + std::cout << "V(" << i << ", " << iter2->first << ") = " << iter2->second << std::endl; } ++i; diff --git a/src/INTERP_KERNELTest/InterpolationPlanarTestSuite.hxx b/src/INTERP_KERNELTest/InterpolationPlanarTestSuite.hxx index 729061e46..952c6e5b8 100644 --- a/src/INTERP_KERNELTest/InterpolationPlanarTestSuite.hxx +++ b/src/INTERP_KERNELTest/InterpolationPlanarTestSuite.hxx @@ -24,8 +24,6 @@ #include #include -using namespace std; - namespace INTERP_TEST { @@ -89,7 +87,7 @@ namespace INTERP_TEST { std::cerr << deque1[i] << " "; } - std::cerr<< endl; + std::cerr<< std::endl; } void vectPrintOut(std::vector< double > vect) { @@ -97,7 +95,7 @@ namespace INTERP_TEST { std::cerr << vect[i] << " "; } - std::cerr<< endl; + std::cerr<< std::endl; } void tabPrintOut( const double * tab,int size) { @@ -105,7 +103,7 @@ namespace INTERP_TEST { std::cerr << tab[i] << " "; } - std::cerr<< endl; + std::cerr<< std::endl; } /** diff --git a/src/INTERP_KERNELTest/MeshTestToolkit.txx b/src/INTERP_KERNELTest/MeshTestToolkit.txx index ddfb21e94..b9dabe6a2 100644 --- a/src/INTERP_KERNELTest/MeshTestToolkit.txx +++ b/src/INTERP_KERNELTest/MeshTestToolkit.txx @@ -52,7 +52,6 @@ //#define VOL_PREC 1.0e-6 using namespace MEDMEM; -using namespace std; using namespace MED_EN; using namespace INTERP_KERNEL; @@ -75,7 +74,7 @@ namespace INTERP_TEST { if(iter->count(i) != 0.0) { - map::const_iterator iter2 = iter->find(i); + std::map::const_iterator iter2 = iter->find(i); vol += fabs(iter2->second); } } @@ -95,7 +94,7 @@ namespace INTERP_TEST { double vol = 0.0; const std::map& col = m[i]; - for(map::const_iterator iter = col.begin() ; iter != col.end() ; ++iter) + for(std::map::const_iterator iter = col.begin() ; iter != col.end() ; ++iter) { vol += fabs(iter->second); } @@ -139,10 +138,10 @@ namespace INTERP_TEST double MeshTestToolkit::sumVolume(const IntersectionMatrix& m) const { - vector volumes; + std::vector volumes; for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { volumes.push_back(fabs(iter2->second)); } @@ -222,7 +221,7 @@ namespace INTERP_TEST int i = 0; for(IntersectionMatrix::const_iterator iter = m1.begin() ; iter != m1.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { int j = iter2->first; if(m2.at(j-1).count(i+1) == 0) @@ -265,13 +264,13 @@ namespace INTERP_TEST for(IntersectionMatrix::const_iterator iter = m1.begin() ; iter != m1.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { int j = iter2->first; const double v1 = fabs(iter2->second); //if(m2[j - 1].count(i+1) > 0) // { - map theMap = m2.at(j-1); + std::map theMap = m2.at(j-1); const double v2 = fabs(theMap[i + 1]); if(v1 != v2) { diff --git a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest.cxx b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest.cxx index b9006c5f5..fc0eb18a1 100644 --- a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest.cxx +++ b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest.cxx @@ -27,7 +27,6 @@ #include #include -using namespace std; using namespace INTERP_KERNEL; namespace INTERP_TEST @@ -50,7 +49,7 @@ void QuadraticPlanarInterpTest::cleanUp() void QuadraticPlanarInterpTest::ReadWriteInXfigElementary() { //Testing bounds calculation. For Seg2 - istringstream stream("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n3200 3400 4500 4700"); + std::istringstream stream("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n3200 3400 4500 4700"); EdgeLin *e1=new EdgeLin(stream); Bounds bound=e1->getBounds(); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.32,bound[0],ADMISSIBLE_ERROR); @@ -58,7 +57,7 @@ void QuadraticPlanarInterpTest::ReadWriteInXfigElementary() CPPUNIT_ASSERT_DOUBLES_EQUAL(0.34,bound[2],ADMISSIBLE_ERROR); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.47,bound[3],ADMISSIBLE_ERROR); e1->decrRef(); - istringstream stream2("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n4500 4700 3200 3400"); + std::istringstream stream2("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n4500 4700 3200 3400"); e1=new EdgeLin(stream2); bound=e1->getBounds(); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.32,bound[0],ADMISSIBLE_ERROR); @@ -154,9 +153,9 @@ void QuadraticPlanarInterpTest::BasicGeometricTools() void QuadraticPlanarInterpTest::IntersectionBasics() { //Testing intersection of Bounds. - istringstream stream1("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n3200 3400 4500 4800"); + std::istringstream stream1("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n3200 3400 4500 4800"); EdgeLin *e1=new EdgeLin(stream1); - istringstream stream2("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n3200 3400 4500 4800"); + std::istringstream stream2("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n3200 3400 4500 4800"); EdgeLin *e2=new EdgeLin(stream2); Bounds *bound=e1->getBounds().amIIntersectingWith(e2->getBounds()); CPPUNIT_ASSERT(bound); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.32,(*bound)[0],ADMISSIBLE_ERROR); @@ -166,9 +165,9 @@ void QuadraticPlanarInterpTest::IntersectionBasics() delete bound; e2->decrRef(); e1->decrRef(); // - istringstream stream3("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n3000 7200 6000 3700"); + std::istringstream stream3("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n3000 7200 6000 3700"); EdgeLin *e3=new EdgeLin(stream3); - istringstream stream4("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n4800 6600 7200 4200"); + std::istringstream stream4("2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2\n4800 6600 7200 4200"); EdgeLin *e4=new EdgeLin(stream4); bound=e3->getBounds().amIIntersectingWith(e4->getBounds()); CPPUNIT_ASSERT(bound); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.48,(*bound)[0],ADMISSIBLE_ERROR); diff --git a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest2.cxx b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest2.cxx index bfd5cb81b..76b07e130 100644 --- a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest2.cxx +++ b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest2.cxx @@ -25,7 +25,6 @@ #include #include -using namespace std; using namespace INTERP_KERNEL; namespace INTERP_TEST @@ -103,7 +102,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleBase() // ArcCArcCIntersector // TypeOfLocInEdge where1,where2; - vector v4; + std::vector v4; MergePoints v3; EdgeArcCircle *e2; ArcCArcCIntersector *intersector=0; @@ -167,7 +166,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleBase() CPPUNIT_ASSERT_DOUBLES_EQUAL(e2->getRadius(),Node::distanceBtw2Pt(e2->getCenter(),(*(v4[1]))),ADMISSIBLE_ERROR); CPPUNIT_ASSERT(!v4[0]->isEqual(*v4[1])); CPPUNIT_ASSERT_DOUBLES_EQUAL(btw2NodesAndACenter(*v4[0],*v4[1],e1->getCenter()),0.35587863972199624,1e-10); - for(vector::iterator iter=v4.begin();iter!=v4.end();iter++) + for(std::vector::iterator iter=v4.begin();iter!=v4.end();iter++) (*iter)->decrRef(); v4.clear(); v3.clear(); delete intersector; e2->decrRef(); e1->decrRef(); @@ -192,7 +191,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleBase() CPPUNIT_ASSERT_DOUBLES_EQUAL(e2->getRadius(),Node::distanceBtw2Pt(e2->getCenter(),(*(v4[1]))),ADMISSIBLE_ERROR); CPPUNIT_ASSERT(!v4[0]->isEqual(*v4[1])); CPPUNIT_ASSERT_DOUBLES_EQUAL(btw2NodesAndACenter(*v4[0],*v4[1],e1->getCenter()),0.35587863972199624,1e-10); - for(vector::iterator iter=v4.begin();iter!=v4.end();iter++) + for(std::vector::iterator iter=v4.begin();iter!=v4.end();iter++) (*iter)->decrRef(); v4.clear(); v3.clear(); delete intersector; e2->decrRef(); e1->decrRef(); @@ -217,7 +216,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleBase() CPPUNIT_ASSERT_DOUBLES_EQUAL(e2->getRadius(),Node::distanceBtw2Pt(e2->getCenter(),(*(v4[1]))),ADMISSIBLE_ERROR); CPPUNIT_ASSERT(!v4[0]->isEqual(*v4[1])); CPPUNIT_ASSERT_DOUBLES_EQUAL(btw2NodesAndACenter(*v4[0],*v4[1],e1->getCenter()),0.6793851523346941,1e-10); - for(vector::iterator iter=v4.begin();iter!=v4.end();iter++) + for(std::vector::iterator iter=v4.begin();iter!=v4.end();iter++) (*iter)->decrRef(); v4.clear(); v3.clear(); delete intersector; e2->decrRef(); e1->decrRef(); @@ -242,7 +241,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleBase() CPPUNIT_ASSERT_DOUBLES_EQUAL(e2->getRadius(),Node::distanceBtw2Pt(e2->getCenter(),(*(v4[1]))),ADMISSIBLE_ERROR); CPPUNIT_ASSERT(!v4[0]->isEqual(*v4[1])); CPPUNIT_ASSERT_DOUBLES_EQUAL(btw2NodesAndACenter(*v4[0],*v4[1],e1->getCenter()),0.6793851523346941,1e-10); - for(vector::iterator iter=v4.begin();iter!=v4.end();iter++) + for(std::vector::iterator iter=v4.begin();iter!=v4.end();iter++) (*iter)->decrRef(); v4.clear(); v3.clear(); delete intersector; e2->decrRef(); e1->decrRef(); @@ -267,7 +266,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleBase() CPPUNIT_ASSERT_DOUBLES_EQUAL(e2->getRadius(),Node::distanceBtw2Pt(e2->getCenter(),(*(v4[1]))),ADMISSIBLE_ERROR); CPPUNIT_ASSERT(!v4[0]->isEqual(*v4[1])); CPPUNIT_ASSERT_DOUBLES_EQUAL(1.1195732971845034,btw2NodesAndACenter(*v4[0],*v4[1],e1->getCenter()),1e-10); - for(vector::iterator iter=v4.begin();iter!=v4.end();iter++) + for(std::vector::iterator iter=v4.begin();iter!=v4.end();iter++) (*iter)->decrRef(); v4.clear(); v3.clear(); delete intersector; e2->decrRef(); e1->decrRef(); @@ -292,7 +291,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleBase() CPPUNIT_ASSERT_DOUBLES_EQUAL(e2->getRadius(),Node::distanceBtw2Pt(e2->getCenter(),(*(v4[1]))),ADMISSIBLE_ERROR); CPPUNIT_ASSERT(!v4[0]->isEqual(*v4[1])); CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.1195732971845034,btw2NodesAndACenter(*v4[0],*v4[1],e1->getCenter()),1e-10); - for(vector::iterator iter=v4.begin();iter!=v4.end();iter++) + for(std::vector::iterator iter=v4.begin();iter!=v4.end();iter++) (*iter)->decrRef(); v4.clear(); v3.clear(); delete intersector; e2->decrRef(); e1->decrRef(); @@ -317,7 +316,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleBase() CPPUNIT_ASSERT_DOUBLES_EQUAL(e2->getRadius(),Node::distanceBtw2Pt(e2->getCenter(),(*(v4[1]))),ADMISSIBLE_ERROR); CPPUNIT_ASSERT(!v4[0]->isEqual(*v4[1])); CPPUNIT_ASSERT_DOUBLES_EQUAL(-3.0844420190512074,btw2NodesAndACenter(*v4[0],*v4[1],e1->getCenter()),1e-10); - for(vector::iterator iter=v4.begin();iter!=v4.end();iter++) + for(std::vector::iterator iter=v4.begin();iter!=v4.end();iter++) (*iter)->decrRef(); v4.clear(); v3.clear(); delete intersector; e2->decrRef(); e1->decrRef(); @@ -342,7 +341,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleBase() CPPUNIT_ASSERT_DOUBLES_EQUAL(e2->getRadius(),Node::distanceBtw2Pt(e2->getCenter(),(*(v4[1]))),ADMISSIBLE_ERROR); CPPUNIT_ASSERT(!v4[0]->isEqual(*v4[1])); CPPUNIT_ASSERT_DOUBLES_EQUAL(-3.0844420190512074,btw2NodesAndACenter(*v4[0],*v4[1],e1->getCenter()),1e-10); - for(vector::iterator iter=v4.begin();iter!=v4.end();iter++) + for(std::vector::iterator iter=v4.begin();iter!=v4.end();iter++) (*iter)->decrRef(); v4.clear(); v3.clear(); delete intersector; e2->decrRef(); e1->decrRef(); @@ -364,7 +363,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleBase() CPPUNIT_ASSERT_EQUAL(1,(int)v4.size()); CPPUNIT_ASSERT_EQUAL(0,(int)v3.getNumberOfAssociations()); CPPUNIT_ASSERT_DOUBLES_EQUAL(e1->getRadius(),Node::distanceBtw2Pt(e1->getCenter(),(*(v4[0]))),ADMISSIBLE_ERROR); CPPUNIT_ASSERT_DOUBLES_EQUAL(e2->getRadius(),Node::distanceBtw2Pt(e2->getCenter(),(*(v4[0]))),ADMISSIBLE_ERROR); - for(vector::iterator iter=v4.begin();iter!=v4.end();iter++) + for(std::vector::iterator iter=v4.begin();iter!=v4.end();iter++) (*iter)->decrRef(); v4.clear(); v4.clear(); delete intersector; e2->decrRef(); e1->decrRef(); @@ -610,7 +609,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleSegumentBase() bool obvious,areOverlapped; intersector->areOverlappedOrOnlyColinears(0,obvious,areOverlapped); CPPUNIT_ASSERT(!obvious && !areOverlapped); - vector v4; + std::vector v4; MergePoints v3; CPPUNIT_ASSERT(intersector->intersect(0,v4,order,v3)); CPPUNIT_ASSERT(!order); CPPUNIT_ASSERT_EQUAL(2,(int)v4.size()); CPPUNIT_ASSERT_EQUAL(0,(int)v3.getNumberOfAssociations()); CPPUNIT_ASSERT_DOUBLES_EQUAL(2.,(*v4[0])[0],1e-10); CPPUNIT_ASSERT_DOUBLES_EQUAL(4.3,(*v4[0])[1],1e-10); @@ -642,7 +641,7 @@ void QuadraticPlanarInterpTest::IntersectArcCircleSegumentBase() QuadraticPolygon *QuadraticPlanarInterpTest::buildQuadraticPolygonCoarseInfo(const double *coords, const int *conn, int lgth) { - vector nodes; + std::vector nodes; for(int i=0;i #include -using namespace std; using namespace INTERP_KERNEL; namespace INTERP_TEST diff --git a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest4.cxx b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest4.cxx index cdce8135a..b04d90aa8 100644 --- a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest4.cxx +++ b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest4.cxx @@ -27,7 +27,6 @@ #include #include -using namespace std; using namespace INTERP_KERNEL; namespace INTERP_TEST @@ -43,7 +42,7 @@ void QuadraticPlanarInterpTest::checkPolygonsIntersection1() EdgeLin *e2_3=new EdgeLin(n2,n3); EdgeLin *e5_6=new EdgeLin(n5,n6); EdgeLin *e3_1=new EdgeLin(n3,n1); EdgeLin *e6_4=new EdgeLin(n6,n4); // - vector result; + std::vector result; for(int k=0;k<2;k++) for(int i=0;i<3;i++) { @@ -59,8 +58,8 @@ void QuadraticPlanarInterpTest::checkPolygonsIntersection1() CPPUNIT_ASSERT_EQUAL(3,result[0]->recursiveSize()); double tmp1=0.,tmp2=0.,tmp3=0.; pol1.intersectForPerimeter(pol2,tmp1,tmp2,tmp3); - vector v1,v2; - vector v3; + std::vector v1,v2; + std::vector v3; pol1.intersectForPerimeterAdvanced(pol2,v1,v2);//no common edge pol1.intersectForPoint(pol2,v3); CPPUNIT_ASSERT_EQUAL(3,(int)v1.size()); @@ -164,7 +163,7 @@ void QuadraticPlanarInterpTest::checkPolygonsIntersection1() delete result[0]; double tmp1=0.,tmp2=0.,tmp3=0.; pol7.intersectForPerimeter(pol8,tmp1,tmp2,tmp3); - vector v1,v2; + std::vector v1,v2; pol7.intersectForPerimeterAdvanced(pol8,v1,v2);//only common edges. CPPUNIT_ASSERT_DOUBLES_EQUAL(3.2360679774997898,v1[0]+v1[1]+v1[2],1.e-14); CPPUNIT_ASSERT_DOUBLES_EQUAL(3.2360679774997898,v2[0]+v2[1]+v2[2],1.e-14); @@ -315,7 +314,7 @@ void QuadraticPlanarInterpTest::checkPolygonsIntersection2() // QuadraticPolygon pol1; pol1.pushBack(e1_2); pol1.pushBack(e2_3); pol1.pushBack(e3_1); QuadraticPolygon pol2; pol2.pushBack(e4_5); pol2.pushBack(e5_6); pol2.pushBack(e6_4); - vector result=pol1.intersectMySelfWith(pol2); + std::vector result=pol1.intersectMySelfWith(pol2); CPPUNIT_ASSERT_EQUAL(1,(int)result.size()); CPPUNIT_ASSERT_EQUAL(3,result[0]->recursiveSize()); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.18,result[0]->getArea(),1e-10); @@ -504,7 +503,7 @@ void QuadraticPlanarInterpTest::checkHighLevelFunctionTest1() 7.4192455562999999, 6.5142135623000001, 8.3334591186000004, 5.9660254036999998 }; - vector nodes; + std::vector nodes; nodes.push_back(new Node(coords)); nodes.push_back(new Node(coords+2)); nodes.push_back(new Node(coords+4)); @@ -593,7 +592,7 @@ void QuadraticPlanarInterpTest::check1DInterpLin() 0.1000 , 0.1500 , 0.2000 , 0.2500, 0.3000, 0.3500, 0.4000, 0.4500, 0.5000, 0.5500, 0.6000, 0.6500, 0.7000, 0.7194, 0.7388, 0.7581, 0.7775, 0.7969, 0.8163, 0.8356, 0.8550}; - vector zLev1(Z_VALS_1,Z_VALS_1+NB_OF_CELL_AXIAL_1+1); + std::vector zLev1(Z_VALS_1,Z_VALS_1+NB_OF_CELL_AXIAL_1+1); const int NB_OF_CELL_AXIAL_2=46; static const double Z_VALS_2[NB_OF_CELL_AXIAL_2+1]= @@ -602,8 +601,8 @@ void QuadraticPlanarInterpTest::check1DInterpLin() , 0.20, 0.25, 0.30, 0.350 ,0.40 ,0.450 ,0.500 , 0.550, 0.600 ,0.650 ,0.700 , 0.7194 ,0.7388 ,0.7581 ,0.7775 ,0.7969 ,0.8163 ,0.8356, 0.8550 , 0.8738 ,0.8925 ,0.9113 ,0.9300 ,0.9488 ,0.9675 ,0.9863, 1.0050}; - vector zLev2(Z_VALS_2,Z_VALS_2+NB_OF_CELL_AXIAL_2+1); - map > m; + std::vector zLev2(Z_VALS_2,Z_VALS_2+NB_OF_CELL_AXIAL_2+1); + std::map > m; Edge::interpolate1DLin(zLev1,zLev2,m); CPPUNIT_ASSERT_EQUAL(30,(int)m.size()); double ret=0; @@ -620,7 +619,7 @@ void QuadraticPlanarInterpTest::check1DInterpLin() static const double Z_VALS_3[NB_OF_CELL_AXIAL_3+1]={ 0.,0.01,0.05,0.10,0.15,0.20,0.25,0.30, 0.35,0.40,0.45,0.50,0.55,0.60 }; - vector zLev3(Z_VALS_3,Z_VALS_3+NB_OF_CELL_AXIAL_3+1); + std::vector zLev3(Z_VALS_3,Z_VALS_3+NB_OF_CELL_AXIAL_3+1); Edge::interpolate1DLin(zLev3,zLev1,m); CPPUNIT_ASSERT_EQUAL(13,(int)m.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(1.,m[0][8],1e-12); @@ -732,7 +731,7 @@ void QuadraticPlanarInterpTest::checkNonRegression2() 16.284787383000001, -24.763094964, 16.150490958999999, -24.132999999999999 }; - vector nodes1; + std::vector nodes1; nodes1.push_back(new Node(coords1)); nodes1.push_back(new Node(coords1+2)); nodes1.push_back(new Node(coords1+4)); @@ -742,7 +741,7 @@ void QuadraticPlanarInterpTest::checkNonRegression2() nodes1.push_back(new Node(coords1+12)); nodes1.push_back(new Node(coords1+14)); QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1); - vector nodes2; + std::vector nodes2; nodes2.push_back(new Node(coords2)); nodes2.push_back(new Node(coords2+2)); nodes2.push_back(new Node(coords2+4)); @@ -752,7 +751,7 @@ void QuadraticPlanarInterpTest::checkNonRegression2() nodes2.push_back(new Node(coords2+12)); nodes2.push_back(new Node(coords2+14)); QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2); - vector v=pol1->intersectMySelfWith(*pol2); + std::vector v=pol1->intersectMySelfWith(*pol2); CPPUNIT_ASSERT_EQUAL(1,(int)v.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.00173945,v[0]->getArea(),1e-7); delete v[0]; @@ -825,7 +824,7 @@ void QuadraticPlanarInterpTest::checkNonRegression4() 10.797961776699999, -22.893119169449999, 10.727500000099999, -23.66 }; - vector nodes1; + std::vector nodes1; nodes1.push_back(new Node(coords1)); nodes1.push_back(new Node(coords1+2)); nodes1.push_back(new Node(coords1+4)); @@ -835,7 +834,7 @@ void QuadraticPlanarInterpTest::checkNonRegression4() nodes1.push_back(new Node(coords1+12)); nodes1.push_back(new Node(coords1+14)); QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1); - vector nodes2; + std::vector nodes2; nodes2.push_back(new Node(coords2)); nodes2.push_back(new Node(coords2+2)); nodes2.push_back(new Node(coords2+4)); @@ -845,7 +844,7 @@ void QuadraticPlanarInterpTest::checkNonRegression4() nodes2.push_back(new Node(coords2+12)); nodes2.push_back(new Node(coords2+14)); QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2); - vector v=pol1->intersectMySelfWith(*pol2); + std::vector v=pol1->intersectMySelfWith(*pol2); CPPUNIT_ASSERT_EQUAL(1,(int)v.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.00164773941455998,v[0]->getArea(),1e-7); delete v[0]; @@ -881,7 +880,7 @@ void QuadraticPlanarInterpTest::checkNonRegression5() -2.2684999997999999, 0}; //Edge1_of_pol2 inter Edge4_of_pol1 = {-1.9381648533711939, 1.1189999998498941} //Edge4_of_pol1 _angle = -0.523598775922546, _angle0 = -3.1415926535897931, _radius = 2.2379999983074721, _center = {-1.4925279436059493e-09, 1.3300635705141101e-10}} - vector nodes1; + std::vector nodes1; nodes1.push_back(new Node(coords1)); nodes1.push_back(new Node(coords1+2)); nodes1.push_back(new Node(coords1+4)); @@ -891,7 +890,7 @@ void QuadraticPlanarInterpTest::checkNonRegression5() nodes1.push_back(new Node(coords1+12)); nodes1.push_back(new Node(coords1+14)); QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1); - vector nodes2; + std::vector nodes2; nodes2.push_back(new Node(coords2)); nodes2.push_back(new Node(coords2+2)); nodes2.push_back(new Node(coords2+4)); @@ -901,7 +900,7 @@ void QuadraticPlanarInterpTest::checkNonRegression5() nodes2.push_back(new Node(coords2+12)); nodes2.push_back(new Node(coords2+14)); QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2); - vector v=pol1->intersectMySelfWith(*pol2); + std::vector v=pol1->intersectMySelfWith(*pol2); CPPUNIT_ASSERT_EQUAL(0,(int)v.size()); //CPPUNIT_ASSERT_DOUBLES_EQUAL(0.00164773941455998,v[0]->getArea(),1e-7); //delete v[0]; @@ -934,7 +933,7 @@ void QuadraticPlanarInterpTest::checkNonRegression6() 10.832860069499999, -22.027750000200001, 10.477274402499999, -22.80719124657, 10.3955000001, -23.66}; - vector nodes1; + std::vector nodes1; nodes1.push_back(new Node(coords1)); nodes1.push_back(new Node(coords1+2)); nodes1.push_back(new Node(coords1+4)); @@ -944,7 +943,7 @@ void QuadraticPlanarInterpTest::checkNonRegression6() nodes1.push_back(new Node(coords1+12)); nodes1.push_back(new Node(coords1+14)); QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1); - vector nodes2; + std::vector nodes2; nodes2.push_back(new Node(coords2)); nodes2.push_back(new Node(coords2+2)); nodes2.push_back(new Node(coords2+4)); @@ -954,7 +953,7 @@ void QuadraticPlanarInterpTest::checkNonRegression6() nodes2.push_back(new Node(coords2+12)); nodes2.push_back(new Node(coords2+14)); QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2); - vector v=pol1->intersectMySelfWith(*pol2); + std::vector v=pol1->intersectMySelfWith(*pol2); CPPUNIT_ASSERT_EQUAL(1,(int)v.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(v[0]->getArea(),0.0150659,1e-7); delete v[0]; @@ -986,7 +985,7 @@ void QuadraticPlanarInterpTest::checkNonRegression7() -2.1083388453499996, 1.2172499998499999, -2.445724191994314, 0.65532982205982326, -2.4344999998499999, 0 }; - vector nodes1; + std::vector nodes1; nodes1.push_back(new Node(coords1)); nodes1.push_back(new Node(coords1+2)); nodes1.push_back(new Node(coords1+4)); @@ -996,7 +995,7 @@ void QuadraticPlanarInterpTest::checkNonRegression7() nodes1.push_back(new Node(coords1+12)); nodes1.push_back(new Node(coords1+14)); QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1); - vector nodes2; + std::vector nodes2; nodes2.push_back(new Node(coords2)); nodes2.push_back(new Node(coords2+2)); nodes2.push_back(new Node(coords2+4)); @@ -1006,7 +1005,7 @@ void QuadraticPlanarInterpTest::checkNonRegression7() nodes2.push_back(new Node(coords2+12)); nodes2.push_back(new Node(coords2+14)); QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2); - vector v=pol1->intersectMySelfWith(*pol2); + std::vector v=pol1->intersectMySelfWith(*pol2); CPPUNIT_ASSERT_EQUAL(1,(int)v.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.121795,v[0]->getArea(),1.e-6); delete v[0]; @@ -1037,7 +1036,7 @@ void QuadraticPlanarInterpTest::checkNonRegression8() -13.933000000040851, -28.913499999870751, -15.139355569325469, -28.635180276305853, -16.323249999975001, -28.273034442748209 }; - vector nodes1; + std::vector nodes1; nodes1.push_back(new Node(coords1)); nodes1.push_back(new Node(coords1+2)); nodes1.push_back(new Node(coords1+4)); @@ -1047,7 +1046,7 @@ void QuadraticPlanarInterpTest::checkNonRegression8() nodes1.push_back(new Node(coords1+12)); nodes1.push_back(new Node(coords1+14)); QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1); - vector nodes2; + std::vector nodes2; nodes2.push_back(new Node(coords2)); nodes2.push_back(new Node(coords2+2)); nodes2.push_back(new Node(coords2+4)); @@ -1057,7 +1056,7 @@ void QuadraticPlanarInterpTest::checkNonRegression8() nodes2.push_back(new Node(coords2+12)); nodes2.push_back(new Node(coords2+14)); QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2); - vector v=pol1->intersectMySelfWith(*pol2); + std::vector v=pol1->intersectMySelfWith(*pol2); CPPUNIT_ASSERT_EQUAL(1,(int)v.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.598232,v[0]->getArea(),1.e-6); delete v[0]; @@ -1090,7 +1089,7 @@ void QuadraticPlanarInterpTest::checkNonRegression9() -0.048696224921445964, -0.087834175258503858, -0.050490195203805516, -0.087452715971391121}; - vector nodes1; + std::vector nodes1; nodes1.push_back(new Node(coords1)); nodes1.push_back(new Node(coords1+2)); nodes1.push_back(new Node(coords1+4)); @@ -1100,7 +1099,7 @@ void QuadraticPlanarInterpTest::checkNonRegression9() nodes1.push_back(new Node(coords1+12)); nodes1.push_back(new Node(coords1+14)); QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1); - vector nodes2; + std::vector nodes2; nodes2.push_back(new Node(coords2)); nodes2.push_back(new Node(coords2+2)); nodes2.push_back(new Node(coords2+4)); @@ -1110,7 +1109,7 @@ void QuadraticPlanarInterpTest::checkNonRegression9() nodes2.push_back(new Node(coords2+12)); nodes2.push_back(new Node(coords2+14)); QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2); - vector v=pol1->intersectMySelfWith(*pol2); + std::vector v=pol1->intersectMySelfWith(*pol2); CPPUNIT_ASSERT_EQUAL(0,(int)v.size()); delete pol1; delete pol2; @@ -1169,7 +1168,7 @@ void QuadraticPlanarInterpTest::checkNonRegression11() -0.002982346712452072, -0.1018362598405457, -0.003829636200350435, -0.1051516213840111}; - vector nodes1; + std::vector nodes1; nodes1.push_back(new Node(coords1)); nodes1.push_back(new Node(coords1+2)); nodes1.push_back(new Node(coords1+4)); @@ -1179,7 +1178,7 @@ void QuadraticPlanarInterpTest::checkNonRegression11() nodes1.push_back(new Node(coords1+12)); nodes1.push_back(new Node(coords1+14)); QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1); - vector nodes2; + std::vector nodes2; nodes2.push_back(new Node(coords2)); nodes2.push_back(new Node(coords2+2)); nodes2.push_back(new Node(coords2+4)); @@ -1189,7 +1188,7 @@ void QuadraticPlanarInterpTest::checkNonRegression11() nodes2.push_back(new Node(coords2+12)); nodes2.push_back(new Node(coords2+14)); QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2); - vector v=pol1->intersectMySelfWith(*pol2); + std::vector v=pol1->intersectMySelfWith(*pol2); CPPUNIT_ASSERT_EQUAL(1,(int)v.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(2.28973e-06,v[0]->getArea(),1.e-11); delete v[0]; @@ -1221,7 +1220,7 @@ void QuadraticPlanarInterpTest::checkNonRegression12() -0.4869622492144596, -0.8783417525850385, -0.5049019520380551, -0.8745271597139112}; - vector nodes1; + std::vector nodes1; nodes1.push_back(new Node(coords1)); nodes1.push_back(new Node(coords1+2)); nodes1.push_back(new Node(coords1+4)); @@ -1231,7 +1230,7 @@ void QuadraticPlanarInterpTest::checkNonRegression12() nodes1.push_back(new Node(coords1+12)); nodes1.push_back(new Node(coords1+14)); QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1); - vector nodes2; + std::vector nodes2; nodes2.push_back(new Node(coords2)); nodes2.push_back(new Node(coords2+2)); nodes2.push_back(new Node(coords2+4)); @@ -1241,7 +1240,7 @@ void QuadraticPlanarInterpTest::checkNonRegression12() nodes2.push_back(new Node(coords2+12)); nodes2.push_back(new Node(coords2+14)); QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2); - vector v=pol1->intersectMySelfWith(*pol2); + std::vector v=pol1->intersectMySelfWith(*pol2); CPPUNIT_ASSERT_EQUAL(1,(int)v.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,v[0]->getArea(),1.e-6); delete v[0]; @@ -1316,7 +1315,7 @@ void QuadraticPlanarInterpTest::checkNonRegression13() for(int j=0;j<2;j++,work2+=8) { QuadraticPolygon *pol2=buildQuadraticPolygonCoarseInfo(coords_2,work2,8); - //vector tmp; + //std::vector tmp; //pol1->intersectForPoint(*pol2,tmp); pol1->intersectForPerimeter(*pol2,perimeterFromPol1,perimeterFromPol2,perimeterFromPol1AndPol2); //pol1->intersectMySelfWith(*pol2); @@ -1333,7 +1332,7 @@ void QuadraticPlanarInterpTest::checkNonRegression13() { QuadraticPolygon *pol2=buildQuadraticPolygonCoarseInfo(coords_2,work2,8); - //vector tmp; + //std::vector tmp; //pol1->intersectForPoint(*pol2,tmp); pol1->intersectForPerimeter(*pol2,perimeterFromPol1,perimeterFromPol2,perimeterFromPol1AndPol2); delete pol2; @@ -1370,7 +1369,7 @@ void QuadraticPlanarInterpTest::checkNonRegression14() 27,28,29,30,31,32,2,33 }; QuadraticPolygon *pol1,*pol2; - vector goalOfTest; + std::vector goalOfTest; // pol1=buildQuadraticPolygonCoarseInfo(coords,tab,8); // Level 1 @@ -1445,7 +1444,7 @@ void QuadraticPlanarInterpTest::checkNonRegression15() //pol1 and pol2 in same orientation pol1=buildQuadraticPolygonCoarseInfo(coords,tab,8); pol2=buildQuadraticPolygonCoarseInfo(coords,tab+8,8); - vector res=pol1->intersectMySelfWith(*pol2); + std::vector res=pol1->intersectMySelfWith(*pol2); CPPUNIT_ASSERT_EQUAL(1,(int)res.size()); CPPUNIT_ASSERT_EQUAL(4,res[0]->recursiveSize()); CPPUNIT_ASSERT_DOUBLES_EQUAL(RefLgth,res[0]->getPerimeter(),1e-12); @@ -1543,7 +1542,7 @@ void QuadraticPlanarInterpTest::checkNonRegression16() QuadraticPolygon *pol1,*pol2; //pol1 and pol2 in same orientation - vector test1,test2; + std::vector test1,test2; for(int ii=0;ii<24;ii++) { pol1=buildQuadraticPolygonCoarseInfo(coords1,tab1_8+8*ii,8); @@ -1551,7 +1550,7 @@ void QuadraticPlanarInterpTest::checkNonRegression16() { pol2=buildQuadraticPolygonCoarseInfo(coords2,tab2_8+jj*8,8); // - vector v1,v2; + std::vector v1,v2; pol1->initLocations(); pol1->intersectForPerimeterAdvanced(*pol2,v1,v2); if(ii==16 && jj==1) diff --git a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest5.cxx b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest5.cxx index 844c42133..a8ce8dec4 100644 --- a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest5.cxx +++ b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest5.cxx @@ -27,7 +27,6 @@ #include #include -using namespace std; using namespace INTERP_KERNEL; namespace INTERP_TEST @@ -214,7 +213,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0006() 0, 1, 2, 3, 4, 5, 6, 7 }; QuadraticPolygon *pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); QuadraticPolygon *pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.366519,0.,0.}; double test2_res[4]={0.,0.,0.,0.366519}; @@ -240,7 +239,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0007() 0, 1, 2, 3, 4, 5, 6, 7 }; QuadraticPolygon *pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); QuadraticPolygon *pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.366519,0.,0.}; double test2_res[4]={0.,0.,0.,0.366519}; @@ -266,7 +265,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0008() 0, 1, 2, 3, 4, 5, 6, 7 }; QuadraticPolygon *pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); QuadraticPolygon *pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.18326,0.,0.}; double test2_res[4]={0.,0.,0.,0.18326}; @@ -347,7 +346,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0011() CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,val1,1.e-13); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,val2,1.e-13); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,val3,1.e-13); - vector val4,val5; + std::vector val4,val5; pol1->intersectForPerimeterAdvanced(*pol2,val4,val5); double test1_res[4]={0.,0.,0.,0.}; CPPUNIT_ASSERT(std::equal(val4.begin(),val4.end(),test1_res,DoubleEqual(1e-13))); @@ -391,7 +390,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar2511() CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,val1,1.e-13); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,val2,1.e-13); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,val3,1.e-13); - vector val4,val5; + std::vector val4,val5; pol1->intersectForPerimeterAdvanced(*pol2,val4,val5); double test1_res[4]={0.,0.,0.,0.}; CPPUNIT_ASSERT(std::equal(val4.begin(),val4.end(),test1_res,DoubleEqual(1e-13))); @@ -429,7 +428,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0012() 0, 1, 2, 3, 4, 5, 6, 7 }; QuadraticPolygon *pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); QuadraticPolygon *pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.05,0.}; double test2_res[4]={0.,0.,0.05,0.}; @@ -437,7 +436,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0012() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-13))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -463,7 +462,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0013() 0, 1, 2, 3, 4, 5, 6, 7 }; QuadraticPolygon *pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); QuadraticPolygon *pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.1,0.}; double test2_res[4]={0.,0.,0.1,0.}; @@ -471,7 +470,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0013() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-13))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -507,7 +506,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0014() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.15,0.}; double test2_res[4]={0.05,0.,0.1,0.}; @@ -515,7 +514,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0014() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-13))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -551,7 +550,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0015() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.2,0.}; double test2_res[4]={0.1,0.,0.1,0.}; @@ -559,7 +558,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0015() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-13))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -595,7 +594,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0016() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.15,0.}; double test2_res[4]={0.1,0.,0.05,0.}; @@ -603,7 +602,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0016() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-13))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -640,7 +639,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0017() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.1,0.}; double test2_res[4]={0.1,0.,0.,0.}; @@ -648,7 +647,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0017() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-13))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -685,7 +684,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0018() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.05,0.}; double test2_res[4]={0.05,0.,0.,0.}; @@ -693,7 +692,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0018() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-13))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -756,7 +755,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0020() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.,0.}; double test2_res[4]={0.,0.,0.,0.}; @@ -764,7 +763,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0020() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-6))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -801,7 +800,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0021() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.162251,0.151523,0.,0.}; double test2_res[4]={0.,0.311383,0.,0.0978193}; @@ -809,7 +808,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0021() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-6))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -945,7 +944,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0025() delete pol1; delete pol2; // - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -980,7 +979,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0026() delete pol1; delete pol2; // - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -1017,7 +1016,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0027() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.222704,0.,0.}; double test2_res[4]={0.1,0.0465335,0.1,0.092554}; @@ -1025,7 +1024,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0027() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-6))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -1062,7 +1061,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0028() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.,0.}; double test2_res[4]={0.1,0.628319,0.1,0.314159}; @@ -1070,7 +1069,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0028() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-6))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -1107,7 +1106,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0029() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.,0.}; double test2_res[4]={0.,0.,0.,0.}; @@ -1115,7 +1114,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0029() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-13))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); @@ -1152,7 +1151,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0030() // pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); - vector val1,val2; + std::vector val1,val2; pol1->intersectForPerimeterAdvanced(*pol2,val1,val2); double test1_res[4]={0.,0.,0.,0.}; double test2_res[4]={0.1,0.628319,0.1,0.314159}; @@ -1160,7 +1159,7 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0030() CPPUNIT_ASSERT(std::equal(val2.begin(),val2.end(),test2_res,DoubleEqual(1e-6))); delete pol1; delete pol2; - vector val3; + std::vector val3; pol1=buildQuadraticPolygonCoarseInfo(coords,tab8,8); pol2=buildQuadraticPolygonCoarseInfo(coords2,tab8,8); pol1->intersectForPoint(*pol2,val3); diff --git a/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx b/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx index b3b71487e..c5dde8872 100644 --- a/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx +++ b/src/INTERP_KERNELTest/SingleElementPlanarTests.cxx @@ -78,8 +78,8 @@ namespace INTERP_TEST void SingleElementPlanarTests::diamondsBasic() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_losange2,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_losange2,4,4); + std::deque< double > expected_result; expected_result.push_back(0.5);expected_result.push_back(-0.5); expected_result.push_back(0);expected_result.push_back(0); @@ -87,22 +87,22 @@ namespace INTERP_TEST expected_result.push_back(1);expected_result.push_back(0); CPPUNIT_ASSERT_MESSAGE("Basic diamond crossing test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::diamondsBasic_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_losange1,_losange2,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1);expected_result.push_back(0); expected_result.push_back(0.5);expected_result.push_back(0.5); expected_result.push_back(0);expected_result.push_back(0); expected_result.push_back(0.5);expected_result.push_back(-0.5); CPPUNIT_ASSERT_MESSAGE("Basic diamond crossing test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } @@ -121,23 +121,23 @@ namespace INTERP_TEST void SingleElementPlanarTests::tangentDiamonds() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_losange3,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_losange3,4,4); + std::deque< double > expected_result; CPPUNIT_ASSERT_MESSAGE("Diamond exclusion tangency test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::tangentDiamonds_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_losange1,_losange3,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(0.5);expected_result.push_back(0.5); expected_result.push_back(1);expected_result.push_back(0); CPPUNIT_ASSERT_MESSAGE("Diamond exclusion tangency test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two tangent squares with overlapping edges, in an inclusion configuration @@ -153,8 +153,8 @@ namespace INTERP_TEST void SingleElementPlanarTests::tangentSquares() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_square2,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_square2,4,4); + std::deque< double > expected_result; expected_result.push_back(0.);expected_result.push_back(0.25); expected_result.push_back(0.);expected_result.push_back(-0.25); @@ -162,14 +162,14 @@ namespace INTERP_TEST expected_result.push_back(1.);expected_result.push_back(0.25); CPPUNIT_ASSERT_MESSAGE("Squares inclusion tangency test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::tangentSquares_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_square1,_square2,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1.);expected_result.push_back(0.25); expected_result.push_back(0.25);expected_result.push_back(0.25); @@ -180,7 +180,7 @@ namespace INTERP_TEST expected_result.push_back(1.);expected_result.push_back(-0.25); CPPUNIT_ASSERT_MESSAGE("Squares inclusion tangency test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two diamonds sharing a vertex in an exclusion configuration @@ -198,22 +198,22 @@ namespace INTERP_TEST void SingleElementPlanarTests::diamondsSharingVertex1() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_losange4,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_losange4,4,4); + std::deque< double > expected_result; CPPUNIT_ASSERT_MESSAGE("Diamond sharing (1) vertex test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::diamondsSharingVertex1_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_losange1,_losange4,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1.);expected_result.push_back(0.); CPPUNIT_ASSERT_MESSAGE("Diamonds sharing (1) vertex test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two identical squares @@ -229,8 +229,8 @@ namespace INTERP_TEST void SingleElementPlanarTests::identicalSquares() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_square1,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_square1,4,4); + std::deque< double > expected_result; expected_result.push_back(-1.);expected_result.push_back(1.); expected_result.push_back(-1.);expected_result.push_back(-1.); @@ -238,14 +238,14 @@ namespace INTERP_TEST expected_result.push_back(1.);expected_result.push_back(1.); CPPUNIT_ASSERT_MESSAGE("Identical squares test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::identicalSquares_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_square1,_square1,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1.);expected_result.push_back(1.); expected_result.push_back(-1.);expected_result.push_back(1.); @@ -253,7 +253,7 @@ namespace INTERP_TEST expected_result.push_back(1.);expected_result.push_back(-1.); CPPUNIT_ASSERT_MESSAGE("Identical squares test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Square and diamond intersecting with no degeneracy // /\ @@ -276,8 +276,8 @@ namespace INTERP_TEST void SingleElementPlanarTests::squareAndDiamondBasic() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_losange5,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_losange5,4,4); + std::deque< double > expected_result; expected_result.push_back(1.);expected_result.push_back(0.5); expected_result.push_back(0.5);expected_result.push_back(1.); @@ -289,14 +289,14 @@ namespace INTERP_TEST expected_result.push_back(1.);expected_result.push_back(-0.5); CPPUNIT_ASSERT_MESSAGE("Square and diamond basic test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::squareAndDiamondBasic_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_square1,_losange5,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1.);expected_result.push_back(0.); expected_result.push_back(1.);expected_result.push_back(0.5); @@ -331,8 +331,8 @@ namespace INTERP_TEST void SingleElementPlanarTests::squareAndDiamondCritical() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_losange1,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_losange1,4,4); + std::deque< double > expected_result; expected_result.push_back(0.);expected_result.push_back(-1.); expected_result.push_back(-1.);expected_result.push_back(0.); @@ -340,14 +340,14 @@ namespace INTERP_TEST expected_result.push_back(1.);expected_result.push_back(0.); CPPUNIT_ASSERT_MESSAGE("Square and diamond critical tangency test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::squareAndDiamondCritical_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_square1,_losange1,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(0.5);expected_result.push_back(0.5); expected_result.push_back(0.);expected_result.push_back(1.); @@ -377,8 +377,8 @@ namespace INTERP_TEST { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_losange6,_losange7,6,5); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_losange6,_losange7,6,5); + std::deque< double > expected_result; expected_result.push_back(0.5);expected_result.push_back(-0.5); expected_result.push_back(0.5);expected_result.push_back(-0.5); @@ -388,14 +388,14 @@ namespace INTERP_TEST expected_result.push_back(1);expected_result.push_back(0); CPPUNIT_ASSERT_MESSAGE("Basic diamond crossing test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::diamondsCritical_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_losange6,_losange7,6,5,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1);expected_result.push_back(0); expected_result.push_back(0.5);expected_result.push_back(0.5); @@ -403,7 +403,7 @@ namespace INTERP_TEST expected_result.push_back(0.5);expected_result.push_back(-0.5); CPPUNIT_ASSERT_MESSAGE("Basic diamond crossing test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two tangent squares with starting and ending vertices on edges @@ -419,8 +419,8 @@ namespace INTERP_TEST void SingleElementPlanarTests::quadranglesCritical() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_square4,_square3,4,5); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_square4,_square3,4,5); + std::deque< double > expected_result; expected_result.push_back(-0.5);expected_result.push_back(1.); expected_result.push_back(-0.5);expected_result.push_back(-1.); @@ -428,14 +428,14 @@ namespace INTERP_TEST expected_result.push_back(1.);expected_result.push_back(1.); CPPUNIT_ASSERT_MESSAGE("Critical quadrangles with tangency test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::quadranglesCritical_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_square4,_square3,4,5,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1.);expected_result.push_back(-1.); expected_result.push_back(1.);expected_result.push_back(0.5); @@ -447,7 +447,7 @@ namespace INTERP_TEST expected_result.push_back(-0.5);expected_result.push_back(-1.); CPPUNIT_ASSERT_MESSAGE("Critical quadrangles with tangency test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } @@ -465,8 +465,8 @@ namespace INTERP_TEST void SingleElementPlanarTests::quadrangleAndDiamondCritical() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_square5,_losange8,5,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_square5,_losange8,5,4); + std::deque< double > expected_result; expected_result.push_back(0.);expected_result.push_back(1.); expected_result.push_back(-0.5);expected_result.push_back(-1.); @@ -474,14 +474,14 @@ namespace INTERP_TEST expected_result.push_back(1.);expected_result.push_back(-1.); CPPUNIT_ASSERT_MESSAGE("Square and diamond critical tangency test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::quadrangleAndDiamondCritical_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_square5,_losange8,5,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1.);expected_result.push_back(-1.); expected_result.push_back(1./3);expected_result.push_back(1./3); @@ -492,7 +492,7 @@ namespace INTERP_TEST expected_result.push_back(0.);expected_result.push_back(-1.); CPPUNIT_ASSERT_MESSAGE("Square and diamond critical tangency test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // square and diamond intersecting at four degenerated pointss // // ²/²\ @@ -506,8 +506,8 @@ namespace INTERP_TEST void SingleElementPlanarTests::diamondsCritical2() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_losange9,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_losange9,4,4); + std::deque< double > expected_result; expected_result.push_back(0.);expected_result.push_back(-1.); expected_result.push_back(0.);expected_result.push_back(-1.); @@ -517,14 +517,14 @@ namespace INTERP_TEST expected_result.push_back(0.5);expected_result.push_back(0.); CPPUNIT_ASSERT_MESSAGE("Diamonds with crossing at double vertex test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::diamondsCritical2_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_losange1,_losange9,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(0.);expected_result.push_back(-1.); expected_result.push_back(0.5);expected_result.push_back(0.); @@ -532,7 +532,7 @@ namespace INTERP_TEST expected_result.push_back(-1.);expected_result.push_back(0.); CPPUNIT_ASSERT_MESSAGE("Diamonds with crossing at double vertex test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two tangent hexagons with double vertices and a critical starting vertex on edge @@ -552,8 +552,8 @@ namespace INTERP_TEST { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_hexagon1,_hexagon2,6,6); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_hexagon1,_hexagon2,6,6); + std::deque< double > expected_result; expected_result.push_back(5./3);expected_result.push_back(1./3); expected_result.push_back(1.);expected_result.push_back(-1.); @@ -563,14 +563,14 @@ namespace INTERP_TEST expected_result.push_back(1.);expected_result.push_back(1.); CPPUNIT_ASSERT_MESSAGE("First hexagon critical crossing test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::hexagonsCritical1_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_hexagon1,_hexagon2,6,6,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(-1.);expected_result.push_back(1.); expected_result.push_back(-1.5);expected_result.push_back(0.5); @@ -588,7 +588,7 @@ namespace INTERP_TEST expected_result.push_back(0.25);expected_result.push_back(0.75); CPPUNIT_ASSERT_MESSAGE("First hexagon critical crossing test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two tangent hexagons with double vertices and a critical starting vertex on edge @@ -607,23 +607,23 @@ namespace INTERP_TEST void SingleElementPlanarTests::hexagonsCritical2() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_hexagon1,_hexagon3,6,6); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_hexagon1,_hexagon3,6,6); + std::deque< double > expected_result; CPPUNIT_ASSERT_MESSAGE("Second hexagon critical crossing test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::hexagonsCritical2_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_hexagon1,_hexagon3,6,6,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1.);expected_result.push_back(1.); expected_result.push_back(-1.);expected_result.push_back(1.); CPPUNIT_ASSERT_MESSAGE("Second hexagon critical crossing test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Square and quadrilateron with outer tangency @@ -643,22 +643,22 @@ namespace INTERP_TEST void SingleElementPlanarTests::squareAndQuadrangleCritical() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_square6,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_square6,4,4); + std::deque< double > expected_result; - CPPUNIT_ASSERT_MESSAGE("Identical squares test failed (CONVEX)", (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + CPPUNIT_ASSERT_MESSAGE("Identical squares test failed (CONVEX)", (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::squareAndQuadrangleCritical_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_square1,_square6,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(-1.);expected_result.push_back(1.); expected_result.push_back(0.5);expected_result.push_back(1.); CPPUNIT_ASSERT_MESSAGE("Identical squares test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two diamonds sharing a vertex in an exclusion configuration // /\ @@ -683,22 +683,22 @@ namespace INTERP_TEST void SingleElementPlanarTests:: diamondsSharingVertex2() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_losange10,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_losange10,4,4); + std::deque< double > expected_result; CPPUNIT_ASSERT_MESSAGE("Diamond sharing vertex (2) test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests:: diamondsSharingVertex2_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_losange1,_losange10,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(0.);expected_result.push_back(-1.); CPPUNIT_ASSERT_MESSAGE("Diamond sharing vertex (2) test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Triangle and diamond with a critical crossing at double starting vertex @@ -716,29 +716,29 @@ namespace INTERP_TEST void SingleElementPlanarTests:: triangleAndDiamondCritical() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_triangle1,4,3); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_losange1,_triangle1,4,3); + std::deque< double > expected_result; expected_result.push_back(2./3);expected_result.push_back(1./3); expected_result.push_back(0.5);expected_result.push_back(0.); expected_result.push_back(0.);expected_result.push_back(1.); CPPUNIT_ASSERT_MESSAGE("Triangle and diamonds critical test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests:: triangleAndDiamondCritical_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_losange1,_triangle1,4,3,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(2./3);expected_result.push_back(1./3); expected_result.push_back(0.);expected_result.push_back(1.); expected_result.push_back(0.5);expected_result.push_back(0.); CPPUNIT_ASSERT_MESSAGE("Triangle and diamonds critical test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Basic triangle and square intersection (two distinct points) @@ -758,8 +758,8 @@ namespace INTERP_TEST void SingleElementPlanarTests::triangleAndSquareBasic() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_triangle2,4,3); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_square1,_triangle2,4,3); + std::deque< double > expected_result; expected_result.push_back(1.);expected_result.push_back(1./6); expected_result.push_back(1.);expected_result.push_back(-1./6); @@ -767,15 +767,15 @@ namespace INTERP_TEST expected_result.push_back(0.);expected_result.push_back(0.5); CPPUNIT_ASSERT_MESSAGE("Identical squares test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::triangleAndSquareBasic_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_square1,_triangle2,4,3,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1.);expected_result.push_back(1./6); expected_result.push_back(0.375);expected_result.push_back(0.375); @@ -785,7 +785,7 @@ namespace INTERP_TEST expected_result.push_back(1.);expected_result.push_back(-1./6); CPPUNIT_ASSERT_MESSAGE("Identical squares test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two triangles with a starting vertex on edge @@ -798,19 +798,19 @@ namespace INTERP_TEST void SingleElementPlanarTests::trianglesCritical() { INTERP_KERNEL::PolygonAlgorithms<3> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_triangle3,_triangle4,3,3); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_triangle3,_triangle4,3,3); + std::deque< double > expected_result; expected_result.push_back(2./3);expected_result.push_back(2.);expected_result.push_back(1./3); expected_result.push_back(0.5);expected_result.push_back(2.);expected_result.push_back(0.); expected_result.push_back(0.75);expected_result.push_back(2.);expected_result.push_back(0.25); CPPUNIT_ASSERT_MESSAGE("Triangles critical test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,3>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,3>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::trianglesCritical_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; double _triangle3rotated[6],_triangle4rotated[6]; for (int i=0; i<3; i++)_triangle3rotated[2*i] = _triangle3[3*i]; for (int i=0; i<3; i++)_triangle3rotated[2*i+1] = _triangle3[3*i+2]; @@ -819,14 +819,14 @@ namespace INTERP_TEST INTERP_KERNEL::intersec_de_polygone<2>(_triangle3rotated,_triangle4rotated,3,3,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(0.5);expected_result.push_back(0.); expected_result.push_back(2./3);expected_result.push_back(1./3); expected_result.push_back(0.75);expected_result.push_back(0.25); CPPUNIT_ASSERT_MESSAGE("Triangles critical test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two tangent paralellograms intersecting at 3 double vertices (one being a starting vertex) @@ -841,8 +841,8 @@ namespace INTERP_TEST void SingleElementPlanarTests::paralellogramsCritical1() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_parallel1,_parallel2,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_parallel1,_parallel2,4,4); + std::deque< double > expected_result; expected_result.push_back(0.);expected_result.push_back(0.); expected_result.push_back(0.);expected_result.push_back(0.); @@ -850,14 +850,14 @@ namespace INTERP_TEST expected_result.push_back(0.5);expected_result.push_back(1.); CPPUNIT_ASSERT_MESSAGE("Paralellogram tangency test (1) failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::paralellogramsCritical1_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_parallel1,_parallel2,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(0.25);expected_result.push_back(0.5); expected_result.push_back(0.5);expected_result.push_back(1.); @@ -867,7 +867,7 @@ namespace INTERP_TEST expected_result.push_back(0.);expected_result.push_back(0.); CPPUNIT_ASSERT_MESSAGE("Paralellogram tangency test (1) failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two paralellograms sharing a vertex in an exclusion configuration @@ -886,23 +886,23 @@ namespace INTERP_TEST void SingleElementPlanarTests::paralellogramsCritical2() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_parallel1,_parallel3,4,4); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_parallel1,_parallel3,4,4); + std::deque< double > expected_result; CPPUNIT_ASSERT_MESSAGE("Paralellogram tangency test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::paralellogramsCritical2_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_parallel1,_parallel3,4,4,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(0.);expected_result.push_back(0.); CPPUNIT_ASSERT_MESSAGE("Paralellogram tangency test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two triangles in a tangency configuration with a starting vertex on edge @@ -921,29 +921,29 @@ namespace INTERP_TEST void SingleElementPlanarTests::trianglesTangencyCritical() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_triangle5,_triangle6,3,3); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_triangle5,_triangle6,3,3); + std::deque< double > expected_result; expected_result.push_back(1./3);expected_result.push_back(1./2); expected_result.push_back(1./3);expected_result.push_back(1./3); expected_result.push_back(1./2);expected_result.push_back(1./2); CPPUNIT_ASSERT_MESSAGE("Triangles tangency critical test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::trianglesTangencyCritical_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_triangle5,_triangle6,3,3,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1./3);expected_result.push_back(1./2); expected_result.push_back(1./2);expected_result.push_back(1./2); expected_result.push_back(1./3);expected_result.push_back(1./3); CPPUNIT_ASSERT_MESSAGE("Triangles tangency critical test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // Two triangles with double starting point in an outer tangency configuration @@ -961,26 +961,26 @@ namespace INTERP_TEST void SingleElementPlanarTests::trianglesTangencyCritical2() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_triangle1,_triangle7,3,3); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_triangle1,_triangle7,3,3); + std::deque< double > expected_result; // if(!checkDequesEqual(actual_result,expected_result, _Epsilon)) // { - // cerr<< "CPP_UNIT expected result= " << endl; + // std::cerr<< "CPP_UNIT expected result= " << std::endl; // dequePrintOut(expected_result); - // cerr<< "CPP_UNIT actual result= " << endl; + // std::cerr<< "CPP_UNIT actual result= " << std::endl; // dequePrintOut(actual_result); // } CPPUNIT_ASSERT_MESSAGE("Triangles tangency critical (2) test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::trianglesTangencyCritical2_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_triangle1,_triangle7,3,3,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(1.);expected_result.push_back(1.); expected_result.push_back(0.);expected_result.push_back(1.); @@ -993,56 +993,56 @@ namespace INTERP_TEST // } CPPUNIT_ASSERT_MESSAGE("Triangles tangency critical (2) test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } // \brief Status : pass void SingleElementPlanarTests::trianglesTangencyCritical3() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_triangle8,_triangle9,3,3); - deque< double > expected_result; + std::deque< double > actual_result = intersector.intersectConvexPolygons(_triangle8,_triangle9,3,3); + std::deque< double > expected_result; CPPUNIT_ASSERT_MESSAGE("Triangles tangency critical (3) test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::trianglesTangencyCritical3_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_triangle8,_triangle9,3,3,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(22.4601);expected_result.push_back(35.2129); expected_result.push_back(13.9921);expected_result.push_back(34.693); CPPUNIT_ASSERT_MESSAGE("Triangles tangency critical (3) test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::trianglesTangencyCritical4() { INTERP_KERNEL::PolygonAlgorithms<2> intersector (_Epsilon, _Precision);; - deque< double > actual_result = intersector.intersectConvexPolygons(_triangle10,_triangle11,3,3); + std::deque< double > actual_result = intersector.intersectConvexPolygons(_triangle10,_triangle11,3,3); - deque< double > expected_result; + std::deque< double > expected_result; expected_result.push_back(82.745193090443536);expected_result.push_back(96.184114390029166); expected_result.push_back(82.260099999999994);expected_result.push_back(95.720200000000006); expected_result.push_back(80);expected_result.push_back(100.); CPPUNIT_ASSERT_MESSAGE("Triangles tangency critical (4) test failed (CONVEX)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } void SingleElementPlanarTests::trianglesTangencyCritical4_Triangulation() { - vector< double > actual_result; + std::vector< double > actual_result; INTERP_KERNEL::intersec_de_polygone<2>(_triangle10,_triangle11,3,3,actual_result,_Epsilon/_Precision, _Precision ); - vector< double > expected_result; + std::vector< double > expected_result; expected_result.push_back(80);expected_result.push_back(100.); expected_result.push_back(82.745193090443536);expected_result.push_back(96.184114390029166); expected_result.push_back(82.260099999999994);expected_result.push_back(95.720200000000006); CPPUNIT_ASSERT_MESSAGE("Triangles tangency critical (4) test failed (TRIANGULATION)", - (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); + (INTERP_KERNEL::checkEqualPolygons,2>(&actual_result, &expected_result, _Epsilon))); } } diff --git a/src/INTERP_KERNELTest/TestingUtils.hxx b/src/INTERP_KERNELTest/TestingUtils.hxx index 1057f58c2..82d26c173 100644 --- a/src/INTERP_KERNELTest/TestingUtils.hxx +++ b/src/INTERP_KERNELTest/TestingUtils.hxx @@ -39,7 +39,6 @@ #include "Log.hxx" using namespace MEDMEM; -using namespace std; using namespace INTERP_KERNEL; using namespace MED_EN; @@ -50,7 +49,7 @@ double sumVolume(const IntersectionMatrix& m) vector volumes; for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { volumes.push_back(iter2->second); // vol += std::fabs(iter2->second); @@ -73,7 +72,7 @@ bool areCompatitable(const IntersectionMatrix& m1, const IntersectionMatrix& m2) int i = 0; for(IntersectionMatrix::const_iterator iter = m1.begin() ; iter != m1.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { int j = iter2->first; if(m2.at(j-1).count(i+1) == 0) @@ -108,13 +107,13 @@ bool testSymmetric(const IntersectionMatrix& m1, const IntersectionMatrix& m2) for(IntersectionMatrix::const_iterator iter = m1.begin() ; iter != m1.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { int j = iter2->first; const double v1 = iter2->second; //if(m2[j - 1].count(i+1) > 0) // { - map theMap = m2.at(j-1); + std::map theMap = m2.at(j-1); const double v2 = theMap[i + 1]; if(v1 != v2) { @@ -142,7 +141,7 @@ bool testDiagonal(const IntersectionMatrix& m) bool isDiagonal = true; for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { int j = iter2->first; const double vol = iter2->second; @@ -170,13 +169,13 @@ bool testDiagonal(const IntersectionMatrix& m) void dumpIntersectionMatrix(const IntersectionMatrix& m) { int i = 0; - std::cout << "Intersection matrix is " << endl; + std::cout << "Intersection matrix is " << std::endl; for(IntersectionMatrix::const_iterator iter = m.begin() ; iter != m.end() ; ++iter) { - for(map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) + for(std::map::const_iterator iter2 = iter->begin() ; iter2 != iter->end() ; ++iter2) { - std::cout << "V(" << i << ", " << iter2->first << ") = " << iter2->second << endl; + std::cout << "V(" << i << ", " << iter2->first << ") = " << iter2->second << std::endl; } ++i; @@ -206,8 +205,8 @@ std::pair countNumberOfMatrixEntries(const IntersectionMatrix& m) void calcIntersectionMatrix(const char* mesh1path, const char* mesh1, const char* mesh2path, const char* mesh2, IntersectionMatrix& m) { - const string dataBaseDir = getenv("MED_ROOT_DIR"); - const string dataDir = dataBaseDir + "/share/salome/resources/med/"; + const std::string dataBaseDir = getenv("MED_ROOT_DIR"); + const std::string dataDir = dataBaseDir + "/share/salome/resources/med/"; LOG(1, std::endl << "=== -> intersecting src = " << mesh1 << ", target = " << mesh2 ); diff --git a/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx b/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx index d39f9e661..7ee17407c 100644 --- a/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx +++ b/src/INTERP_KERNELTest/UnitTetraIntersectionBaryTest.cxx @@ -29,7 +29,6 @@ #include using namespace INTERP_KERNEL; -using namespace std; namespace INTERP_TEST { @@ -323,7 +322,7 @@ namespace INTERP_TEST {-4.0, 9.0, 3.0 }, { 0.0, 0.0, 0.0 }, { 6.0, 1.0,10.0 }}; - vector n (4); + std::vector n (4); n[0] = &nodes[0][0]; n[1] = &nodes[1][0]; n[2] = &nodes[2][0]; diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx index e0606fd52..eb8325f9b 100644 --- a/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx +++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest0.cxx @@ -22,7 +22,6 @@ #include "MEDCouplingFieldDouble.hxx" #include "MEDCouplingMemArray.hxx" -using namespace std; using namespace ParaMEDMEM; MEDCouplingUMesh *MEDCouplingBasicsTest::build3DSourceMesh_2() diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx index 37cb83d59..d0a94972f 100644 --- a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx +++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx @@ -26,7 +26,6 @@ #include #include -using namespace std; using namespace ParaMEDMEM; void MEDCouplingBasicsTest::testArray() @@ -95,7 +94,7 @@ void MEDCouplingBasicsTest::testMesh() //test 1 - no copy ownership C++ myCoords=DataArrayDouble::New(); double *tmp=new double[3*nbOfNodes]; - copy(coords,coords+3*nbOfNodes,tmp); + std::copy(coords,coords+3*nbOfNodes,tmp); myCoords->useArray(tmp,true,CPP_DEALLOC,nbOfNodes,3); mesh->setCoords(myCoords); myCoords->decrRef(); @@ -104,7 +103,7 @@ void MEDCouplingBasicsTest::testMesh() //test 2 - no copy ownership C myCoords=DataArrayDouble::New(); tmp=(double *)malloc(3*nbOfNodes*sizeof(double)); - copy(coords,coords+3*nbOfNodes,tmp); + std::copy(coords,coords+3*nbOfNodes,tmp); myCoords->useArray(tmp,true,C_DEALLOC,nbOfNodes,3); mesh->setCoords(myCoords); myCoords->decrRef(); @@ -114,7 +113,7 @@ void MEDCouplingBasicsTest::testMesh() myCoords=DataArrayDouble::New(); myCoords->alloc(nbOfNodes,3); tmp=myCoords->getPointer(); - copy(coords,coords+3*nbOfNodes,tmp); + std::copy(coords,coords+3*nbOfNodes,tmp); // test 3 bis deepcopy DataArrayDouble *myCoords2=DataArrayDouble::New(); *myCoords2=*myCoords; @@ -163,7 +162,7 @@ void MEDCouplingBasicsTest::testMesh() fieldOnCells->setArray(array); tmp=array->getPointer(); array->decrRef(); - fill(tmp,tmp+9*nbOfCells,7.); + std::fill(tmp,tmp+9*nbOfCells,7.); //content of field changed -> declare it. fieldOnCells->declareAsNew(); fieldOnCells->checkCoherency(); @@ -249,7 +248,7 @@ void MEDCouplingBasicsTest::testMeshM1D() fieldOnCells->setArray(array); double *tmp=array->getPointer(); array->decrRef(); - fill(tmp,tmp+6,7.); + std::fill(tmp,tmp+6,7.); fieldOnCells->checkCoherency(); // fieldOnCells->decrRef(); @@ -260,7 +259,7 @@ void MEDCouplingBasicsTest::testDeepCopy() { DataArrayDouble *array=DataArrayDouble::New(); array->alloc(5,3); - fill(array->getPointer(),array->getPointer()+5*3,7.); + std::fill(array->getPointer(),array->getPointer()+5*3,7.); CPPUNIT_ASSERT_DOUBLES_EQUAL(7.,array->getIJ(3,2),1e-14); double *tmp1=array->getPointer(); DataArrayDouble *array2=array->deepCopy(); @@ -272,7 +271,7 @@ void MEDCouplingBasicsTest::testDeepCopy() // DataArrayInt *array3=DataArrayInt::New(); array3->alloc(5,3); - fill(array3->getPointer(),array3->getPointer()+5*3,17); + std::fill(array3->getPointer(),array3->getPointer()+5*3,17); CPPUNIT_ASSERT_EQUAL(17,array3->getIJ(3,2)); int *tmp3=array3->getPointer(); DataArrayInt *array4=array3->deepCopy(); diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx index 524062851..eaa193d8a 100644 --- a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx +++ b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx @@ -35,7 +35,6 @@ #include #include -using namespace std; using namespace ParaMEDMEM; void MEDCouplingBasicsTest::test2DInterpP0P0_1() @@ -46,7 +45,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P0_1() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; INTERP_KERNEL::IntersectionType types[3]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Convex, INTERP_KERNEL::Geometric2D}; for(int i=0;i<3;i++) { @@ -77,7 +76,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P0PL_1() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; // myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -108,7 +107,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P0PL_2() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; // myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -139,7 +138,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P0PL_3() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; // myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -174,7 +173,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P0PL_4() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; // myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -200,7 +199,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P1_1() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D}; for(int i=0;i<2;i++) { @@ -236,7 +235,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P1PL_1() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1"); @@ -278,7 +277,7 @@ void MEDCouplingBasicsTest::test2DInterpP0P1PL_2() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1"); @@ -310,7 +309,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P0_1() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D}; for(int i=0;i<2;i++) { @@ -343,7 +342,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P0PL_1() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0"); @@ -385,7 +384,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P0PL_2() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0"); @@ -422,7 +421,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P1_1() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D}; for(int i=0;i<2;i++) { @@ -461,7 +460,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P1PL_1() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1"); @@ -495,7 +494,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P0_1() MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3DSurf myInterpolator; - vector > res; + std::vector > res; INTERP_KERNEL::IntersectionType types[3]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D}; for(int i=0;i<2;i++) { @@ -526,7 +525,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P0PL_1() MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3DSurf myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -553,7 +552,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P1_1() MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3DSurf myInterpolator; - vector > res; + std::vector > res; INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D}; for(int i=0;i<2;i++) { @@ -589,7 +588,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P1PL_1() MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3DSurf myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1"); @@ -621,7 +620,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP1P0_1() MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3DSurf myInterpolator; - vector > res; + std::vector > res; INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D}; for(int i=0;i<2;i++) { @@ -654,7 +653,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP1P0PL_1() MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3DSurf myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0"); @@ -691,7 +690,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP1P1_1() MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3DSurf myInterpolator; - vector > res; + std::vector > res; INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D}; for(int i=0;i<2;i++) { @@ -730,7 +729,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP1P1PL_1() MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3DSurf myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1"); @@ -764,7 +763,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P0_2() MEDCouplingNormalizedUnstructuredMesh<3,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3DSurf myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::Triangulation); { @@ -827,7 +826,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0P0_2() void MEDCouplingBasicsTest::test3DSurfInterpP0P0_3() { INTERP_KERNEL::Interpolation3DSurf myInterpolator; - vector > res; + std::vector > res; double vecTrans[3]={0.,0.,1.e-10}; double vec[3]={0.,-1.,0.}; double pt[3]={-0.3,-0.3,5.e-11}; @@ -922,7 +921,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0_1() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); CPPUNIT_ASSERT_EQUAL(8,(int)res.size()); @@ -984,7 +983,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0PL_1() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -1028,7 +1027,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0PL_2() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -1072,7 +1071,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0PL_3() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -1120,7 +1119,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0PL_4() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -1160,7 +1159,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P1_1() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1"); CPPUNIT_ASSERT_EQUAL(9,(int)res.size()); @@ -1210,7 +1209,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P1PL_1() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1"); @@ -1238,7 +1237,7 @@ void MEDCouplingBasicsTest::test3DInterpP1P0_1() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0"); CPPUNIT_ASSERT_EQUAL(8,(int)res.size()); @@ -1288,7 +1287,7 @@ void MEDCouplingBasicsTest::test3DInterpP1P0PL_1() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0"); @@ -1330,7 +1329,7 @@ void MEDCouplingBasicsTest::test3DInterpP1P1_1() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1"); CPPUNIT_ASSERT_EQUAL(8,(int)res.size()); @@ -1380,7 +1379,7 @@ void MEDCouplingBasicsTest::test3DInterpP1P1PL_1() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1"); @@ -1420,7 +1419,7 @@ void MEDCouplingBasicsTest::test3DInterpP0P0Empty() MEDCouplingNormalizedUnstructuredMesh<2,2> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); //clean up @@ -1453,16 +1452,16 @@ void MEDCouplingBasicsTest::testInterpolationCC() CPPUNIT_ASSERT_THROW( sourceWrapper.nbCellsAlongAxis(3), INTERP_KERNEL::Exception); INTERP_KERNEL::InterpolationCC myInterpolator; - vector > res; + std::vector > res; myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); CPPUNIT_ASSERT_EQUAL(8,int( res.size())); CPPUNIT_ASSERT_EQUAL(8,int( res[0].size())); const double precis = 1e-7; - set vals; + std::set vals; double sum = 0; for ( int i = 0; i < (int)res.size(); ++i ) - for ( map::iterator s_v = res[i].begin(); s_v != res[i].end(); ++s_v) + for ( std::map::iterator s_v = res[i].begin(); s_v != res[i].end(); ++s_v) { sum += s_v->second; double vvv; @@ -1484,7 +1483,7 @@ void MEDCouplingBasicsTest::testInterpolationCC() //cout << "tgt: " << i << " src: " << s_v->first << " - w: " << s_v->second << endl; CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, sum, precis ); - set::iterator v = vals.begin(); + std::set::iterator v = vals.begin(); CPPUNIT_ASSERT_EQUAL( 4, int( vals.size()) ); CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00462963, *v++, precis ); CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.00925926, *v++, precis ); @@ -1509,16 +1508,16 @@ void MEDCouplingBasicsTest::testInterpolationCU1D() MEDCouplingNormalizedCartesianMesh<1> sourceWrapper(meshC); MEDCouplingNormalizedUnstructuredMesh<1,1> targetWrapper(meshU); INTERP_KERNEL::InterpolationCU myInterpolator; - vector > res; + std::vector > res; const double precis = 1e-13; myInterpolator.setPrecision(precis); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); -// cout.precision(18); +// std::cout.precision(18); // for ( int i = 0; i < (int)res.size(); ++i ) -// for ( map::iterator s_v = res[i].begin(); s_v != res[i].end(); ++s_v) +// for ( std::map::iterator s_v = res[i].begin(); s_v != res[i].end(); ++s_v) // { -// cout << "CPPUNIT_ASSERT_DOUBLES_EQUAL( "<second<<" ,res["<first<<"],precis);"<second<<" ,res["<first<<"],precis);"< sourceWrapper(meshC); MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(meshU); INTERP_KERNEL::InterpolationCU myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -1575,7 +1574,7 @@ void MEDCouplingBasicsTest::testInterpolationCU2D() CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0972222 ,res[4][2],precis); CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0138889 ,res[4][5],precis); - vector > resRev; + std::vector > resRev; myInterpolator.interpolateMeshesRev(targetWrapper,sourceWrapper,resRev,"P0P0"); CPPUNIT_ASSERT_DOUBLES_EQUAL( res[0][0] ,resRev[0][0],precis); @@ -1616,7 +1615,7 @@ void MEDCouplingBasicsTest::testInterpolationCU3D() MEDCouplingNormalizedCartesianMesh<3> sourceWrapper(meshC); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(meshU); INTERP_KERNEL::InterpolationCU myInterpolator; - vector > res; + std::vector > res; const double precis = 1e-13; myInterpolator.setPrecision(precis); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -1700,7 +1699,7 @@ void MEDCouplingBasicsTest::test2DInterpP0IntegralUniform() // MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; CPPUNIT_ASSERT_EQUAL(5,myInterpolator.toIntegralUniform(targetWrapper,res,"P0")); CPPUNIT_ASSERT_EQUAL(1,(int)res.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25,res[0][0],1e-12); @@ -1752,7 +1751,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP0IntegralUniform() MEDCouplingUMesh *targetMesh=build3DSurfTargetMesh_1(); INTERP_KERNEL::Interpolation3DSurf myInterpolator; MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); - vector > res; + std::vector > res; CPPUNIT_ASSERT_EQUAL(5,myInterpolator.toIntegralUniform(targetWrapper,res,"P0")); CPPUNIT_ASSERT_EQUAL(1,(int)res.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25*sqrt(2.),res[0][0],1e-12); @@ -1778,7 +1777,7 @@ void MEDCouplingBasicsTest::test3DInterpP0IntegralUniform() MEDCouplingUMesh *targetMesh=build3DTargetMesh_1(); INTERP_KERNEL::Interpolation3D myInterpolator; MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); - vector > res; + std::vector > res; CPPUNIT_ASSERT_EQUAL(8,myInterpolator.toIntegralUniform(targetWrapper,res,"P0")); CPPUNIT_ASSERT_EQUAL(1,(int)res.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(125000.,res[0][0],1e-6); @@ -1812,7 +1811,7 @@ void MEDCouplingBasicsTest::test2DInterpP1IntegralUniform() // MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; - vector > res; + std::vector > res; CPPUNIT_ASSERT_EQUAL(4,myInterpolator.toIntegralUniform(targetWrapper,res,"P1")); CPPUNIT_ASSERT_EQUAL(1,(int)res.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.33333333333333331,res[0][0],1e-12); @@ -1836,7 +1835,7 @@ void MEDCouplingBasicsTest::test3DInterpP1IntegralUniform() // MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(sourceMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; CPPUNIT_ASSERT_EQUAL(9,myInterpolator.toIntegralUniform(targetWrapper,res,"P1")); CPPUNIT_ASSERT_EQUAL(1,(int)res.size()); CPPUNIT_ASSERT_DOUBLES_EQUAL(833333.333333333,res[0][0],1e-6); @@ -1874,7 +1873,7 @@ void MEDCouplingBasicsTest::test2DInterpP1P0Bary_1() MEDCouplingNormalizedUnstructuredMesh<2,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation2D myInterpolator; myInterpolator.setP1P0BaryMethod(true); - vector > res; + std::vector > res; INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D}; for(int i=0;i<2;i++) { @@ -1916,7 +1915,7 @@ void MEDCouplingBasicsTest::test3DSurfInterpP1P0Bary_1() MEDCouplingNormalizedUnstructuredMesh<3,2> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3DSurf myInterpolator; myInterpolator.setP1P0BaryMethod(true); - vector > res; + std::vector > res; INTERP_KERNEL::IntersectionType types[2]={INTERP_KERNEL::Triangulation, INTERP_KERNEL::Geometric2D}; for(int i=0;i<2;i++) { @@ -1959,7 +1958,7 @@ void MEDCouplingBasicsTest::test3DInterpP1P0Bary_1() MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; myInterpolator.setP1P0BaryMethod(true); - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0"); CPPUNIT_ASSERT_EQUAL(5,(int)res.size()); @@ -2002,7 +2001,7 @@ void MEDCouplingBasicsTest::test3DTo1DInterpP0P0PL_1() MEDCouplingNormalizedUnstructuredMesh<3,3> sourceWrapper(sourceMesh); MEDCouplingNormalizedUnstructuredMesh<3,3> targetWrapper(targetMesh); INTERP_KERNEL::Interpolation3D myInterpolator; - vector > res; + std::vector > res; myInterpolator.setPrecision(1e-12); myInterpolator.setIntersectionType(INTERP_KERNEL::PointLocator); myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); @@ -2040,7 +2039,7 @@ void MEDCouplingBasicsTest::test1DInterp_1() myInterpolator.setPrecision(precis); // P0P0 - vector > res; + std::vector > res; myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); CPPUNIT_ASSERT_EQUAL( 3, int( res.size()) ); CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.5, res[0][0], precis); @@ -2097,7 +2096,7 @@ void MEDCouplingBasicsTest::test2DCurveInterpP0P0_1() INTERP_KERNEL::Interpolation2DCurve myInterpolator; const double precis = 1e-13; myInterpolator.setPrecision(precis); - vector > res; + std::vector > res; myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); CPPUNIT_ASSERT_EQUAL( 2, int( res.size()) ); @@ -2121,7 +2120,7 @@ void MEDCouplingBasicsTest::test2DCurveInterpP0P0_2() const double precis = 1e-13; myInterpolator.setPrecision(precis); myInterpolator.setMedianPlane(1.);// median line on target - vector > res; + std::vector > res; myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P0"); double tolInters = myInterpolator.getBoundingBoxAdjustmentAbs() * sqrt(2.); @@ -2146,7 +2145,7 @@ void MEDCouplingBasicsTest::test2DCurveInterpP0P1_1() INTERP_KERNEL::Interpolation2DCurve myInterpolator; const double precis = 1e-13; myInterpolator.setPrecision(precis); - vector > res; + std::vector > res; myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P0P1"); const double len1 = 1., len0 = sqrt(2.); @@ -2172,7 +2171,7 @@ void MEDCouplingBasicsTest::test2DCurveInterpP1P0_1() INTERP_KERNEL::Interpolation2DCurve myInterpolator; const double precis = 1e-13; myInterpolator.setPrecision(precis); - vector > res; + std::vector > res; myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P0"); const double len1 = 1., len0 = sqrt(2.); @@ -2198,7 +2197,7 @@ void MEDCouplingBasicsTest::test2DCurveInterpP1P1_1() INTERP_KERNEL::Interpolation2DCurve myInterpolator; const double precis = 1e-13; myInterpolator.setPrecision(precis); - vector > res; + std::vector > res; myInterpolator.interpolateMeshes(sourceWrapper,targetWrapper,res,"P1P1"); const double len1 = 1., len0 = sqrt(2.); diff --git a/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx b/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx index 90a739138..f77532da0 100644 --- a/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx +++ b/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx @@ -25,7 +25,6 @@ #include -using namespace std; using namespace ParaMEDMEM; void MEDCouplingRemapperTest::test2DInterpP0P0_1()