]> SALOME platform Git repositories - tools/medcoupling.git/commitdiff
Salome HOME
normalization of static method name.
authorageay <ageay>
Fri, 17 Feb 2012 08:57:07 +0000 (08:57 +0000)
committerageay <ageay>
Fri, 17 Feb 2012 08:57:07 +0000 (08:57 +0000)
src/INTERP_KERNELTest/QuadraticPlanarInterpTest2.cxx
src/INTERP_KERNELTest/QuadraticPlanarInterpTest3.cxx
src/INTERP_KERNELTest/QuadraticPlanarInterpTest4.cxx

index 9c3d10beb8512d6cc779f08acee89978543e89f0..b7205ad17406f02ba2d8e3d356d80381366b2f28 100644 (file)
@@ -645,7 +645,7 @@ QuadraticPolygon *QuadraticPlanarInterpTest::buildQuadraticPolygonCoarseInfo(con
   std::vector<INTERP_KERNEL::Node *> nodes;
   for(int i=0;i<lgth;i++)
     nodes.push_back(new INTERP_KERNEL::Node(coords[2*conn[i]],coords[2*conn[i]+1]));
-  return INTERP_KERNEL::QuadraticPolygon::buildArcCirclePolygon(nodes);
+  return INTERP_KERNEL::QuadraticPolygon::BuildArcCirclePolygon(nodes);
 }
 
 EdgeArcCircle *QuadraticPlanarInterpTest::buildArcOfCircle(const double *center, double radius, double alphaStart, double alphaEnd)
index 4888a55a99c3e79fc52930c8f02f38f2cd0659a4..b08cae9ac7f41b7cc1729d19bc0630aa928cd3e9 100644 (file)
@@ -190,7 +190,7 @@ void QuadraticPlanarInterpTest::checkAssemblingBases2()
   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);
   QuadraticPolygon cpyPol1(pol1); int nbOfSplits=0;
-  cpyPol1.splitPolygonsEachOther(pol1,pol2,nbOfSplits);
+  cpyPol1.SplitPolygonsEachOther(pol1,pol2,nbOfSplits);
   CPPUNIT_ASSERT_EQUAL(5,pol1.recursiveSize());
   CPPUNIT_ASSERT_EQUAL(5,pol2.recursiveSize());CPPUNIT_ASSERT_EQUAL(15,nbOfSplits);
   checkBasicsOfPolygons(pol1,pol2,true);
@@ -226,7 +226,7 @@ void QuadraticPlanarInterpTest::checkAssemblingBases2()
   QuadraticPolygon pol3; pol3.pushBack(e1_2); pol3.pushBack(e2_3); pol3.pushBack(e3_1);
   QuadraticPolygon pol4; pol4.pushBack(e5_4); pol4.pushBack(e4_7); pol4.pushBack(e7_6); pol4.pushBack(e6_5);
   QuadraticPolygon cpyPol3(pol3); nbOfSplits=0;
-  cpyPol3.splitPolygonsEachOther(pol3,pol4,nbOfSplits);
+  cpyPol3.SplitPolygonsEachOther(pol3,pol4,nbOfSplits);
   CPPUNIT_ASSERT_EQUAL(5,pol3.recursiveSize());
   CPPUNIT_ASSERT_EQUAL(4,pol4.recursiveSize());CPPUNIT_ASSERT_EQUAL(16,nbOfSplits);
   checkBasicsOfPolygons(pol3,pol4,true);
@@ -259,7 +259,7 @@ void QuadraticPlanarInterpTest::checkAssemblingBases2()
   QuadraticPolygon pol5; pol5.pushBack(e1_2); pol5.pushBack(e2_3); pol5.pushBack(e3_1);
   QuadraticPolygon pol6; pol6.pushBack(e4_5); pol6.pushBack(e5_6); pol6.pushBack(e6_4);
   QuadraticPolygon cpyPol5(pol5); nbOfSplits=0;
-  cpyPol5.splitPolygonsEachOther(pol5,pol6,nbOfSplits);
+  cpyPol5.SplitPolygonsEachOther(pol5,pol6,nbOfSplits);
   CPPUNIT_ASSERT_EQUAL(4,pol5.recursiveSize());
   CPPUNIT_ASSERT_EQUAL(4,pol6.recursiveSize()); CPPUNIT_ASSERT_EQUAL(13,nbOfSplits);
   checkBasicsOfPolygons(pol5,pol6,false);
@@ -291,7 +291,7 @@ void QuadraticPlanarInterpTest::checkAssemblingBases2()
   QuadraticPolygon pol7; pol7.pushBack(e1_2); pol7.pushBack(e2_3); pol7.pushBack(e3_1);
   QuadraticPolygon pol8; pol8.pushBack(e4_5); pol8.pushBack(e5_6); pol8.pushBack(e6_4);
   QuadraticPolygon cpyPol7(pol7); nbOfSplits=0;
-  cpyPol7.splitPolygonsEachOther(pol7,pol8,nbOfSplits);
+  cpyPol7.SplitPolygonsEachOther(pol7,pol8,nbOfSplits);
   tmp=dynamic_cast<ElementaryEdge *>(pol8[0]); CPPUNIT_ASSERT(tmp); CPPUNIT_ASSERT(tmp->getPtr()==e1_2);
   CPPUNIT_ASSERT(tmp->getLoc()==FULL_ON_1);
   tmp=dynamic_cast<ElementaryEdge *>(pol8[1]); CPPUNIT_ASSERT(tmp); CPPUNIT_ASSERT(tmp->getPtr()==e2_3);
index d2d2de311831ec285ca63a5d5f693216adebea8c..f164fec79be6195d993df58187183777207f4019 100644 (file)
@@ -511,7 +511,7 @@ void QuadraticPlanarInterpTest::checkHighLevelFunctionTest1()
   nodes.push_back(new Node(coords+6));
   nodes.push_back(new Node(coords+8));
   nodes.push_back(new Node(coords+10));
-  QuadraticPolygon *pol=QuadraticPolygon::buildArcCirclePolygon(nodes);
+  QuadraticPolygon *pol=QuadraticPolygon::BuildArcCirclePolygon(nodes);
   CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.04719755,pol->getArea(),1e-5);
   CPPUNIT_ASSERT_EQUAL(3,pol->size());
   ElementaryEdge *e0=dynamic_cast<ElementaryEdge *>((*pol)[0]);
@@ -529,7 +529,7 @@ void QuadraticPlanarInterpTest::checkHighLevelFunctionTest1()
   nodes.push_back(new Node(coords+10));
   nodes.push_back(new Node(coords+8));
   nodes.push_back(new Node(coords+6));
-  pol=QuadraticPolygon::buildArcCirclePolygon(nodes);
+  pol=QuadraticPolygon::BuildArcCirclePolygon(nodes);
   CPPUNIT_ASSERT_DOUBLES_EQUAL(1.04719755,pol->getArea(),1e-5);
   CPPUNIT_ASSERT_EQUAL(3,pol->size());
   e0=dynamic_cast<ElementaryEdge *>((*pol)[0]);
@@ -551,7 +551,7 @@ void QuadraticPlanarInterpTest::checkHighLevelFunctionTest1()
   nodes.push_back(new Node(coords2+2));
   nodes.push_back(new Node(coords2+4));
   nodes.push_back(new Node(coords2+6));
-  pol=QuadraticPolygon::buildLinearPolygon(nodes);
+  pol=QuadraticPolygon::BuildLinearPolygon(nodes);
   CPPUNIT_ASSERT_DOUBLES_EQUAL(1.5,pol->getArea(),1e-12);
   double tmp[2],tmp2;
   pol->getBarycenter(tmp,tmp2);
@@ -577,7 +577,7 @@ void QuadraticPlanarInterpTest::checkHighLevelFunctionTest1()
   nodes.push_back(new Node(coords3+10));
   nodes.push_back(new Node(coords3+12));
   nodes.push_back(new Node(coords3+14));
-  pol=QuadraticPolygon::buildArcCirclePolygon(nodes);
+  pol=QuadraticPolygon::BuildArcCirclePolygon(nodes);
   pol->getBarycenter(tmp,tmp2);
   delete pol;
   QUADRATIC_PLANAR::setPrecision(1e-14);
@@ -741,7 +741,7 @@ void QuadraticPlanarInterpTest::checkNonRegression2()
   nodes1.push_back(new Node(coords1+10));
   nodes1.push_back(new Node(coords1+12));
   nodes1.push_back(new Node(coords1+14));
-  QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1);
+  QuadraticPolygon *pol1=QuadraticPolygon::BuildArcCirclePolygon(nodes1);
   std::vector<Node *> nodes2;
   nodes2.push_back(new Node(coords2));
   nodes2.push_back(new Node(coords2+2));
@@ -751,7 +751,7 @@ void QuadraticPlanarInterpTest::checkNonRegression2()
   nodes2.push_back(new Node(coords2+10));
   nodes2.push_back(new Node(coords2+12));
   nodes2.push_back(new Node(coords2+14));
-  QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2);
+  QuadraticPolygon *pol2=QuadraticPolygon::BuildArcCirclePolygon(nodes2);
   std::vector<QuadraticPolygon *> v=pol1->intersectMySelfWith(*pol2);
   CPPUNIT_ASSERT_EQUAL(1,(int)v.size());
   CPPUNIT_ASSERT_DOUBLES_EQUAL(0.00173945,v[0]->getArea(),1e-7);
@@ -834,7 +834,7 @@ void QuadraticPlanarInterpTest::checkNonRegression4()
   nodes1.push_back(new Node(coords1+10));
   nodes1.push_back(new Node(coords1+12));
   nodes1.push_back(new Node(coords1+14));
-  QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1);
+  QuadraticPolygon *pol1=QuadraticPolygon::BuildArcCirclePolygon(nodes1);
   std::vector<Node *> nodes2;
   nodes2.push_back(new Node(coords2));
   nodes2.push_back(new Node(coords2+2));
@@ -844,7 +844,7 @@ void QuadraticPlanarInterpTest::checkNonRegression4()
   nodes2.push_back(new Node(coords2+10));
   nodes2.push_back(new Node(coords2+12));
   nodes2.push_back(new Node(coords2+14));
-  QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2);
+  QuadraticPolygon *pol2=QuadraticPolygon::BuildArcCirclePolygon(nodes2);
   std::vector<QuadraticPolygon *> v=pol1->intersectMySelfWith(*pol2);
   CPPUNIT_ASSERT_EQUAL(1,(int)v.size());
   CPPUNIT_ASSERT_DOUBLES_EQUAL(0.00164773941455998,v[0]->getArea(),1e-7);
@@ -890,7 +890,7 @@ void QuadraticPlanarInterpTest::checkNonRegression5()
   nodes1.push_back(new Node(coords1+10));
   nodes1.push_back(new Node(coords1+12));
   nodes1.push_back(new Node(coords1+14));
-  QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1);
+  QuadraticPolygon *pol1=QuadraticPolygon::BuildArcCirclePolygon(nodes1);
   std::vector<Node *> nodes2;
   nodes2.push_back(new Node(coords2));
   nodes2.push_back(new Node(coords2+2));
@@ -900,7 +900,7 @@ void QuadraticPlanarInterpTest::checkNonRegression5()
   nodes2.push_back(new Node(coords2+10));
   nodes2.push_back(new Node(coords2+12));
   nodes2.push_back(new Node(coords2+14));
-  QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2);
+  QuadraticPolygon *pol2=QuadraticPolygon::BuildArcCirclePolygon(nodes2);
   std::vector<QuadraticPolygon *> v=pol1->intersectMySelfWith(*pol2);
   CPPUNIT_ASSERT_EQUAL(0,(int)v.size());
   //CPPUNIT_ASSERT_DOUBLES_EQUAL(0.00164773941455998,v[0]->getArea(),1e-7);
@@ -943,7 +943,7 @@ void QuadraticPlanarInterpTest::checkNonRegression6()
   nodes1.push_back(new Node(coords1+10));
   nodes1.push_back(new Node(coords1+12));
   nodes1.push_back(new Node(coords1+14));
-  QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1);
+  QuadraticPolygon *pol1=QuadraticPolygon::BuildArcCirclePolygon(nodes1);
   std::vector<Node *> nodes2;
   nodes2.push_back(new Node(coords2));
   nodes2.push_back(new Node(coords2+2));
@@ -953,7 +953,7 @@ void QuadraticPlanarInterpTest::checkNonRegression6()
   nodes2.push_back(new Node(coords2+10));
   nodes2.push_back(new Node(coords2+12));
   nodes2.push_back(new Node(coords2+14));
-  QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2);
+  QuadraticPolygon *pol2=QuadraticPolygon::BuildArcCirclePolygon(nodes2);
   std::vector<QuadraticPolygon *> v=pol1->intersectMySelfWith(*pol2);
   CPPUNIT_ASSERT_EQUAL(1,(int)v.size());
   CPPUNIT_ASSERT_DOUBLES_EQUAL(v[0]->getArea(),0.0150659,1e-7);
@@ -995,7 +995,7 @@ void QuadraticPlanarInterpTest::checkNonRegression7()
   nodes1.push_back(new Node(coords1+10));
   nodes1.push_back(new Node(coords1+12));
   nodes1.push_back(new Node(coords1+14));
-  QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1);
+  QuadraticPolygon *pol1=QuadraticPolygon::BuildArcCirclePolygon(nodes1);
   std::vector<Node *> nodes2;
   nodes2.push_back(new Node(coords2));
   nodes2.push_back(new Node(coords2+2));
@@ -1005,7 +1005,7 @@ void QuadraticPlanarInterpTest::checkNonRegression7()
   nodes2.push_back(new Node(coords2+10));
   nodes2.push_back(new Node(coords2+12));
   nodes2.push_back(new Node(coords2+14));
-  QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2);
+  QuadraticPolygon *pol2=QuadraticPolygon::BuildArcCirclePolygon(nodes2);
   std::vector<QuadraticPolygon *> v=pol1->intersectMySelfWith(*pol2);
   CPPUNIT_ASSERT_EQUAL(1,(int)v.size());
   CPPUNIT_ASSERT_DOUBLES_EQUAL(0.121795,v[0]->getArea(),1.e-6);
@@ -1046,7 +1046,7 @@ void QuadraticPlanarInterpTest::checkNonRegression8()
   nodes1.push_back(new Node(coords1+10));
   nodes1.push_back(new Node(coords1+12));
   nodes1.push_back(new Node(coords1+14));
-  QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1);
+  QuadraticPolygon *pol1=QuadraticPolygon::BuildArcCirclePolygon(nodes1);
   std::vector<Node *> nodes2;
   nodes2.push_back(new Node(coords2));
   nodes2.push_back(new Node(coords2+2));
@@ -1056,7 +1056,7 @@ void QuadraticPlanarInterpTest::checkNonRegression8()
   nodes2.push_back(new Node(coords2+10));
   nodes2.push_back(new Node(coords2+12));
   nodes2.push_back(new Node(coords2+14));
-  QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2);
+  QuadraticPolygon *pol2=QuadraticPolygon::BuildArcCirclePolygon(nodes2);
   std::vector<QuadraticPolygon *> v=pol1->intersectMySelfWith(*pol2);
   CPPUNIT_ASSERT_EQUAL(1,(int)v.size());
   CPPUNIT_ASSERT_DOUBLES_EQUAL(0.598232,v[0]->getArea(),1.e-6);
@@ -1099,7 +1099,7 @@ void QuadraticPlanarInterpTest::checkNonRegression9()
   nodes1.push_back(new Node(coords1+10));
   nodes1.push_back(new Node(coords1+12));
   nodes1.push_back(new Node(coords1+14));
-  QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1);
+  QuadraticPolygon *pol1=QuadraticPolygon::BuildArcCirclePolygon(nodes1);
   std::vector<Node *> nodes2;
   nodes2.push_back(new Node(coords2));
   nodes2.push_back(new Node(coords2+2));
@@ -1109,7 +1109,7 @@ void QuadraticPlanarInterpTest::checkNonRegression9()
   nodes2.push_back(new Node(coords2+10));
   nodes2.push_back(new Node(coords2+12));
   nodes2.push_back(new Node(coords2+14));
-  QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2);
+  QuadraticPolygon *pol2=QuadraticPolygon::BuildArcCirclePolygon(nodes2);
   std::vector<QuadraticPolygon *> v=pol1->intersectMySelfWith(*pol2);
   CPPUNIT_ASSERT_EQUAL(0,(int)v.size());
   delete pol1;
@@ -1178,7 +1178,7 @@ void QuadraticPlanarInterpTest::checkNonRegression11()
   nodes1.push_back(new Node(coords1+10));
   nodes1.push_back(new Node(coords1+12));
   nodes1.push_back(new Node(coords1+14));
-  QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1);
+  QuadraticPolygon *pol1=QuadraticPolygon::BuildArcCirclePolygon(nodes1);
   std::vector<Node *> nodes2;
   nodes2.push_back(new Node(coords2));
   nodes2.push_back(new Node(coords2+2));
@@ -1188,7 +1188,7 @@ void QuadraticPlanarInterpTest::checkNonRegression11()
   nodes2.push_back(new Node(coords2+10));
   nodes2.push_back(new Node(coords2+12));
   nodes2.push_back(new Node(coords2+14));
-  QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2);
+  QuadraticPolygon *pol2=QuadraticPolygon::BuildArcCirclePolygon(nodes2);
   std::vector<QuadraticPolygon *> v=pol1->intersectMySelfWith(*pol2);
   CPPUNIT_ASSERT_EQUAL(1,(int)v.size());
   CPPUNIT_ASSERT_DOUBLES_EQUAL(2.28973e-06,v[0]->getArea(),1.e-11);
@@ -1230,7 +1230,7 @@ void QuadraticPlanarInterpTest::checkNonRegression12()
   nodes1.push_back(new Node(coords1+10));
   nodes1.push_back(new Node(coords1+12));
   nodes1.push_back(new Node(coords1+14));
-  QuadraticPolygon *pol1=QuadraticPolygon::buildArcCirclePolygon(nodes1);
+  QuadraticPolygon *pol1=QuadraticPolygon::BuildArcCirclePolygon(nodes1);
   std::vector<Node *> nodes2;
   nodes2.push_back(new Node(coords2));
   nodes2.push_back(new Node(coords2+2));
@@ -1240,7 +1240,7 @@ void QuadraticPlanarInterpTest::checkNonRegression12()
   nodes2.push_back(new Node(coords2+10));
   nodes2.push_back(new Node(coords2+12));
   nodes2.push_back(new Node(coords2+14));
-  QuadraticPolygon *pol2=QuadraticPolygon::buildArcCirclePolygon(nodes2);
+  QuadraticPolygon *pol2=QuadraticPolygon::BuildArcCirclePolygon(nodes2);
   std::vector<QuadraticPolygon *> v=pol1->intersectMySelfWith(*pol2);
   CPPUNIT_ASSERT_EQUAL(1,(int)v.size());
   CPPUNIT_ASSERT_DOUBLES_EQUAL(0.,v[0]->getArea(),1.e-6);