Commit 63170abd authored by Julien Osman's avatar Julien Osman
Browse files

Merge branch 'rpc-solver-opti' into 'develop'

rpcSolver: Avoid setting equation system multiple times

See merge request !926
parents 7df6a257 13cb2c8e
Pipeline #11366 passed with stages
in 85 minutes and 54 seconds
......@@ -148,15 +148,15 @@ void computeCoefficients(const std::vector<PrecisionType> & f,
PrecisionType res = std::numeric_limits<PrecisionType>::max();
VectorType coeffs;
UpdateMatrix(r, x, y ,z ,M);
for (int i =0; i<10; i++)
{
if (res < epsilon)
{
break;
}
auto w2 = weights * weights;
UpdateMatrix(r, x, y ,z ,M);
vnl_svd<PrecisionType> svd(M.transpose()*w2*M);
......@@ -388,4 +388,4 @@ void RPCSolver::Solve(const GCPsContainerType& gcpContainer, PrecisionType& rmsE
rmsError = std::sqrt(rmseAcc/numberOfPoints);
}
}
\ No newline at end of file
}
......@@ -62,8 +62,8 @@ void ElevationParametersHandler::AddElevationParameters(Application::Pointer app
"Use a geoid grid to get the height "
"above the ellipsoid in case there is no DEM available, no coverage for "
"some points or pixels with no_data in the DEM tiles. A version of the "
"geoid can be found on the OTB website"
"(https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-data/blob/master/Input/DEM/egm96.grd).");
"geoid can be found on the OTB website (egm96.grd and egm96.grd.hdr at "
"https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/tree/master/Data/Input/DEM).");
app->MandatoryOff(oss.str());
std::string geoidFromConfig = otb::ConfigurationManager::GetGeoidFile();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment