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

ART

- changed many unsigned int to int
parent af1da903
......@@ -29,7 +29,7 @@ namespace ITAPropagationPathSim
namespace EigenraySearch {
struct ITA_PROPAGATION_PATH_SIM_API RayAdaptationSettings {
struct {
unsigned int maxNAdaptations = 15; //< Abort after X adaptations of the ray resolution
int maxNAdaptations = 15; //< Abort after X adaptations of the ray resolution
//double minAngleResolutionDeg = 0.001; //< []
} abort;
......@@ -44,7 +44,7 @@ namespace ITAPropagationPathSim
} advancedRayZooming;
};
struct ITA_PROPAGATION_PATH_SIM_API RayTracingAbortSettings {
unsigned int maxReflectionOrder = 3; //< Maximum considered order of reflections
int maxReflectionOrder = 3; //< Maximum considered order of reflections
double maxTime = 30; //< [s]
};
struct ITA_PROPAGATION_PATH_SIM_API Settings {
......
......@@ -64,7 +64,7 @@ namespace ITAPropagationPathSim
{
private:
std::vector<unsigned int> iReflectionIndices;
std::vector<int> iReflectionIndices;
typedef const VistaVector3D* ReceiverPositionPtr;
typedef std::map<ReceiverPositionPtr, CRayReceiverData> ReceiverDistanceMap;
......@@ -77,9 +77,9 @@ namespace ITAPropagationPathSim
public:
#pragma region Get Functions
const std::vector<unsigned int>& RelectionIndices() const { return iReflectionIndices; }
const std::vector<int>& ReflectionIndices() const { return iReflectionIndices; }
unsigned int NumPoints() const { return size(); }
int NumPoints() const { return size(); }
const VistaVector3D& SourcePoint() const { return front().position; }
const VistaVector3D& InitialDirection() const { return front().wavefrontNormal; }
......@@ -87,7 +87,7 @@ namespace ITAPropagationPathSim
const VistaVector3D& LastWavefrontNormal() const { return back().wavefrontNormal; }
const double& LastTimeStamp() const { return back().timeStamp; }
unsigned int ReflectionOrder() const { return iReflectionIndices.size(); }
int ReflectionOrder() const { return iReflectionIndices.size(); }
//! Returns the reflection order of the ray element with given index
int ReflectionOrder(const int idx) const;
#pragma endregion
......
......@@ -135,7 +135,7 @@ void EigenraySearch::CInitialWorker::FindMinimumDistanceRays(const RayVector& ra
maxReflOrder = std::max( ray->ReceiverDistanceData( ReceiverPosition() )->reflectionOrder, maxReflOrder);
maxReflOrder = std::max( ray->ReceiverDistanceData( MirroredReceiverPosition() )->reflectionOrder, maxReflOrder);
}
maxReflOrder = std::min((unsigned int)maxReflOrder, rayTracingAbortSettings.maxReflectionOrder);
maxReflOrder = std::min(maxReflOrder, rayTracingAbortSettings.maxReflectionOrder);
//maxReflOrder = std::min(1U, rayTracingAbortSettings.maxReflectionOrder);
......
......@@ -42,7 +42,7 @@ class CWorker
}
void ExtendRayByOnePeriod()
{
const std::vector<unsigned int> iReflectionIndices = pRay->RelectionIndices();
const std::vector<int>& iReflectionIndices = pRay->ReflectionIndices();
const int reflectionOrder = pRay->ReflectionOrder();
if (reflectionOrder < 2)
......
Markdown is supported
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