Commit cac045d8 authored by Philipp Schäfer's avatar Philipp Schäfer
Browse files

ART - Renaming RayResolutionAdapter to RayGridAdaptation

- part 2: internal renamings
parent a8a866b7
#include "RayResolutionAdapter.h"
#include "RayGridAdaptation.h"
#include <ITAException.h>
using namespace ITAPropagationPathSim::AtmosphericRayTracing;
using namespace ITAPropagationPathSim::AtmosphericRayTracing::EigenraySearch;
void CRayResolutionAdapter::Reset(const CRayGrid& rayGrid)
void CRayGridAdaptation::Reset(const CRayGrid& rayGrid)
{
*this = rayGrid;
vpNewRaysOfLastAdaptation.clear();
}
void CRayResolutionAdapter::ZoomIntoRay(const std::shared_ptr<CRay>& pRay)
void CRayGridAdaptation::ZoomIntoRay(const std::shared_ptr<CRay>& pRay)
{
if(!Contains(pRay) /*|| NRays() <= 1*/)
ITA_EXCEPT_INVALID_PARAMETER("Given ray is not part of the adapted grid.");
......@@ -20,7 +20,7 @@ void CRayResolutionAdapter::ZoomIntoRay(const std::shared_ptr<CRay>& pRay)
DoubleRayResolution();
}
void CRayResolutionAdapter::ZoomIntoRay(const std::shared_ptr<CRay>& pRay, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold)
void CRayGridAdaptation::ZoomIntoRay(const std::shared_ptr<CRay>& pRay, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold)
{
if (!Contains(pRay) /*|| NRays() <= 1*/)
ITA_EXCEPT_INVALID_PARAMETER("Given ray is not part of the adapted grid.");
......@@ -30,7 +30,7 @@ void CRayResolutionAdapter::ZoomIntoRay(const std::shared_ptr<CRay>& pRay, const
DoubleRayResolution();
}
void CRayResolutionAdapter::SetAdvancedRayGridLimits(const std::shared_ptr<CRay>& pRay, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold)
void CRayGridAdaptation::SetAdvancedRayGridLimits(const std::shared_ptr<CRay>& pRay, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold)
{
if (NPhi() > 3) // There can be more than three rays if pRay is located at a pole
return;
......@@ -40,7 +40,7 @@ void CRayResolutionAdapter::SetAdvancedRayGridLimits(const std::shared_ptr<CRay>
FilterDirections(thetaIdxVec, phiIdxVec);
}
std::vector<int> CRayResolutionAdapter::FindAdvancedRayGridLimits1D(const std::vector<std::shared_ptr<CRay>>& rayVector, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold) const
std::vector<int> CRayGridAdaptation::FindAdvancedRayGridLimits1D(const std::vector<std::shared_ptr<CRay>>& rayVector, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold) const
{
if (rayVector.size() == 1)
return { 0 };
......@@ -67,7 +67,7 @@ std::vector<int> CRayResolutionAdapter::FindAdvancedRayGridLimits1D(const std::v
return {1, 2};
}
void CRayResolutionAdapter::DoubleRayResolution()
void CRayGridAdaptation::DoubleRayResolution()
{
if (NRays() <= 1)
return;
......@@ -101,7 +101,7 @@ void CRayResolutionAdapter::DoubleRayResolution()
InitRayVectorFromRayMatrix();
}
std::vector<double> CRayResolutionAdapter::DoubleAngularResolution(const std::vector<double>& angleVector) const
std::vector<double> CRayGridAdaptation::DoubleAngularResolution(const std::vector<double>& angleVector) const
{
if (angleVector.size() < 2)
return angleVector;
......
......@@ -28,13 +28,13 @@ namespace ITAPropagationPathSim
{
namespace EigenraySearch
{
class CRayResolutionAdapter : private CRayGrid
class CRayGridAdaptation : private CRayGrid
{
private:
std::vector< std::shared_ptr<CRay> > vpNewRaysOfLastAdaptation;
public:
CRayResolutionAdapter() {}
CRayResolutionAdapter(const CRayGrid& rayGrid) : CRayGrid(rayGrid) {}
CRayGridAdaptation() {}
CRayGridAdaptation(const CRayGrid& rayGrid) : CRayGrid(rayGrid) {}
public:
void Reset(const CRayGrid& rayGrid);
......
......@@ -32,7 +32,7 @@
#include <ITAPropagationPathSim/AtmosphericRayTracing/RayGrid.h>
#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/Settings.h>
#include "RayResolutionAdapter.h"
#include "RayGridAdaptation.h"
#include <ITAGeo/Atmosphere/StratifiedAtmosphere.h>
// STD
......@@ -85,7 +85,7 @@ namespace ITAPropagationPathSim
Simulation::CEngine simulationEngine;
RayTracingAbortSettings rayTracingAbortSettings;
CRayResolutionAdapter rayResolutionAdapter;
CRayGridAdaptation rayResolutionAdapter;
VistaVector3D v3ReceiverPosition;
unsigned int iActiveReflexionOrder;
RayAdaptationSettings rayAdaptationSettings;
......
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