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

ART - RayGrid

- removed unnecessary function ConstRayVectorReference()
parent a6f5dc75
......@@ -65,8 +65,6 @@ namespace ITAPropagationPathSim
bool HasPoleDirection(const std::shared_ptr<CRay>& pRay) const;
//---GET Functions---
protected:
const std::vector<std::shared_ptr<CRay>>& ConstRayVectorReference() const { return vpRays; }
public:
const std::vector<double>& ThetaDeg() const { return vdThetaDeg; }
const std::vector<double>& PhiDeg() const { return vdPhiDeg; }
......
......@@ -13,9 +13,7 @@ bool CRayResolutionAdapter::ZoomIntoRay(const std::shared_ptr<CRay>& pRay)
{
vpNewRaysOfLastAdaptation.clear();
if(!Contains(pRay))
return false;
if (ConstRayVectorReference().size() <= 1)
if(NRays() <= 1|| !Contains(pRay))
return false;
SetToSurroundingGrid(pRay);
......@@ -25,13 +23,19 @@ bool CRayResolutionAdapter::ZoomIntoRay(const std::shared_ptr<CRay>& pRay)
}
//void CRayResolutionAdapter::AdvancedRayZooming(const std::shared_ptr<CRay>& pRay, const int idxMinDist, const VistaVector3D& receiverPosition)
//void CRayResolutionAdapter::AdvancedRayZooming(const std::shared_ptr<CRay>& pRay, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold)
//{
//
//}
//
//void CRayResolutionAdapter::FindZoomRays(const std::vector< std::shared_ptr<CRay> >& pRays, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold)
//{
//
//}
void CRayResolutionAdapter::DoubleRayResolution()
{
if (ConstRayVectorReference().size() <= 1)
if (NRays() <= 1)
return;
vdThetaDeg = DoubleAngularResolution(vdThetaDeg);
......@@ -39,7 +43,7 @@ void CRayResolutionAdapter::DoubleRayResolution()
RayMatrix newRayMatrix;
vpNewRaysOfLastAdaptation.clear();
RayVector::const_iterator iteratorOldRays = ConstRayVectorReference().cbegin();
RayVector::const_iterator iteratorOldRays = Rays().cbegin();
for (int idxTheta = 0; idxTheta < vdThetaDeg.size(); idxTheta++)
{
const bool isNewTheta = (idxTheta % 2) == 1;
......
......@@ -44,10 +44,11 @@ namespace ITAPropagationPathSim
const std::vector< std::shared_ptr<CRay> >& NewRaysOfLastAdaptation() { return vpNewRaysOfLastAdaptation; }
bool ZoomIntoRay(const std::shared_ptr<CRay>& pRay);
//bool ZoomIntoRay(const std::shared_ptr<CRay>& pRay, const int idxMinDist = -1, const VistaVector3D& receiverPosition = VistaVector3D());
//bool ZoomIntoRay(const std::shared_ptr<CRay>& pRay, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold);
private:
//void AdvancedRayZooming(const std::shared_ptr<CRay>& pRay, const int idxMinDist, const VistaVector3D& receiverPosition);
void AdvancedRayZooming(const std::shared_ptr<CRay>& pRay, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold);
void FindZoomRays(const std::vector< std::shared_ptr<CRay> >& pRays, const int idxMinDist, const VistaVector3D& receiverPosition, const double& threshold);
void DoubleRayResolution();
std::vector<double> DoubleAngularResolution(const std::vector<double>& angleVector) const;
};
......
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