Skip to content

Commit

Permalink
function with random parameters without random order
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmmuller
jmmuller committed Jan 23, 2024
1 parent a8ec3c5 commit c5c6825
Show file tree
Hide file tree
Showing 21 changed files with 139 additions and 65 deletions.
28 changes: 21 additions & 7 deletions MMVII/src/Bench/BenchGeom.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,10 @@ template<class Type> void TplBenchRotation3D(cParamExeBench & aParam)
for (int aKTest=0 ; aKTest<20 ; aKTest++)
{
// generate WPK, with caution to have cos phi not to close to 0
cPtxd<Type,3> aWPK(RandUnif_C()*20,RandUnif_C()*1.5,RandUnif_C()*20);
auto v1 = RandUnif_C()*20;
auto v2 = RandUnif_C()*1.5;
auto v3 = RandUnif_C()*20;
cPtxd<Type,3> aWPK(v1,v2,v3);

// now force to PI/2 and -PI/2 sometime
if (aKTest%3!=1)
Expand Down Expand Up @@ -528,10 +531,13 @@ template <class tMap,class TypeEl> void TplBenchMap2D_NonLinear(const tMap & aMa

template <class Type> void TplElBenchMap2D()
{
auto v1 = cRot2D<Type>::RandomRot(5);
auto v2 = cPtxd<Type,2>::PRandC()*Type(0.3);
auto v3 = Type(RandUnif_C()*0.2);
TplBenchMap2D_NonLinear
(
cRot2D<Type>::RandomRot(5) ,
cRot2D<Type>(cPtxd<Type,2>::PRandC()*Type(0.3), Type(RandUnif_C()*0.2)),
v1,
cRot2D<Type>(v2, v3),
(Type*)nullptr
);

Expand All @@ -542,10 +548,18 @@ template <class Type> void TplElBenchMap2D()
TplBenchMap2D_LSQ<cHomot2D<Type>>((Type*)nullptr);


TplBenchMap2D(cAffin2D<Type>::AllocRandom(1e-1),cAffin2D<Type>::AllocRandom(1e-1),(Type*)nullptr);
TplBenchMap2D(cSim2D<Type>::RandomSimInv(5,2,1e-1),cSim2D<Type>::RandomSimInv(3,4,1e-1),(Type*)nullptr);
TplBenchMap2D(cHomot2D<Type>::RandomHomotInv(5,2,1e-1),cHomot2D<Type>::RandomHomotInv(3,4,1e-1),(Type*)nullptr);
TplBenchMap2D(cRot2D<Type>::RandomRot(5),cRot2D<Type>::RandomRot(3),(Type*)nullptr);
auto v4 = cAffin2D<Type>::AllocRandom(1e-1);
auto v5 = cAffin2D<Type>::AllocRandom(1e-1);
TplBenchMap2D(v4,v5,(Type*)nullptr);
auto v6 = cSim2D<Type>::RandomSimInv(5,2,1e-1);
auto v7 = cSim2D<Type>::RandomSimInv(3,4,1e-1);
TplBenchMap2D(v6,v7,(Type*)nullptr);
auto v8 = cHomot2D<Type>::RandomHomotInv(5,2,1e-1);
auto v9 = cHomot2D<Type>::RandomHomotInv(3,4,1e-1);
TplBenchMap2D(v8,v9,(Type*)nullptr);
auto v10 = cRot2D<Type>::RandomRot(5);
auto v11 = cRot2D<Type>::RandomRot(3);
TplBenchMap2D(v10,v11,(Type*)nullptr);

cHomogr2D<Type> aHgrId = RandomMapId<cHomogr2D<Type>>(0.1);
cHomogr2D<Type> aHgGlob = cHomogr2D<Type>::AllocRandom(2.0);
Expand Down
4 changes: 2 additions & 2 deletions MMVII/src/Bench/BenchGlob.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,8 @@ int cAppli_MMVII_Bench::ExecuteBench(cParamExeBench & aParam)
{
//==== Bench_0000 bench on very basic support functionnalities

Bench_Random(aParam); // Bench random generator, check they are acceptably unbiased

// Test on split Dir/File, string op,
Bench_0000_SysDepString(aParam);
Bench_0000_String(aParam);
Expand Down Expand Up @@ -473,8 +475,6 @@ int cAppli_MMVII_Bench::ExecuteBench(cParamExeBench & aParam)

Bench_Heap(aParam); // Basic numericall services

Bench_Random(aParam); // Bench random generator, check they are acceptably unbiased

Bench_SetI(aParam); // Bench manip on set of integers

// Check read/write of object usign serialization
Expand Down
16 changes: 12 additions & 4 deletions MMVII/src/Bench/BenchImages.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,12 @@ template <class Type> void TestOneImage2D(const cPt2di & aP0,const cPt2di & aP1)
MMVII_INTERNAL_ASSERT_bench(aIm.GetV(aP)==0,"Bench image error");
}
}
cPt2di aP0Pert = cPt2di(RandUnif_N(3), RandUnif_N(3));
cPt2di aP1Pert = aP0Pert + cPt2di(1+RandUnif_N(3),1+RandUnif_N(3));
auto v1 = RandUnif_N(3);
auto v2 = RandUnif_N(3);
cPt2di aP0Pert = cPt2di(v1, v2);
auto v3 = 1+RandUnif_N(3);
auto v4 = 1+RandUnif_N(3);
cPt2di aP1Pert = aP0Pert + cPt2di(v3,v4);
cIm2D<Type> aPIm(aP0Pert,aP1Pert);
aPIm.DIm().Resize(aP0,aP1);

Expand Down Expand Up @@ -230,7 +234,9 @@ template <class Type> void TestInterBL(cPt2di aSz,Type aCste,Type aCoeffX,Type a
for (int aNb=0 ; aNb<10000 ; aNb++)
{
double UnMinEpsilon = 0.99999;
cPt2dr aP(RandUnif_0_1() * (aSz.x()-1),RandUnif_0_1()*(aSz.y()-1));
auto v1 = RandUnif_0_1() * (aSz.x()-1);
auto v2 = RandUnif_0_1()*(aSz.y()-1);
cPt2dr aP(v1,v2);
aP = UnMinEpsilon * aP;
double aV1 = aCste + aCoeffX * aP.x() + aCoeffY * aP.y() + aCXY * aP.x() * aP.y();
double aV2 = aDIm.GetVBL(aP);
Expand All @@ -242,9 +248,11 @@ template <class Type> void TestInterBL(cPt2di aSz,Type aCste,Type aCoeffX,Type a
// =============== Test on grad =========================

// Make a pts not too close to pixel limit
auto v3 = RandUnif_0_1();
auto v4 = RandUnif_0_1();
aP = cPt2dr(round_down(aP.x()),round_down(aP.y()))
+ cPt2dr(0.1,0.1)
+ cPt2dr(RandUnif_0_1(),RandUnif_0_1()) * 0.8;
+ cPt2dr(v3,v4) * 0.8;


// compute Gx,Gy,Val
Expand Down
6 changes: 4 additions & 2 deletions MMVII/src/Bench/BenchMatrix.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,11 +683,13 @@ template <class Type,class TypeSys> void TplBenchLsq()
StdOut() << "NBVARR=" << aNbVar << " NbE="<<aNbEq << std::endl;

// random param for sparse normal syst
auto v1 = round_ni(aNbVar*pow(RandUnif_0_1(), 4.0));
auto v2 = round_ni(0.5*aNbVar*pow(RandUnif_0_1(), 2.0));
cParamSparseNormalLstSq aParam
(
8.0*RandUnif_0_1(),
round_ni(aNbVar*pow(RandUnif_0_1(), 4.0)), // Max range Dense fix
round_ni(0.5*aNbVar*pow(RandUnif_0_1(), 2.0)) // tempo
v1, // Max range Dense fix
v2 // tempo
);
// the different type of solver, that should return the same result
std::vector<cLeasSq<Type>*> aVSys = {
Expand Down
4 changes: 3 additions & 1 deletion MMVII/src/CodedTarget/cExtractTarget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1854,7 +1854,9 @@ void cAppliExtractCodeTarget::benchEllipse(){

// Generate data
int nb = (int)(RandInInterval(m, M)); double flat = (param[2]-param[3])/param[2];
double noise = RandInInterval(0, noise_max)*param[3]*(RandInInterval(0,1) > 1e-1);
auto v1 = RandInInterval(0, noise_max);
auto v2 = RandInInterval(0,1);
double noise = v1*param[3]*(v2 > 1e-1);
std::vector<cPt2dr> POINTS = generatePointsOnEllipse(param, nb, noise);
StdOut() << "Generating " << nb << " pts: FLAT. = " << flat;
StdOut() << " ANG = " << param[4]*180/PI << " NOISE = " << noise << " ";
Expand Down
4 changes: 3 additions & 1 deletion MMVII/src/Geom2D/Delaunay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,9 @@ void BenchDelaunay(cParamExeBench & aParam)
BenchDelaunayGrid(cPt2di(10,20));
for (int aK=0 ; aK<30 ;aK++)
{
cPt2di aSz(2+RandUnif_N(10),2+RandUnif_N(10));
auto v1 = 2+RandUnif_N(10);
auto v2 = 2+RandUnif_N(10);
cPt2di aSz(v1,v2);
BenchDelaunayGrid(aSz);
}

Expand Down
31 changes: 15 additions & 16 deletions MMVII/src/Geom2D/GeomsBase2D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,9 @@ static constexpr int HomIndScale = 2;

template <class Type> cHomot2D<Type> cHomot2D<Type>::RandomHomotInv(const Type & AmplTr,const Type & AmplSc,const Type & AmplMinSc)
{
return cHomot2D<Type>
(
tPt::PRandC() * AmplTr,
RandUnif_C_NotNull(AmplMinSc/AmplSc)*AmplSc
);
auto v1 = tPt::PRandC() * AmplTr;
auto v2 = RandUnif_C_NotNull(AmplMinSc/AmplSc)*AmplSc;
return cHomot2D<Type> ( v1, v2 );
}

template <class Type> cHomot2D<Type> cHomot2D<Type>::FromParam(const cDenseVect<Type> & aVec)
Expand Down Expand Up @@ -382,11 +380,9 @@ template <class Type> cSim2D<Type> cSim2D<Type>::FromMinimalSamples(const tTabM

template <class Type> cSim2D<Type> cSim2D<Type>::RandomSimInv(const Type & AmplTr,const Type & AmplSc,const Type & AmplMinSc)
{
return cSim2D<Type>
(
tPt::PRandC() * AmplTr,
tPt::PRandUnitDiff(tPt(0,0),AmplMinSc/AmplSc)*AmplSc
);
auto v1 = tPt::PRandC() * AmplTr;
auto v2 = tPt::PRandUnitDiff(tPt(0,0),AmplMinSc/AmplSc)*AmplSc;
return cSim2D<Type> ( v1, v2 );
}


Expand Down Expand Up @@ -466,11 +462,9 @@ template <class Type> Type cSim2D<Type>::Divisor(const tPt & aPIn) const {retur

template <class Type> cRot2D<Type> cRot2D<Type>::RandomRot(const Type & AmplTr)
{
return cRot2D<Type>
(
tPt::PRandC() * AmplTr,
RandUnif_C() * 10 * M_PI
);
auto v1 = tPt::PRandC() * AmplTr;
auto v2 = RandUnif_C() * 10 * M_PI;
return cRot2D<Type>( v1, v2 );
}


Expand Down Expand Up @@ -639,7 +633,12 @@ template <class Type> cAffin2D<Type> cAffin2D<Type>::AllocRandom(const Type & a
tPt aP0(0,0);
tTypeMap aRes(aP0,aP0,aP0);
while (std::abs(aRes.mDelta)<aDeltaMin)
aRes =tTypeMap(tPt::PRandC()*Type(10.0),tPt::PRandC()*Type(2.0),tPt::PRandC()*Type(2.0));
{
auto v1 = tPt::PRandC()*Type(10.0);
auto v2 = tPt::PRandC()*Type(2.0);
auto v3 = tPt::PRandC()*Type(2.0);
aRes =tTypeMap(v1,v2,v3);
}
return aRes;
}

Expand Down
15 changes: 11 additions & 4 deletions MMVII/src/Geom2D/cEllipse2D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,14 @@ void cEllipse::BenchEllispe()

for (int aKp=0 ; aKp<10 ; aKp++)
{
cPt2dr aP1 = anEl.PtOfTeta(RandInInterval(-M_PI,M_PI),RandInInterval(0.99,0.999));
cPt2dr aP2 = anEl.PtOfTeta(RandInInterval(-M_PI,M_PI),RandInInterval(1.001,1.01));
cPt2dr aP3 = anEl.PtOfTeta(RandInInterval(-M_PI,M_PI),1.0);
auto v1 = RandInInterval(-M_PI,M_PI);
auto v2 = RandInInterval(0.99,0.999);
auto v3 = RandInInterval(-M_PI,M_PI);
auto v4 = RandInInterval(1.001,1.01);
auto v5 = RandInInterval(-M_PI,M_PI);
cPt2dr aP1 = anEl.PtOfTeta(v1,v2);
cPt2dr aP2 = anEl.PtOfTeta(v3,v4);
cPt2dr aP3 = anEl.PtOfTeta(v5,1.0);

MMVII_INTERNAL_ASSERT_bench(anEl.SignedQF_D2(aP1)<0,"BenchEllispe");
MMVII_INTERNAL_ASSERT_bench(anEl.SignedQF_D2(aP2)>0,"BenchEllispe");
Expand Down Expand Up @@ -402,7 +407,9 @@ void cEllipse::BenchEllispe()
cWeightAv<tREAL8> aWAvg;
for (int aKp=0 ; aKp<100 ; aKp++)
{
cPt2dr aP1 = anEl.PtOfTeta(RandInInterval(0.9,1.1),RandInInterval(-M_PI,M_PI));
auto v1 = RandInInterval(0.9,1.1);
auto v2 = RandInInterval(-M_PI,M_PI);
cPt2dr aP1 = anEl.PtOfTeta(v1,v2);
tREAL8 aRatio= anEl.ApproxDist(aP1) / anEl.EuclidDist(aP1) ;
UpdateMax(aMaxRatio,aRatio);
aWAvg.Add(1.0,aRatio);
Expand Down
9 changes: 7 additions & 2 deletions MMVII/src/Geom2D/cTriangle2D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ template <class Type> void cTriangle2DCompiled<Type>::AssertRegular() const
template <class Type> cTriangle2DCompiled<Type>
cTriangle2DCompiled<Type>::RandomRegularTri(Type aSz,Type aEps)
{
cTriangle2DCompiled<Type> aTri(tPt::PRandC()*aSz,tPt::PRandC()*aSz,tPt::PRandC()*aSz);
auto v1 = tPt::PRandC()*aSz;
auto v2 = tPt::PRandC()*aSz;
auto v3 = tPt::PRandC()*aSz;
cTriangle2DCompiled<Type> aTri(v1,v2,v3);
if (std::abs(aTri.mDelta)> aSz*aEps)
return aTri;
return RandomRegularTri(aSz,aEps);
Expand Down Expand Up @@ -155,7 +158,9 @@ template<class Type> void BenchTri2D(Type aSz)
for (int aK=0 ; aK<1000 ; aK++)
{
// cPt2dr aP1 = aBox.GeneratePointInside();
cPtxd<Type,2> aP1 (RandUnif_C()*2*aSz,RandUnif_C()*2*aSz);
auto v1 = RandUnif_C()*2*aSz;
auto v2 = RandUnif_C()*2*aSz;
cPtxd<Type,2> aP1 (v1,v2);
cPtxd<Type,3> aCoBa = aTri.CoordBarry(aP1);
cPtxd<Type,2> aP2 = aTri.FromCoordBarry(aCoBa);

Expand Down
14 changes: 11 additions & 3 deletions MMVII/src/Geom3D/GeomsBase3D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,9 @@ std::vector<cPt3dr> cPlane3D::RandParam()
cPt3dr aI = cPt3dr::PRandUnit() ;
cPt3dr aJ = cPt3dr::PRandUnitDiff(aI) ;

return std::vector<cPt3dr>{aP0,aI*RandInInterval(0.1,2.0),aJ*RandInInterval(0.1,2.0)};
auto v1 = aI*RandInInterval(0.1,2.0);
auto v2 = aJ*RandInInterval(0.1,2.0);
return std::vector<cPt3dr>{aP0,v1,v2};
}

void BenchPlane3D()
Expand All @@ -320,7 +322,10 @@ void BenchPlane3D()
MMVII_INTERNAL_ASSERT_bench(std::abs(aPlane.ToLocCoord(aVP[0]+aVP[2]).z())<1e-5,"BenchPlane3D");

cPt3dr aP0 = cPt3dr::PRandC() * 100.0;
cPt3dr aP1 = aP0 + aPlane.AxeI() * RandUnif_C() + aPlane.AxeJ() * RandUnif_C() + aPlane.AxeK() * RandUnif_C_NotNull(0.1);
auto v1 = RandUnif_C();
auto v2 = RandUnif_C();
auto v3 = RandUnif_C_NotNull(0.1);
cPt3dr aP1 = aP0 + aPlane.AxeI() * v1 + aPlane.AxeJ() * v2 + aPlane.AxeK() * v3;

cPt3dr aPI = aPlane.Inter(aP0,aP1);
cPt3dr aPI2 = aPlane.Inter(tSeg3dr(aP0,aP1));
Expand Down Expand Up @@ -494,7 +499,10 @@ template <class T> T Determinant (const cPtxd<T,3> & aP1,const cPtxd<T,3> & aP

template<class Type> cTriangle<Type,3> RandomTriang(Type aAmpl)
{
return cTriangle<Type,3>(cPtxd<Type,3>::PRandC()*aAmpl,cPtxd<Type,3>::PRandC()*aAmpl,cPtxd<Type,3>::PRandC()*aAmpl);
auto v1 = cPtxd<Type,3>::PRandC()*aAmpl;
auto v2 = cPtxd<Type,3>::PRandC()*aAmpl;
auto v3 = cPtxd<Type,3>::PRandC()*aAmpl;
return cTriangle<Type,3>(v1,v2,v3);
}

template<class Type> cTriangle<Type,3> RandomTriangRegul(Type aRegulMin,Type aAmpl)
Expand Down
4 changes: 3 additions & 1 deletion MMVII/src/Geom3D/cRotation3D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@ template <class Type> cIsometry3D<Type> cIsometry3D<Type>::FromTriInAndOut
template <class Type>
cIsometry3D<Type> cIsometry3D<Type>::RandomIsom3D(const Type & AmplPt)
{
return cIsometry3D<Type> (tPt::PRandC()*AmplPt,cRotation3D<Type>::RandomRot());
auto aTr = tPt::PRandC()*AmplPt;
auto aRot = cRotation3D<Type>::RandomRot();
return cIsometry3D<Type> (aTr, aRot);
}

template <class Type> cIsometry3D<tREAL8> ToReal8(const cIsometry3D<Type> & anIsom)
Expand Down
5 changes: 4 additions & 1 deletion MMVII/src/Geoms/Triangles.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,10 @@ template<class Type> cPtxd<Type,3> Normal(const cTriangle<Type,3> & aTri)
template <class Type,const int Dim>
cTriangle<Type,Dim> cTriangle<Type,Dim>::RandomTri(const Type & aSz,const Type & aRegulMin )
{
cTriangle<Type,Dim> aRes(tPt::PRandC()*aSz,tPt::PRandC()*aSz,tPt::PRandC()*aSz);
auto v1 = tPt::PRandC()*aSz;
auto v2 = tPt::PRandC()*aSz;
auto v3 = tPt::PRandC()*aSz;
cTriangle<Type,Dim> aRes(v1,v2,v3);

if (aRes.Regularity() > aRegulMin) return aRes;

Expand Down
9 changes: 6 additions & 3 deletions MMVII/src/ImagesInfoExtract/ExtracExtremum.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -697,8 +697,9 @@ void OneBenchAffineExtre()
aVB = aMatReg(0,1);
aVC = aMatReg(1,1);


cPt2dr aCenter (aSz.x()/2.0+RandUnif_C()*3,aSz.y()/2.0+RandUnif_C()*3);
auto v1 = aSz.x()/2.0+RandUnif_C()*3;
auto v2 = aSz.y()/2.0+RandUnif_C()*3;
cPt2dr aCenter (v1,v2);

// Generate image
cIm2D<tREAL4> aIm(aSz);
Expand All @@ -716,7 +717,9 @@ void OneBenchAffineExtre()
for (int aK=0 ; aK<10 ; aK++)
{
// Initialize at a random distance of 2 pixel
cPt2dr aP0 = aCenter + cPt2dr(RandUnif_C(),RandUnif_C())*2.0;
auto v3 = RandUnif_C();
auto v4 = RandUnif_C();
cPt2dr aP0 = aCenter + cPt2dr(v3,v4)*2.0;
cPt2dr aCurC = aP0;
for (int aNbIter=0 ; aNbIter< 6 ;aNbIter ++)
{
Expand Down
5 changes: 4 additions & 1 deletion MMVII/src/Instrumental/cClinoInit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,10 @@ int cAppli_ClinoInit::Exe()
{
if (IsInit(&mASim))
{
cPt3dr aWPK(RandUnif_C()*mASim[0],RandUnif_C()*mASim[1],RandUnif_C()*mASim[2]);
auto v1 = RandUnif_C()*mASim[0];
auto v2 = RandUnif_C()*mASim[1];
auto v3 = RandUnif_C()*mASim[2];
cPt3dr aWPK(v1,v2,v3);
cRotation3D<tREAL8> aRPose = cRotation3D<tREAL8>::RotFromWPK(aWPK);

cSensorCamPC * aCam = new cSensorCamPC("",cIsometry3D<tREAL8>::Identity(),nullptr);
Expand Down
3 changes: 2 additions & 1 deletion MMVII/src/Mappings/MappingSymDer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ cRandInvertibleDist::cRandInvertibleDist(const cPt3di & aDeg,double aRhoMax,doub
for (int aKPar=0 ; aKPar<mNbParam ;aKPar++)
{
double aMajNorm = mVecDesc.at(aKPar).MajNormJacOfRho(mRhoMax);
double aV = RandUnif_C() * (RandUnif_0_1() < aProbaNotNul) /aMajNorm;
auto aV0 = RandUnif_C();
double aV = aV0 * (RandUnif_0_1() < aProbaNotNul) /aMajNorm;
mVParam[aKPar] = aV;
aSomJac += std::abs(aV) * aMajNorm;
}
Expand Down
9 changes: 4 additions & 5 deletions MMVII/src/PoseEstim/CalibratedSpaceResection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,11 +268,10 @@ template <class Type> void cElemSpaceResection<Type>::OneTestCorrectness()
cPtxd<Type,3> C = VUnit(aTriBund.Pt(2))*c;

// put them anywhere and with any ratio using a random similitud
cSimilitud3D<Type> aSim(
static_cast<Type>(RandUnif_C_NotNull(1e-2)*10.0),
cPtxd<Type,3>::PRandC()*static_cast<Type>(100.0),
cRotation3D<Type>::RandomRot()
);
auto v1 = static_cast<Type>(RandUnif_C_NotNull(1e-2)*10.0);
auto v2 = cPtxd<Type,3>::PRandC()*static_cast<Type>(100.0);
auto v3 = cRotation3D<Type>::RandomRot();
cSimilitud3D<Type> aSim( v1, v2, v3 );
cTriangle<Type,3> aTriG(aSim.Value(A),aSim.Value(B),aSim.Value(C));

// Now see that we can recover b & c
Expand Down
5 changes: 3 additions & 2 deletions MMVII/src/PoseEstim/UnCalibratedSpaceResection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,9 @@ void OneBenchUnCalibResection(int aKTest)
{

// StdOut() << "KKK=" << aKTest << std::endl;

cPt2di aSz(2000+RandUnif_0_1()*2000,2000+RandUnif_0_1()*2000);
auto v1 = 2000+RandUnif_0_1()*2000;
auto v2 = 2000+RandUnif_0_1()*2000;
cPt2di aSz(v1,v2);
tREAL8 aFoc = 1000 + RandUnif_0_1() * 10000;
//cPt2dr aPP(1250.0,1100.0);
cPt2dr aPP = ToR(aSz/2) + cPt2dr::PRandC() * 4000.0;
Expand Down
Loading

0 comments on commit c5c6825

Please sign in to comment.