X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNELTest%2FQuadraticPlanarInterpTest5.cxx;h=bdb9c15bb144c9d96acfde6781fd321de0a4e15b;hb=c4551c56aa89896595842e5b41b048044681b4e8;hp=1472341ad57e3a9581a34337e7e61e0c5edca40f;hpb=b4b11b30ec3c8c59b9124a2c4efbd4b99039556f;p=tools%2Fmedcoupling.git diff --git a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest5.cxx b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest5.cxx index 1472341ad..bdb9c15bb 100644 --- a/src/INTERP_KERNELTest/QuadraticPlanarInterpTest5.cxx +++ b/src/INTERP_KERNELTest/QuadraticPlanarInterpTest5.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -45,8 +45,8 @@ private: void QuadraticPlanarInterpTest::checkNonRegressionOmar0000() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.383022221559489, 0.3213938048432697, -0.5745333323392334, 0.4820907072649046, 0.5745333323392335, 0.4820907072649044, 0.383022221559489, 0.3213938048432696, -0.4787777769493612, 0.4017422560540872, 4.592273826833915e-17, 0.75, 0.4787777769493612, 0.401742256054087, 3.061515884555943e-17, 0.5 }; @@ -71,8 +71,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0000() void QuadraticPlanarInterpTest::checkNonRegressionOmar0001() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.383022221559489, 0.3213938048432697, -0.5745333323392334, 0.4820907072649046, 0.5745333323392335, 0.4820907072649044, 0.383022221559489, 0.3213938048432696, -0.4787777769493612, 0.4017422560540872, 4.592273826833915e-17, 0.75, 0.4787777769493612, 0.401742256054087, 3.061515884555943e-17, 0.5 }; @@ -97,8 +97,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0001() void QuadraticPlanarInterpTest::checkNonRegressionOmar0002() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.383022221559489, 0.3213938048432697, -0.5745333323392334, 0.4820907072649046, 0.5745333323392335, 0.4820907072649044, 0.383022221559489, 0.3213938048432696, -0.4787777769493612, 0.4017422560540872, 4.592273826833915e-17, 0.75, 0.4787777769493612, 0.401742256054087, 3.061515884555943e-17, 0.5 }; @@ -123,8 +123,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0002() void QuadraticPlanarInterpTest::checkNonRegressionOmar0003() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.3535533905932737, 0.3535533905932738, -0.5303300858899106, 0.5303300858899107, 0.5303300858899107, 0.5303300858899106, 0.3535533905932738, 0.3535533905932737, -0.4419417382415922, 0.4419417382415922, 4.592273826833915e-17, 0.75, 0.4419417382415922, 0.4419417382415922, 3.061515884555943e-17, 0.5 }; @@ -149,8 +149,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0003() void QuadraticPlanarInterpTest::checkNonRegressionOmar0004() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.4596194077712559, 0.4596194077712559, -0.5303300858899106, 0.5303300858899107, 0.5303300858899107, 0.5303300858899106, 0.4596194077712559, 0.4596194077712559, -0.4949747468305832, 0.4949747468305833, 4.592273826833915e-17, 0.75, 0.4949747468305833, 0.4949747468305832, 3.979970649922726e-17, 0.65 }; @@ -175,8 +175,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0004() void QuadraticPlanarInterpTest::checkNonRegressionOmar0005() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.383022221559489, 0.3213938048432697, -0.6128355544951823, 0.5142300877492316, 0.6128355544951825, 0.5142300877492314, 0.383022221559489, 0.3213938048432696, -0.4979288880273356, 0.4178119462962507, 4.898425415289509e-17, 0.8, 0.4979288880273357, 0.4178119462962505, 3.061515884555943e-17, 0.5 }; @@ -201,8 +201,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0005() void QuadraticPlanarInterpTest::checkNonRegressionOmar0006() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.383022221559489, 0.3213938048432697, -0.5362311101832845, 0.4499513267805776, 0.5362311101832846, 0.4499513267805774, 0.383022221559489, 0.3213938048432696, -0.4596266658713867, 0.3856725658119237, 4.28612223837832e-17, 0.7, 0.4596266658713868, 0.3856725658119236, 3.061515884555943e-17, 0.5 }; @@ -227,8 +227,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0006() void QuadraticPlanarInterpTest::checkNonRegressionOmar0007() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.383022221559489, 0.3213938048432697, -0.5362311101832845, 0.4499513267805776, 0.5362311101832846, 0.4499513267805774, 0.383022221559489, 0.3213938048432696, -0.4596266658713867, 0.3856725658119237, 4.28612223837832e-17, 0.7, 0.4596266658713868, 0.3856725658119236, 3.061515884555943e-17, 0.5 }; @@ -253,8 +253,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0007() void QuadraticPlanarInterpTest::checkNonRegressionOmar0008() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.383022221559489, 0.3213938048432697, -0.5362311101832845, 0.4499513267805776, 0.5362311101832846, 0.4499513267805774, 0.383022221559489, 0.3213938048432696, -0.4596266658713867, 0.3856725658119237, 4.28612223837832e-17, 0.7, 0.4596266658713868, 0.3856725658119236, 3.061515884555943e-17, 0.5 }; @@ -279,8 +279,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0008() void QuadraticPlanarInterpTest::checkNonRegressionOmar0009() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.3863703305156274, -0.1035276180410081, -0.4829629131445342, -0.1294095225512602, 0.4829629131445342, -0.1294095225512604, 0.3863703305156274, -0.1035276180410083, -0.4346666218300808, -0.1164685702961342, 1.416374613080751e-16, 0.5, 0.4346666218300808, -0.1164685702961343, 1.133099690464601e-16, 0.4 }; @@ -304,8 +304,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0009() void QuadraticPlanarInterpTest::checkNonRegressionOmar0010() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.3863703305156274, -0.1035276180410081, -0.4829629131445342, -0.1294095225512602, 0.4829629131445342, -0.1294095225512604, 0.3863703305156274, -0.1035276180410083, -0.4346666218300808, -0.1164685702961342, 1.416374613080751e-16, 0.5, 0.4346666218300808, -0.1164685702961343, 1.133099690464601e-16, 0.4 }; @@ -329,8 +329,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0010() void QuadraticPlanarInterpTest::checkNonRegressionOmar0011() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.3863703305156274, -0.1035276180410081, -0.4829629131445342, -0.1294095225512602, 0.4829629131445342, -0.1294095225512604, 0.3863703305156274, -0.1035276180410083, -0.4346666218300808, -0.1164685702961342, 1.416374613080751e-16, 0.5, 0.4346666218300808, -0.1164685702961343, 1.133099690464601e-16, 0.4 }; @@ -372,8 +372,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0011() void QuadraticPlanarInterpTest::checkNonRegressionOmar2511() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.3863703305156274, -0.1035276180410081, -0.4829629131445342, -0.1294095225512602, 0.4829629131445342, -0.1294095225512604, 0.3863703305156274, -0.1035276180410083, -0.4346666218300808, -0.1164685702961342, 1.416374613080751e-16, 0.5, 0.4346666218300808, -0.1164685702961343, 1.133099690464601e-16, 0.4, }; @@ -416,8 +416,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar2511() void QuadraticPlanarInterpTest::checkNonRegressionOmar0012() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -1, 1.224606353822377e-16, -1.6, 1.959370166115804e-16, 9.796850830579018e-17, 1.6, 6.123031769111886e-17, 1, -1.3, 1.591988259969091e-16, -1.131370849898476, 1.131370849898476, 7.959941299845453e-17, 1.3, -0.7071067811865475, 0.7071067811865476 }; @@ -450,8 +450,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0012() void QuadraticPlanarInterpTest::checkNonRegressionOmar0013() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -1, 1.224606353822377e-16, -1.6, 1.959370166115804e-16, 9.796850830579018e-17, 1.6, 6.123031769111886e-17, 1, -1.3, 1.591988259969091e-16, -1.131370849898476, 1.131370849898476, 7.959941299845453e-17, 1.3, -0.7071067811865475, 0.7071067811865476 }; @@ -484,8 +484,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0013() void QuadraticPlanarInterpTest::checkNonRegressionOmar0014() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -1, 1.224606353822377e-16, -1.6, 1.959370166115804e-16, 9.796850830579018e-17, 1.6, 6.123031769111886e-17, 1, -1.3, 1.591988259969091e-16, -1.131370849898476, 1.131370849898476, 7.959941299845453e-17, 1.3, -0.7071067811865475, 0.7071067811865476 }; @@ -528,8 +528,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0014() void QuadraticPlanarInterpTest::checkNonRegressionOmar0015() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -1, 1.224606353822377e-16, -1.6, 1.959370166115804e-16, 9.796850830579018e-17, 1.6, 6.123031769111886e-17, 1, -1.3, 1.591988259969091e-16, -1.131370849898476, 1.131370849898476, 7.959941299845453e-17, 1.3, -0.7071067811865475, 0.7071067811865476 }; @@ -572,8 +572,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0015() void QuadraticPlanarInterpTest::checkNonRegressionOmar0016() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -1, 1.224606353822377e-16, -1.6, 1.959370166115804e-16, 9.796850830579018e-17, 1.6, 6.123031769111886e-17, 1, -1.3, 1.591988259969091e-16, -1.131370849898476, 1.131370849898476, 7.959941299845453e-17, 1.3, -0.7071067811865475, 0.7071067811865476 }; @@ -616,8 +616,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0016() void QuadraticPlanarInterpTest::checkNonRegressionOmar0017() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -1, 1.224606353822377e-16, -1.6, 1.959370166115804e-16, 9.796850830579018e-17, 1.6, 6.123031769111886e-17, 1, -1.3, 1.591988259969091e-16, -1.131370849898476, 1.131370849898476, 7.959941299845453e-17, 1.3, -0.7071067811865475, 0.7071067811865476 }; @@ -661,8 +661,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0017() void QuadraticPlanarInterpTest::checkNonRegressionOmar0018() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -1, 1.224606353822377e-16, -1.6, 1.959370166115804e-16, 9.796850830579018e-17, 1.6, 6.123031769111886e-17, 1, -1.3, 1.591988259969091e-16, -1.131370849898476, 1.131370849898476, 7.959941299845453e-17, 1.3, -0.7071067811865475, 0.7071067811865476 }; @@ -706,8 +706,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0018() void QuadraticPlanarInterpTest::checkNonRegressionOmar0019() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.5, 6.123031769111886e-17, -0.8, 9.796850830579018e-17, 0.8, 0, 0.5, 0, -0.65, 7.959941299845453e-17, 4.898425415289509e-17, 0.8, 0.65, 0, 3.061515884555943e-17, 0.5 }; @@ -732,8 +732,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0019() void QuadraticPlanarInterpTest::checkNonRegressionOmar0020() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.5, 6.123031769111886e-17, -0.8, 9.796850830579018e-17, 0.8, 0, 0.5, 0, -0.65, 7.959941299845453e-17, 4.898425415289509e-17, 0.8, 0.65, 0, 3.061515884555943e-17, 0.5 }; @@ -777,8 +777,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0020() void QuadraticPlanarInterpTest::checkNonRegressionOmar0021() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.5, 6.123031769111886e-17, -0.8, 9.796850830579018e-17, 0.8, 0, 0.5, 0, -0.65, 7.959941299845453e-17, 4.898425415289509e-17, 0.8, 0.65, 0, 3.061515884555943e-17, 0.5 }; @@ -821,8 +821,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0021() } void QuadraticPlanarInterpTest::checkNonRegressionOmar0022() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.5, 6.123031769111886e-17, -0.8, 9.796850830579018e-17, 0.8, 0, 0.5, 0, -0.65, 7.959941299845453e-17, 4.898425415289509e-17, 0.8, 0.65, 0, 3.061515884555943e-17, 0.5 }; @@ -847,8 +847,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0022() void QuadraticPlanarInterpTest::checkNonRegressionOmar0023() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.5, 6.123031769111886e-17, -0.8, 9.796850830579018e-17, 0.8, 0, 0.5, 0, -0.65, 7.959941299845453e-17, 4.898425415289509e-17, 0.8, 0.65, 0, 3.061515884555943e-17, 0.5, }; @@ -873,8 +873,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0023() void QuadraticPlanarInterpTest::checkNonRegressionOmar0024() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.5, 6.123031769111886e-17, -0.8, 9.796850830579018e-17, 0.8, 0, 0.5, 0, -0.65, 7.959941299845453e-17, 4.898425415289509e-17, 0.8, 0.65, 0, 3.061515884555943e-17, 0.5 }; @@ -898,8 +898,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0024() void QuadraticPlanarInterpTest::checkNonRegressionOmar2524() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.5, 6.123031769111886e-17, -0.8, 9.796850830579018e-17, 0.8, 0, 0.5, 0, -0.65, 7.959941299845453e-17, 4.898425415289509e-17, 0.8, 0.65, 0, 3.061515884555943e-17, 0.5 }; @@ -923,8 +923,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar2524() void QuadraticPlanarInterpTest::checkNonRegressionOmar0025() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.5, 6.123031769111886e-17, -0.8, 9.796850830579018e-17, 0.8, 0, 0.5, 0, -0.65, 7.959941299845453e-17, 4.898425415289509e-17, 0.8, 0.65, 0, 3.061515884555943e-17, 0.5 }; @@ -958,8 +958,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0025() void QuadraticPlanarInterpTest::checkNonRegressionOmar0026() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.4, 4.898425415289509e-17, -0.75, 9.184547653667829e-17, 0.75, 0, 0.4, 0, -0.575, 7.041486534478669e-17, 4.592273826833915e-17, 0.75, 0.575, 0, 2.449212707644755e-17, 0.4 }; @@ -993,8 +993,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0026() void QuadraticPlanarInterpTest::checkNonRegressionOmar0027() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.4, 4.898425415289509e-17, -0.75, 9.184547653667829e-17, 0.75, 0, 0.4, 0, -0.575, 7.041486534478669e-17, 4.592273826833915e-17, 0.75, 0.575, 0, 2.449212707644755e-17, 0.4 }; @@ -1038,8 +1038,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0027() void QuadraticPlanarInterpTest::checkNonRegressionOmar0028() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.4, 4.898425415289509e-17, -0.75, 9.184547653667829e-17, 0.75, 0, 0.4, 0, -0.575, 7.041486534478669e-17, 4.592273826833915e-17, 0.75, 0.575, 0, 2.449212707644755e-17, 0.4 }; @@ -1083,8 +1083,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0028() void QuadraticPlanarInterpTest::checkNonRegressionOmar0029() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.4, 4.898425415289509e-17, -0.75, 9.184547653667829e-17, 0.75, 0, 0.4, 0, -0.575, 7.041486534478669e-17, 4.592273826833915e-17, 0.75, 0.575, 0, 2.449212707644755e-17, 0.4 }; @@ -1128,8 +1128,8 @@ void QuadraticPlanarInterpTest::checkNonRegressionOmar0029() void QuadraticPlanarInterpTest::checkNonRegressionOmar0030() { - INTERP_KERNEL::QUADRATIC_PLANAR::setPrecision(1e-7); - INTERP_KERNEL::QUADRATIC_PLANAR::setArcDetectionPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarPrecision::setPrecision(1e-7); + INTERP_KERNEL::QuadraticPlanarArcDetectionPrecision::setArcDetectionPrecision(1e-7); double coords[16]={ -0.4, 4.898425415289509e-17, -0.75, 9.184547653667829e-17, 0.75, 0, 0.4, 0, -0.575, 7.041486534478669e-17, 4.592273826833915e-17, 0.75, 0.575, 0, 2.449212707644755e-17, 0.4 }; @@ -1190,5 +1190,97 @@ void QuadraticPlanarInterpTest::checkIsInOrOut() delete pol1; } +void QuadraticPlanarInterpTest::checkGetMiddleOfPoints() +{ + { // from testIntersect2DMeshWith1DLine6() + double p1[] = {0.51641754716735844, 2.0}; + double p2[] = {0.0, 1.0}; + double e_center[] = {-0.71, 2.0}; + double mid[] = {0.0,0.0}; // out + double mide[] = {0.0,0.0}; // expected + + Node * start = new Node(0.,0.); Node * end = new Node(0.,0.); // unused + // start, end, center_x, center_y, radius, angle0, angle + EdgeArcCircle e(start, end, e_center, 1.2264175471673588, -0.9533904350433241, 0.95339043504332388); + + e.getMiddleOfPoints(p1, p2, mid); + CPPUNIT_ASSERT_DOUBLES_EQUAL(0.37969180470645592, mid[0], 1.e-7); + CPPUNIT_ASSERT_DOUBLES_EQUAL(1.4372640310451197, mid[1], 1.e-7); + + e.getMiddleOfPoints(p2, p1, mid); + CPPUNIT_ASSERT_DOUBLES_EQUAL(0.37969180470645592, mid[0], 1.e-7); + CPPUNIT_ASSERT_DOUBLES_EQUAL(1.4372640310451197, mid[1], 1.e-7); + + start->decrRef(); end->decrRef(); + } + { // from testSwig2Intersect2DMeshWith1DLine11() + double p1[] = {-1., 0.23453685964236054}; + double p2[] = {-0.23453685964235979, 1.0}; + double e_center[] = {-4.85, 4.85}; + double mid[] = {0.0,0.0}; // out + + Node * start = new Node(0.,0.); Node * end = new Node(0.,0.); // unused + // start, end, center_x, center_y, radius, angle0, angle + EdgeArcCircle e(start, end, e_center, 6.0104076400856474, -0.69522150912422953, -0.18035330854643861); + + e.getMiddleOfPoints(p1, p2, mid); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.6, mid[0], 1.e-7); + CPPUNIT_ASSERT_DOUBLES_EQUAL(0.6, mid[1], 1.e-7); + + e.getMiddleOfPoints(p2, p1, mid); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.6, mid[0], 1.e-7); + CPPUNIT_ASSERT_DOUBLES_EQUAL(0.6, mid[1], 1.e-7); + + start->decrRef(); end->decrRef(); + } + { // from testSwig2Intersect2DMeshWith1DLine11() + double p1[] = {-0.1303327636866019, -1.0}; + double p2[] = {-1.0, -0.1303327636866019}; + double e_center[] = {-1.9833333333333298, -1.9833333333333298}; + double mid[] = {0.0,0.0}; // out + + Node * start = new Node(0.,0.); Node * end = new Node(0.,0.); // unused + // start, end, center_x, center_y, radius, angle0, angle + EdgeArcCircle e(start, end, e_center, 2.0977501175200861, 1.0829141821052615, -0.59503203741562627); + + e.getMiddleOfPoints(p1, p2, mid); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.5, mid[0], 1.e-7); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.5, mid[1], 1.e-7); + + e.getMiddleOfPoints(p2, p1, mid); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.5, mid[0], 1.e-7); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.5, mid[1], 1.e-7); + + start->decrRef(); end->decrRef(); + } +} + +void QuadraticPlanarInterpTest::checkGetMiddleOfPointsOriented() +{ + { // from testSwig2Colinearize2D3() + double p1[] = {-0.70710678118654746, 0.70710678118654757}; + double p2[] = {-0.70710678118654768, -0.70710678118654746}; + double e_center[] = {0., 0.}; + double mid[] = {0.0,0.0}; // out + + Node * start = new Node(0.,0.); Node * end = new Node(0.,0.); // unused + // start, end, center_x, center_y, radius, angle0, angle + EdgeArcCircle e(start, end, e_center, 1.0, -0.7853981633974485, -1.5707963267948966); + + e.getMiddleOfPointsOriented(p1, p2, mid); + CPPUNIT_ASSERT_DOUBLES_EQUAL(1., mid[0], 1.e-7); + CPPUNIT_ASSERT_DOUBLES_EQUAL(0., mid[1], 1.e-7); + + e.getMiddleOfPoints(p1, p2, mid); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-1., mid[0], 1.e-7); + CPPUNIT_ASSERT_DOUBLES_EQUAL(0., mid[1], 1.e-7); + + e.getMiddleOfPointsOriented(p2, p1, mid); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-1., mid[0], 1.e-7); + CPPUNIT_ASSERT_DOUBLES_EQUAL(0., mid[1], 1.e-7); + + start->decrRef(); end->decrRef(); + } +} }