Commit 789ba85f authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Fix #351, fixed coordinates interpolation algorithm wrong behavior (#352) 

Now the coordinates between the first and the second timestamp in the queue get interpolated correctly instead of just returning the first set of coordinates without performing the interpolation.
parent 836911b6

Common/Libraries/IRALibrary/src/TestTTCArray.cpp

+11 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "DateTime.h"

#include "IRATools.h"

#include "TimeTaggedCircularArray.h"

#include <assert.h>



#define GAP 100000

#define SIZE 50
@@ -54,4 +55,14 @@ int main(int argc, char *argv[]) 
	array.selectPoint(early.value().value,az,el);

	CIRATools::timeToStr(early.value().value,out);

	printf("earlier Time : time, az, el: %s, %lf, %lf\n",(const char *)out,az,el);

	// point between first and second entry

	TIMEVALUE b1a2(now.value().value + GAP/2);

	array.selectPoint(b1a2.value().value,az,el);

	printf("Checking if the interpolation algorithm works correctly in the first time interval...");

	double az1, el1, az2, el2;

	array.getPoint(0, az1, el1, current);

	array.getPoint(1, az2, el2, current);

	assert(az > az1 && az < az2);

	assert(el > el1 && el < el2);

	printf("done, everything works fine.\n");

}

Common/Libraries/IRALibrary/src/TimeTaggedCircularArray.cpp

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ void CTimeTaggedCircularArray::selectPoint(const TIMEVALUE& time,double& azimuth 
		}

	}

	// in that case the requested time is smaller than all other points in the vector

	if (pp==m_head) {

	if (pp==m_head && time<m_array[m_head].time) {

		/*m1=m_array[m_head];

		m2=m_array[(m_head+1)%m_size];*/

		azimuth=m_array[m_head].azimuth;