Report fix/enhancement fron CV2X#4 plugtest (dbe05aa9) · Commits · ITS - Intelligent Transport Systems / ttcn / GeoNetworking TS 102 871-3

ItsGeoNetworking_TpFunctions.ttcn

+18 −18

Original line number	Diff line number	Diff line
		@@ -7274,7 +7274,7 @@ module ItsGeoNetworking_TpFunctions {
		+ (
		int2float(f_getCbfMinTime() - f_getCbfMaxTime())
		/ int2float(f_getCbfMaxCommunicationRange())
		) * p_distanceToNodeA) * 0.95 / 1000.0;
		) * p_distanceToNodeA) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNeighbour();
		@@ -7856,7 +7856,7 @@ module ItsGeoNetworking_TpFunctions {

		// Local variables
		var LongPosVector v_longPosVectorNodeC := f_getPosition(c_compNodeC);
		timer t_toCbf := int2float(f_getCbfMaxTime()) * 0.95 / 1000.0;
		timer t_toCbf := int2float(f_getCbfMaxTime()) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNonNeighbour();
		@@ -8061,7 +8061,7 @@ module ItsGeoNetworking_TpFunctions {

		// Local variables
		var LongPosVector v_longPosVectorNodeD := f_getPosition(c_compNodeD);
		timer t_toCbf := int2float(f_getCbfMaxTime()) * 0.95 / 1000.0;
		timer t_toCbf := int2float(f_getCbfMaxTime()) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		v_longPosVectorNodeD.pai := int2bit(0,1);
		@@ -9428,7 +9428,7 @@ module ItsGeoNetworking_TpFunctions {
		+ (
		int2float(f_getCbfMinTime() - f_getCbfMaxTime())
		/ int2float(f_getCbfMaxCommunicationRange())
		) * f_distance(v_longPosVectorNodeC, v_longPosVectorIut)) * 0.95 / 1000.0;
		) * f_distance(v_longPosVectorNodeC, v_longPosVectorIut)) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNeighbour();
		@@ -9976,7 +9976,7 @@ module ItsGeoNetworking_TpFunctions {

		// Local variables
		var LongPosVector v_longPosVectorNodeC := f_getPosition(c_compNodeC);
		timer t_toCbf := int2float(f_getCbfMaxTime()) * 0.95 / 1000.0;
		timer t_toCbf := int2float(f_getCbfMaxTime()) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNonNeighbour();
		@@ -10126,7 +10126,7 @@ module ItsGeoNetworking_TpFunctions {
		// Local variables
		var LongPosVector v_longPosVectorNodeC := f_getPosition(c_compNodeC);
		var LongPosVector v_longPosVectorNodeA := f_getPosition(c_compNodeA);
		timer t_toCbf := int2float(f_getCbfMaxTime()) * 0.95 / 1000.0;
		timer t_toCbf := int2float(f_getCbfMaxTime()) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		v_longPosVectorNodeC.pai := int2bit(0,1);
		@@ -11189,7 +11189,7 @@ module ItsGeoNetworking_TpFunctions {
		+ (
		int2float(f_getCbfMinTime() - f_getCbfMaxTime())
		/ int2float(f_getCbfMaxCommunicationRange())
		) * f_distance(v_longPosVectorNodeC, v_longPosVectorIut)) * 0.95 / 1000.0;
		) * f_distance(v_longPosVectorNodeC, v_longPosVectorIut)) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNeighbour();
		@@ -11590,7 +11590,7 @@ module ItsGeoNetworking_TpFunctions {

		// Local variables
		var LongPosVector v_longPosVectorNodeC := f_getPosition(c_compNodeC);
		timer t_toCbf := int2float(f_getCbfMaxTime()) * 0.95 / 1000.0;
		timer t_toCbf := int2float(f_getCbfMaxTime()) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNonNeighbour();
		@@ -11775,7 +11775,7 @@ module ItsGeoNetworking_TpFunctions {
		// Local variables
		var LongPosVector v_longPosVectorNodeC := f_getPosition(c_compNodeC);
		var LongPosVector v_longPosVectorNodeD := f_getPosition(c_compNodeD);
		timer t_toCbf := int2float(f_getCbfMaxTime()) * 0.95 / 1000.0;
		timer t_toCbf := int2float(f_getCbfMaxTime()) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		v_longPosVectorNodeD.pai := int2bit(0,1);
		@@ -11892,7 +11892,7 @@ module ItsGeoNetworking_TpFunctions {

		// Local variables
		var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB);
		timer t_toCbf := int2float(f_getCbfMaxTime()) * 0.95 / 1000.0;
		timer t_toCbf := int2float(f_getCbfMaxTime()) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNeighbour();
		@@ -11941,7 +11941,7 @@ module ItsGeoNetworking_TpFunctions {

		// Local variables
		var LongPosVector v_longPosVectorNodeB := f_getPosition(c_compNodeB);
		timer t_toCbf := int2float(f_getCbfMaxTime()) * 0.95 / 1000.0;
		timer t_toCbf := int2float(f_getCbfMaxTime()) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNonNeighbour();
		@@ -12352,7 +12352,7 @@ module ItsGeoNetworking_TpFunctions {
		+ (
		int2float(f_getCbfMinTime() - f_getCbfMaxTime())
		/ int2float(f_getCbfMaxCommunicationRange())
		) * f_distance(v_longPosVectorNodeF, v_longPosVectorIut)) * 0.95 / 1000.0;
		) * f_distance(v_longPosVectorNodeF, v_longPosVectorIut)) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNeighbour();
		@@ -12507,7 +12507,7 @@ module ItsGeoNetworking_TpFunctions {
		+ (
		int2float(f_getCbfMinTime() - f_getCbfMaxTime())
		/ int2float(f_getCbfMaxCommunicationRange())
		) * f_distance(v_longPosVectorNodeB, v_longPosVectorIut)) * 0.95 / 1000.0;
		) * f_distance(v_longPosVectorNodeB, v_longPosVectorIut)) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNeighbour();
		@@ -12870,7 +12870,7 @@ module ItsGeoNetworking_TpFunctions {
		+ (
		int2float(f_getCbfMinTime() - f_getCbfMaxTime())
		/ int2float(f_getCbfMaxCommunicationRange())
		) * f_distance(v_longPosVectorNodeE, v_longPosVectorIut)) * 0.95 / 1000.0;
		) * f_distance(v_longPosVectorNodeE, v_longPosVectorIut)) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNeighbour();
		@@ -12924,7 +12924,7 @@ module ItsGeoNetworking_TpFunctions {
		+ (
		int2float(f_getCbfMinTime() - f_getCbfMaxTime())
		/ int2float(f_getCbfMaxCommunicationRange())
		) * f_distance(v_longPosVectorNodeE, v_longPosVectorIut)) * 0.95 / 1000.0;
		) * f_distance(v_longPosVectorNodeE, v_longPosVectorIut)) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNeighbour();
		@@ -15411,7 +15411,7 @@ module ItsGeoNetworking_TpFunctions {
		+ (
		int2float(f_getCbfMinTime() - f_getCbfMaxTime())
		/ int2float(f_getCbfMaxCommunicationRange())
		) * f_distance(v_longPosVectorNodeC, v_longPosVectorIut)) * 0.95 / 1000.0;
		) * f_distance(v_longPosVectorNodeC, v_longPosVectorIut)) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNeighbour();
		@@ -15959,7 +15959,7 @@ module ItsGeoNetworking_TpFunctions {

		// Local variables
		var LongPosVector v_longPosVectorNodeC := f_getPosition(c_compNodeC);
		timer t_toCbf := int2float(f_getCbfMaxTime()) * 0.95 / 1000.0;
		timer t_toCbf := int2float(f_getCbfMaxTime()) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		f_prNonNeighbour();
		@@ -16109,7 +16109,7 @@ module ItsGeoNetworking_TpFunctions {
		// Local variables
		var LongPosVector v_longPosVectorNodeC := f_getPosition(c_compNodeC);
		var LongPosVector v_longPosVectorNodeA := f_getPosition(c_compNodeA);
		timer t_toCbf := int2float(f_getCbfMaxTime()) * 0.95 / 1000.0;
		timer t_toCbf := int2float(f_getCbfMaxTime()) * PX_DEC_TIMER_CONTROL_FACTOR / 1000.0;

		// Preamble
		v_longPosVectorNodeC.pai := int2bit(0,1);

lib/LibItsGeoNetworking_Pixits.ttcn

+10 −0

Original line number	Diff line number	Diff line
		@@ -204,4 +204,14 @@ module LibItsGeoNetworking_Pixits {

		} // end geoNetworkingPixits

		/**
		* @desc Multiply timer value by this control factor to increase it
		*/
		modulepar float PX_INC_TIMER_CONTROL_FACTOR_INC := 1.10;

		/**
		* @desc Multiply timer value by this control factor to decrease it
		*/
		modulepar float PX_DEC_TIMER_CONTROL_FACTOR := 0.95;

		} // end LibItsGeoNetworking_Pixits

Admin message