mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#3382 Remove libslvs from the code base, including some cleanup.
This commit is contained in:
Jacob Støren
@@ -1,339 +1,12 @@
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
#include "SolveSpaceSystem.h"
|
||||
#include <slvs.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <iostream>
|
||||
|
||||
#include "SolveSpaceSystem.h"
|
||||
#include "RiaSCurveCalculator.h"
|
||||
|
||||
/*-----------------------------------------------------------------------------
|
||||
* Test calculation of an S-shape curve:
|
||||
* Arc-Line-Arc with start and endpoint along with their tangents as input.
|
||||
*---------------------------------------------------------------------------*/
|
||||
void example_S_Curve(double p1x,
|
||||
double p1y,
|
||||
double p1z,
|
||||
double azi1,
|
||||
double inc1,
|
||||
double rad1,
|
||||
double p2x,
|
||||
double p2y,
|
||||
double p2z,
|
||||
double azi2,
|
||||
double inc2,
|
||||
double rad2)
|
||||
{
|
||||
SolveSpaceSystem sys;
|
||||
|
||||
Slvs_hGroup group1 = 1;
|
||||
Slvs_hGroup group2 = 2;
|
||||
|
||||
// Group 1, Fixed
|
||||
// P1
|
||||
Slvs_hParam p_p1x = sys.addParam( Slvs_MakeParam(-1, group1, p1x) );
|
||||
Slvs_hParam p_p1y = sys.addParam( Slvs_MakeParam(-1, group1, p1y) );
|
||||
Slvs_hParam p_p1z = sys.addParam( Slvs_MakeParam(-1, group1, p1z) );
|
||||
|
||||
Slvs_hEntity e_P1 = sys.addEntity( Slvs_MakePoint3d(-1, group1, p_p1x, p_p1y, p_p1z) );
|
||||
|
||||
// PT1
|
||||
double pt1x = p1x + sin(azi1)*sin(inc1);
|
||||
double pt1y = p1y + cos(azi1)*sin(inc1);
|
||||
double pt1z = p1z - cos(inc1);
|
||||
|
||||
Slvs_hParam p_pt1x = sys.addParam( Slvs_MakeParam(-1, group1, pt1x) );
|
||||
Slvs_hParam p_pt1y = sys.addParam( Slvs_MakeParam(-1, group1, pt1y) );
|
||||
Slvs_hParam p_pt1z = sys.addParam( Slvs_MakeParam(-1, group1, pt1z) );
|
||||
|
||||
Slvs_hEntity e_PT1 = sys.addEntity( Slvs_MakePoint3d(-1, group1, p_pt1x, p_pt1y, p_pt1z) );
|
||||
|
||||
// Tangent Line 1
|
||||
|
||||
Slvs_hEntity e_LT1 = sys.addEntity(Slvs_MakeLineSegment(-1, group1, SLVS_FREE_IN_3D, e_P1, e_PT1));
|
||||
|
||||
// P2
|
||||
Slvs_hParam p_p2x = sys.addParam( Slvs_MakeParam(-1, group1, p2x) );
|
||||
Slvs_hParam p_p2y = sys.addParam( Slvs_MakeParam(-1, group1, p2y) );
|
||||
Slvs_hParam p_p2z = sys.addParam( Slvs_MakeParam(-1, group1, p2z) );
|
||||
|
||||
Slvs_hEntity e_P2 = sys.addEntity( Slvs_MakePoint3d(-1, group1, p_p2x, p_p2y, p_p2z) );
|
||||
|
||||
// PT2
|
||||
double pt2x = p2x + sin(azi2)*sin(inc2);
|
||||
double pt2y = p2y + cos(azi2)*sin(inc2);
|
||||
double pt2z = p2z - cos(inc2);
|
||||
|
||||
Slvs_hParam p_pt2x = sys.addParam( Slvs_MakeParam(-1, group1, pt2x) );
|
||||
Slvs_hParam p_pt2y = sys.addParam( Slvs_MakeParam(-1, group1, pt2y) );
|
||||
Slvs_hParam p_pt2z = sys.addParam( Slvs_MakeParam(-1, group1, pt2z) );
|
||||
|
||||
Slvs_hEntity e_PT2 = sys.addEntity( Slvs_MakePoint3d(-1, group1, p_pt2x, p_pt2y, p_pt2z) );
|
||||
|
||||
// Tangent Line 2
|
||||
|
||||
Slvs_hEntity e_LT2 = sys.addEntity(Slvs_MakeLineSegment(-1, group1, SLVS_FREE_IN_3D, e_P2, e_PT2));
|
||||
|
||||
// Plane1
|
||||
|
||||
double unitQw, unitQx, unitQy, unitQz;
|
||||
Slvs_MakeQuaternion(1, 0, 0,
|
||||
0, 1, 0,
|
||||
&unitQw, &unitQx, &unitQy, &unitQz);
|
||||
|
||||
// Plane 1
|
||||
|
||||
Slvs_hParam p_Plane1Qw = sys.addParam( Slvs_MakeParam(-1, group2, unitQw) );
|
||||
Slvs_hParam p_Plane1Qx = sys.addParam( Slvs_MakeParam(-1, group2, unitQx) );
|
||||
Slvs_hParam p_Plane1Qy = sys.addParam( Slvs_MakeParam(-1, group2, unitQy) );
|
||||
Slvs_hParam p_Plane1Qz = sys.addParam( Slvs_MakeParam(-1, group2, unitQz));
|
||||
Slvs_hEntity e_Plane1Q = sys.addEntity( Slvs_MakeNormal3d(-1, group2,
|
||||
p_Plane1Qw,
|
||||
p_Plane1Qx,
|
||||
p_Plane1Qy,
|
||||
p_Plane1Qz));
|
||||
Slvs_hEntity e_Plane1 = sys.addEntity( Slvs_MakeWorkplane(-1, group2, e_P1, e_Plane1Q) );
|
||||
|
||||
Slvs_hConstraint c_PT1Plane1 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_PT_IN_PLANE,
|
||||
SLVS_FREE_IN_3D,
|
||||
0.0,
|
||||
e_PT1,
|
||||
-1,
|
||||
e_Plane1,
|
||||
-1));
|
||||
// Arc1 center
|
||||
Slvs_hParam p_c1x = sys.addParam( Slvs_MakeParam(-1, group2, 10.0) ); // Needs a better guess
|
||||
Slvs_hParam p_c1y = sys.addParam( Slvs_MakeParam(-1, group2, 2.0) );
|
||||
|
||||
Slvs_hEntity e_C1 = sys.addEntity( Slvs_MakePoint2d(-1, group2, e_Plane1, p_c1x, p_c1y) );
|
||||
|
||||
Slvs_hEntity e_LP1C1 = sys.addEntity(Slvs_MakeLineSegment(-1, group2, e_Plane1, e_P1, e_C1));
|
||||
|
||||
Slvs_hConstraint c_perpT1_LP1C1 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_PERPENDICULAR,
|
||||
e_Plane1,
|
||||
0.0,
|
||||
-1,
|
||||
-1,
|
||||
e_LT1,
|
||||
e_LP1C1));
|
||||
|
||||
Slvs_hConstraint c_dist_P1C1 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_PT_PT_DISTANCE,
|
||||
e_Plane1,
|
||||
rad1,
|
||||
e_P1,
|
||||
e_C1,
|
||||
-1,
|
||||
-1));
|
||||
|
||||
// Arc1 end
|
||||
|
||||
Slvs_hParam p_p11x = sys.addParam( Slvs_MakeParam(-1, group2, 2.0) ); // Needs a better guess: Perp on p_c1x/p_c1y
|
||||
Slvs_hParam p_p11y = sys.addParam( Slvs_MakeParam(-1, group2, -10.0) );
|
||||
|
||||
Slvs_hEntity e_P11 = sys.addEntity( Slvs_MakePoint2d(-1, group2, e_Plane1, p_p11x, p_p11y) );
|
||||
|
||||
Slvs_hEntity e_LC1P11 = sys.addEntity(Slvs_MakeLineSegment(-1, group2, e_Plane1, e_C1, e_P11));
|
||||
|
||||
|
||||
Slvs_hConstraint c_dist_C1P11 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_EQUAL_LENGTH_LINES,
|
||||
e_Plane1,
|
||||
0.0,
|
||||
-1,
|
||||
-1,
|
||||
e_LP1C1,
|
||||
e_LC1P11));
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// Plane 2
|
||||
|
||||
Slvs_hParam p_Plane2Qw = sys.addParam( Slvs_MakeParam(-1, group2, unitQw) );
|
||||
Slvs_hParam p_Plane2Qx = sys.addParam( Slvs_MakeParam(-1, group2, unitQx) );
|
||||
Slvs_hParam p_Plane2Qy = sys.addParam( Slvs_MakeParam(-1, group2, unitQy) );
|
||||
Slvs_hParam p_Plane2Qz = sys.addParam( Slvs_MakeParam(-1, group2, unitQz));
|
||||
Slvs_hEntity e_Plane2Q = sys.addEntity( Slvs_MakeNormal3d(-1, group2,
|
||||
p_Plane2Qw,
|
||||
p_Plane2Qx,
|
||||
p_Plane2Qy,
|
||||
p_Plane2Qz));
|
||||
|
||||
Slvs_hEntity e_Plane2 = sys.addEntity( Slvs_MakeWorkplane(-1, group2, e_P2, e_Plane2Q) );
|
||||
|
||||
Slvs_hConstraint c_PT2Plane2 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_PT_IN_PLANE,
|
||||
SLVS_FREE_IN_3D,
|
||||
0.0,
|
||||
e_PT2,
|
||||
-1,
|
||||
e_Plane2,
|
||||
-1));
|
||||
|
||||
// Arc2 center
|
||||
|
||||
Slvs_hParam p_c2x = sys.addParam( Slvs_MakeParam(-1, group2, 10.0) ); // Needs a better guess
|
||||
Slvs_hParam p_c2y = sys.addParam( Slvs_MakeParam(-1, group2, 2.0) );
|
||||
|
||||
Slvs_hEntity e_C2 = sys.addEntity( Slvs_MakePoint2d(-1, group2, e_Plane2, p_c2x, p_c2y) );
|
||||
|
||||
Slvs_hEntity e_LP2C2 = sys.addEntity(Slvs_MakeLineSegment(-1, group2, e_Plane2, e_P2, e_C2));
|
||||
|
||||
Slvs_hConstraint c_perpT2_LP2C2 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_PERPENDICULAR,
|
||||
e_Plane2,
|
||||
0.0,
|
||||
-1,
|
||||
-1,
|
||||
e_LT2,
|
||||
e_LP2C2));
|
||||
|
||||
Slvs_hConstraint c_dist_P2C2 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_PT_PT_DISTANCE,
|
||||
e_Plane2,
|
||||
rad2,
|
||||
e_P2,
|
||||
e_C2,
|
||||
-1,
|
||||
-1));
|
||||
|
||||
// Arc2 end
|
||||
|
||||
Slvs_hParam p_p22x = sys.addParam( Slvs_MakeParam(-1, group2, 2.0) ); // Needs a better guess: Perp on p_c1x/p_c1y
|
||||
Slvs_hParam p_p22y = sys.addParam( Slvs_MakeParam(-1, group2, -10.0) );
|
||||
|
||||
Slvs_hEntity e_P22 = sys.addEntity( Slvs_MakePoint2d(-1, group2, e_Plane2, p_p22x, p_p22y) );
|
||||
|
||||
Slvs_hEntity e_LC2P22 = sys.addEntity(Slvs_MakeLineSegment(-1, group2, e_Plane2, e_C2, e_P22));
|
||||
|
||||
|
||||
Slvs_hConstraint c_dist_C2P22 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_EQUAL_LENGTH_LINES,
|
||||
e_Plane2,
|
||||
0.0,
|
||||
-1,
|
||||
-1,
|
||||
e_LP2C2,
|
||||
e_LC2P22));
|
||||
|
||||
|
||||
|
||||
auto solveResult = sys.solve(group2, true);
|
||||
assert(solveResult == SolveSpaceSystem::RESULT_OKAY);
|
||||
|
||||
// Connecting the two planes
|
||||
|
||||
// Connecting line
|
||||
Slvs_hEntity e_LP11P22 = sys.addEntity(Slvs_MakeLineSegment(-1, group2, SLVS_FREE_IN_3D, e_P11, e_P22));
|
||||
|
||||
// Perpendicular constraints
|
||||
|
||||
Slvs_hConstraint c_perpC1P11_LP11P22 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_PERPENDICULAR,
|
||||
SLVS_FREE_IN_3D,
|
||||
0.0,
|
||||
-1,
|
||||
-1,
|
||||
e_LC1P11,
|
||||
e_LP11P22));
|
||||
|
||||
solveResult = sys.solve(group2, true);
|
||||
assert(solveResult == SolveSpaceSystem::RESULT_OKAY);
|
||||
|
||||
|
||||
Slvs_hConstraint c_perpC2P22_LP11P22 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_PERPENDICULAR,
|
||||
SLVS_FREE_IN_3D,
|
||||
0.0,
|
||||
-1,
|
||||
-1,
|
||||
e_LC2P22,
|
||||
e_LP11P22));
|
||||
|
||||
solveResult = sys.solve(group2, true);
|
||||
assert(solveResult == SolveSpaceSystem::RESULT_OKAY);
|
||||
|
||||
// P11, P22 in plane constraints
|
||||
|
||||
Slvs_hConstraint c_P11InPlane2 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_PT_IN_PLANE,
|
||||
SLVS_FREE_IN_3D,
|
||||
0.0,
|
||||
e_P11,
|
||||
-1,
|
||||
e_Plane2,
|
||||
-1));
|
||||
|
||||
solveResult = sys.solve(group2, true);
|
||||
assert(solveResult == SolveSpaceSystem::RESULT_OKAY);
|
||||
|
||||
Slvs_hConstraint c_P22InPlane1 = sys.addConstr(Slvs_MakeConstraint(-1,
|
||||
group2,
|
||||
SLVS_C_PT_IN_PLANE,
|
||||
SLVS_FREE_IN_3D,
|
||||
0.0,
|
||||
e_P22,
|
||||
-1,
|
||||
e_Plane1,
|
||||
-1));
|
||||
|
||||
|
||||
solveResult = sys.solve(group2, true);
|
||||
assert(solveResult == SolveSpaceSystem::RESULT_OKAY);
|
||||
|
||||
|
||||
// Circle Center, Plane normals, P11, P22
|
||||
|
||||
std::valarray<double> v_C1 = sys.global3DPos(e_C1);
|
||||
std::valarray<double> v_C2 = sys.global3DPos(e_C2);
|
||||
|
||||
std::valarray<double> v_N1 = std::get<2>( sys.orientationMx(e_Plane1Q));
|
||||
std::valarray<double> v_N2 = std::get<2>( sys.orientationMx(e_Plane2Q));
|
||||
|
||||
std::valarray<double> v_P11 = sys.global3DPos(e_P11);
|
||||
std::valarray<double> v_P22 = sys.global3DPos(e_P22);
|
||||
|
||||
std::cout << "P1: " << "[ " << p1x << " " << p1y << " " << p1z << " " << std::endl;
|
||||
std::cout << "P11: " << "[ " << v_P11[0] << " " << v_P11[1] << " " << v_P11[2] << " " << std::endl;
|
||||
std::cout << "P22: " << "[ " << v_P22[0] << " " << v_P22[1] << " " << v_P22[2] << " " << std::endl;
|
||||
std::cout << "P2: " << "[ " << p2x << " " << p2y << " " << p2z << " " << std::endl;
|
||||
std::cout << "C1: " << "[ " << v_C1[0] << " " << v_C1[1] << " " << v_C1[2] << " " << std::endl;
|
||||
std::cout << "C2: " << "[ " << v_C2[0] << " " << v_C2[1] << " " << v_C2[2] << " " << std::endl;
|
||||
std::cout << "N1: " << "[ " << v_N1[0] << " " << v_N1[1] << " " << v_N1[2] << " " << std::endl;
|
||||
std::cout << "N2: " << "[ " << v_N2[0] << " " << v_N2[1] << " " << v_N2[2] << " " << std::endl;
|
||||
|
||||
}
|
||||
|
||||
#define M_PI 3.14159265358979323846 // pi
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(SolveSpaceSolverTest, SCurve)
|
||||
{
|
||||
example_S_Curve(100, 100, 0, 0, M_PI/4, 12,
|
||||
100, 150, -1000, M_PI, M_PI/4, 12);
|
||||
|
||||
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -373,6 +46,9 @@ TEST(RiaSCurveCalculator, Test1AtEstimate)
|
||||
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, Test2)
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc({ 100, 100, 0 },
|
||||
@@ -391,6 +67,9 @@ TEST(RiaSCurveCalculator, Test2)
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, Test3)
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc({ 100, 100, 0 },
|
||||
@@ -408,6 +87,9 @@ TEST(RiaSCurveCalculator, Test3)
|
||||
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, Test4)
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc({ 0, 0, 0 },
|
||||
@@ -428,6 +110,9 @@ TEST(RiaSCurveCalculator, Test4)
|
||||
double curveRadius = 115;
|
||||
double angleEpsilon = 0.01;
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, Config1 )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -438,6 +123,9 @@ TEST(RiaSCurveCalculator, Config1 )
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, Config1a )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -447,6 +135,10 @@ TEST(RiaSCurveCalculator, Config1a )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, Config2 )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -456,6 +148,10 @@ TEST(RiaSCurveCalculator, Config2 )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(DISABLED_RiaSCurveCalculator, Config3 )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -465,6 +161,10 @@ TEST(DISABLED_RiaSCurveCalculator, Config3 )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(DISABLED_RiaSCurveCalculator, Config3a )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -474,6 +174,10 @@ TEST(DISABLED_RiaSCurveCalculator, Config3a )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, Config4 )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -483,6 +187,10 @@ TEST(RiaSCurveCalculator, Config4 )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, Config5 )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -492,6 +200,10 @@ TEST(RiaSCurveCalculator, Config5 )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(DISABLED_RiaSCurveCalculator, Config6 )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -501,6 +213,10 @@ TEST(DISABLED_RiaSCurveCalculator, Config6 )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(DISABLED_RiaSCurveCalculator, Config6a )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -510,6 +226,10 @@ TEST(DISABLED_RiaSCurveCalculator, Config6a )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(DISABLED_RiaSCurveCalculator, Config6b )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -519,6 +239,10 @@ TEST(DISABLED_RiaSCurveCalculator, Config6b )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(DISABLED_RiaSCurveCalculator, Config7 )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -528,6 +252,10 @@ TEST(DISABLED_RiaSCurveCalculator, Config7 )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(DISABLED_RiaSCurveCalculator, Config8 )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -537,6 +265,10 @@ TEST(DISABLED_RiaSCurveCalculator, Config8 )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(DISABLED_RiaSCurveCalculator, Config8a )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -546,6 +278,10 @@ TEST(DISABLED_RiaSCurveCalculator, Config8a )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(DISABLED_RiaSCurveCalculator, Config8b )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -555,6 +291,10 @@ TEST(DISABLED_RiaSCurveCalculator, Config8b )
|
||||
EXPECT_EQ(RiaSCurveCalculator::OK, sCurveCalc.curveStatus());
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, Config9 )
|
||||
{
|
||||
RiaSCurveCalculator sCurveCalc(
|
||||
@@ -565,6 +305,9 @@ TEST(RiaSCurveCalculator, Config9 )
|
||||
EXPECT_EQ(RiaSCurveCalculator::CONVERGED, sCurveCalc.solveStatus());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, InfiniteStartRadius )
|
||||
{
|
||||
{
|
||||
@@ -586,6 +329,9 @@ TEST(RiaSCurveCalculator, InfiniteStartRadius )
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Helper method to print the r1(q1, q2) r2(q1, q2) for plotting as 3D surface in Excel
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void printQ1Q2R1R2Matrix(cvf::Vec3d p1, double azi1, double inc1,
|
||||
cvf::Vec3d p2, double azi2, double inc2)
|
||||
{
|
||||
@@ -658,6 +404,9 @@ void printQ1Q2R1R2Matrix(cvf::Vec3d p1, double azi1, double inc1,
|
||||
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Test used to print and plot the relations between q1, q2, r1 and r2 in excel as 3d surface
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(DISABLED_RiaSCurveCalculator, q_r_relation)
|
||||
{
|
||||
std::cout << "Config 1" << std::endl;
|
||||
@@ -752,6 +501,9 @@ TEST(DISABLED_RiaSCurveCalculator, q_r_relation)
|
||||
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaSCurveCalculator, ControlPointCurve)
|
||||
{
|
||||
{
|
||||
@@ -802,6 +554,9 @@ TEST(RiaSCurveCalculator, ControlPointCurve)
|
||||
|
||||
#include "RiaJCurveCalculator.h"
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaJCurveCalculator, Basic)
|
||||
{
|
||||
{
|
||||
@@ -833,9 +588,11 @@ TEST(RiaJCurveCalculator, Basic)
|
||||
|
||||
}
|
||||
|
||||
|
||||
#include "RiaArcCurveCalculator.h"
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
TEST(RiaArcCurveCalculator, Basic)
|
||||
{
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user