Commit 38d46497 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in virtualization/docker/Dockerfile

parent 04a0375d
Loading
Loading
Loading
Loading
Loading
+168 −131
Original line number Original line Diff line number Diff line
@@ -10,6 +10,8 @@
#define earthRadius 6378137.0L
#define earthRadius 6378137.0L
#define rbis = ((double)(earthRadius * M_PI / 180))
#define rbis = ((double)(earthRadius * M_PI / 180))


#define epsilon ((double)0.000001)

namespace LibItsCommon__Functions {
namespace LibItsCommon__Functions {


  /**
  /**
@@ -121,11 +123,46 @@ namespace LibItsCommon__Functions {
      rlong2; //((double)p__refLongitude) + atan2(sin(angle)*sin(distance)*cos(ref_lat), cos(distance) - sin(ref_lat)*sin((double)p__latitude))*(180.0/M_PI);
      rlong2; //((double)p__refLongitude) + atan2(sin(angle)*sin(distance)*cos(ref_lat), cos(distance) - sin(ref_lat)*sin((double)p__latitude))*(180.0/M_PI);
  }
  }


  /*       * @desc    External function to compute radius of a given circular area
  /*
   * @desc    External function to compute radius of a given circular area
   * @param   p_squareMeters  Square meters of an circular area
   * @param   p_squareMeters  Square meters of an circular area
   * @return  Computed radius in meters
   * @return  Computed radius in meters
   fx_computeRadiusFromCircularArea(in float p_squareMeters) return float;
   fx_computeRadiusFromCircularArea(in float p_squareMeters) return float;
  */
  */
  FLOAT fx__computeRadiusFromCircularArea(const FLOAT &p__squareMeters) { return FLOAT(sqrt(p__squareMeters / M_PI)); }
  FLOAT fx__computeRadiusFromCircularArea(const FLOAT &p__squareMeters) { return FLOAT(sqrt(p__squareMeters / M_PI)); }


  // Verifiy 'euclidian distance (P1, P2) > minReferencePointPositonChangeThreshold'
  BOOLEAN fx__verify__euclidian__distance(const INTEGER& p__p1__lat, const INTEGER& p__p1__lon, const INTEGER& p__p2__lat, const INTEGER& p__p2__lon, const FLOAT& p__threshold, const INTEGER& p__comparison) {

    double v = sqrt(
                      (
                        (double)static_cast<const int>(p__p2__lat) * (double)static_cast<const int>(p__p2__lat) - (double)static_cast<const int>(p__p1__lat) * (double)static_cast<const int>(p__p1__lat)
                      ) + 
                      (
                        (double)static_cast<const int>(p__p2__lon) * (double)static_cast<const int>(p__p2__lon) - (double)static_cast<const int>(p__p1__lon) * (double)static_cast<const int>(p__p1__lon)
                      )
                    );

    if (p__comparison == 0) {
      return abs(v - (double)static_cast<const float>(p__threshold)) < epsilon;
    } else if (p__comparison == -1) {
      return ((double)static_cast<const float>(p__threshold) - v) < -epsilon;
    } else {
      return ((double)static_cast<const float>(p__threshold) - v) > epsilon;
    }
  }

  BOOLEAN fx__verify__delta(const INTEGER& p__v1, const INTEGER& p__v2, const FLOAT& p__threshold, const INTEGER& p__comparison) {

    double v = (double)static_cast<const int>(p__v2) - (double)static_cast<const int>(p__v1);

    if (p__comparison == 0) {
      return abs(v - (double)static_cast<const float>(p__threshold)) < epsilon;
    } else if (p__comparison == -1) {
      return ((double)static_cast<const float>(p__threshold) - v) < -epsilon;
    } else {
      return ((double)static_cast<const float>(p__threshold) - v) > epsilon;
    }
  }

} // namespace LibItsCommon__Functions
} // namespace LibItsCommon__Functions
+37 −45
Original line number Original line Diff line number Diff line
@@ -210,41 +210,6 @@ system.utPort.params := "UT_VRU/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port=
#ItsVru_TestCases.TC_VBS_MSGF_BV_36
#ItsVru_TestCases.TC_VBS_MSGF_BV_36
# Check that profile 3 VRUs only transmit a VRU special vehicle container in the CAM instead of full VAM
# Check that profile 3 VRUs only transmit a VRU special vehicle container in the CAM instead of full VAM
#ItsVru_TestCases.TC_VBS_MSGF_BV_37
#ItsVru_TestCases.TC_VBS_MSGF_BV_37
#ItsVru_TestCases.TC_VBS_MSGF_BV_20
# Check that clusterLeaveReason indicates CancelledJoin when the joining is cancelled
#ItsVru_TestCases.TC_VBS_MSGF_BV_21
# Check that clusterLeaveReason indicates FailedJoin when the joining is cancelled
#ItsVru_TestCases.TC_VBS_MSGF_BV_22
# Check that clusterLeaveReason indicates SafetyCondition when another cluster VRU comes too close
#ItsVru_TestCases.TC_VBS_MSGF_BV_23
# Check that clusterBreakupReason indicates clusteringPurposeCompleted when the clustering purpose is completed
#ItsVru_TestCases.TC_VBS_MSGF_BV_24
# Check that clusterBreakupReason indicates clusteringPurposeCompleted when the clustering purpose is completed
#ItsVru_TestCases.TC_VBS_MSGF_BV_25
# Check that clusterBreakupReason indicates joiningAnotherCluster when the cluster leader is joining another cluster
#ItsVru_TestCases.TC_VBS_MSGF_BV_26
# Check that clusterBreakupReason indicates enteringLowriskareaBasedonMAPs when the cluster leader is entering a low-risk area
#ItsVru_TestCases.TC_VBS_MSGF_BV_27
# Check that clusterBreakupReason indicates receptionOfCPMcontainingCluster when a CPM containing a cluster is received
#ItsVru_TestCases.TC_VBS_MSGF_BV_28
# Check that clusterIdChangeTimeInfo indicates the time the cluster leader intents to change the cluster ID
#ItsVru_TestCases.TC_VBS_MSGF_BV_29
# Check that the ClusterLeaveReason is systematically set to 0 if the reason for breaking up or leaving the cluster cannot be matched with the other reasons (1-8)
#ItsVru_TestCases.TC_VBS_MSGF_BV_30
# Check that the VruMotionPredictionContainer includes the pathHistory of type PathHistory consisting of up to 40 past points
#ItsVru_TestCases.TC_VBS_MSGF_BV_31
# Check that the VruMotionPredictionContainer includes the path prediction of type PathPredicted consisting of up to 15 future points, confidence values and time instances
#ItsVru_TestCases.TC_VBS_MSGF_BV_32
# Check that the vruMotionPredictionContainer includes the safe distance indication that includes timeToCollision
#ItsVru_TestCases.TC_VBS_MSGF_BV_33
# Check that the vruMotionPredictionContainer includes the accelerationChangeIndication of type AccelerationChangeIndication containing accelOrDecel and actionDeltaTime
#ItsVru_TestCases.TC_VBS_MSGF_BV_34
# Check that the vruMotionPredictionContainer includes the headingChangeIndication of type HeadingChangeIndication containing the dircetion and actionDeltaTime
#ItsVru_TestCases.TC_VBS_MSGF_BV_35
# Check that the vruMotionPredictionContainer includes the stabilityChangeIndication of type StabilityChangeIndication containing the lossProbability and actionDeltaTime
#ItsVru_TestCases.TC_VBS_MSGF_BV_36
# Check that profile 3 VRUs only transmit a VRU special vehicle container in the CAM instead of full VAM
#ItsVru_TestCases.TC_VBS_MSGF_BV_37


# Check that the BTP header type B and the destination port is passed if the value is not provided by the ITS-S configuration
# Check that the BTP header type B and the destination port is passed if the value is not provided by the ITS-S configuration
#ItsVru_TestCases.TC_VBS_IFGN_BV_01
#ItsVru_TestCases.TC_VBS_IFGN_BV_01
@@ -273,7 +238,6 @@ system.utPort.params := "UT_VRU/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port=
#ItsVru_TestCases.TC_VBS_SECC_BV_02
#ItsVru_TestCases.TC_VBS_SECC_BV_02
# Check that the SSP is a BitmapSsp
# Check that the SSP is a BitmapSsp
#ItsVru_TestCases.TC_VBS_SECC_BV_04
#ItsVru_TestCases.TC_VBS_SECC_BV_04
##ItsVru_TestCases.TC_VBS_IFGN_BV_04


# Check that a VRU in VRU-ACTIVE-STANDALONE sends individual VAMs
# Check that a VRU in VRU-ACTIVE-STANDALONE sends individual VAMs
#ItsVru_TestCases.TC_VBS_TRANS_BV_01
#ItsVru_TestCases.TC_VBS_TRANS_BV_01
@@ -303,21 +267,49 @@ ItsVru_TestCases.TC_VBS_CLTR_BV_04
# Check that a cluster leader sends a cluster VAM with the new ID as soon as possible
# Check that a cluster leader sends a cluster VAM with the new ID as soon as possible
#ItsVru_TestCases.TC_VBS_CLTR_BV_10
#ItsVru_TestCases.TC_VBS_CLTR_BV_10


#  Check that a VBS starts sending VAMs when the state changes from VRU-IDLE to VRU-ACTIVE-STANDALONE
# Check that the first time individual VAM is generated immediately after VBS activation
#ItsVru_TestCases.TC_VBS_CLTR_BV_01
#ItsVru_TestCases.TC_VBS_TRCN_BV_01
# Check that the cluster size is set to minClusterSize and the VRU profile field is set to the VRU profile
# Check that a VAM is generated immediately if a VRU is in VRU-IDLE and enters VRU-ACTIVE-STANDALONE
#ItsVru_TestCases.TC_VBS_CLTR_BV_02
#ItsVru_TestCases.TC_VBS_TRCN_BV_02
# Check that the minimum time elapsed between the start of consecutive VAM generation events is equal or larger than T_Gen_Vam
# Check that a VAM is generated immediately if a VRU is in VRU-PASSIVE, leaves the cluster and enters VRU-ACTIVE-STANDALONE
#ItsVru_TestCases.TC_VBS_FRPE_TI_04
#ItsVru_TestCases.TC_VBS_TRCN_BV_03
# Check that T_GenVam is set to T_GenVamMin if the value for T_GenVam is not provided by the VBS management entity or smaller than T_GenVamMin in case of ITS-G5
# Check that a VAM is generated immediately if a VRU is in VRU-PASSIVE, determines the cluster leader is lost and enters VRU-ACTIVE-STANDALONE
#ItsVru_TestCases.TC_VBS_FRPE_TI_05
#ItsVru_TestCases.TC_VBS_TRCN_BV_04
# Check that a VAM is generated immediately if a VRU is in VRU-ACTIVE-CLUSTER-LEADER, breaks up the cluster and enters VRU-ACTIVE-STANDALONE
#ItsVru_TestCases.TC_VBS_TRCN_BV_05
# Check that consecutive individual VAM transmissions occur at an interval equal or larger than T_GenVam (See TC_VBS_FRPE_TI_01)
#ItsVru_TestCases.TC_VBS_TRCN_BV_06
# Check that consecutive VAM transmissions occur when T_GenVamMax is exceeded (See f_TC_VBS_FRPE_TI_04)
#ItsVru_TestCases.TC_VBS_TRCN_BV_07
# Check that consecutive individual VAM transmissions occur when the euclidian absolute distance between the current estimated VRU reference point position and the last estimated VRU reference point position exceeds minReferencePointPositonChangeThreshold
#ItsVru_TestCases.TC_VBS_TRCN_BV_08
# Check that consecutive individual VAM transmissions occur when the difference between the current estimated VRU reference point ground speed and the last estimated VRU reference point ground speed exceeds minGroundSpeedChangeThreshold
#ItsVru_TestCases.TC_VBS_TRCN_BV_09
# Check that consecutive individual VAM transmissions occur when the difference between the orientation of the vector of the current estimated ground velocity of the reference point of the VRU and the estimated orientation of the vector of the ground velocity of the reference point of the VRU lastly included in an individual VAM exceeds minGroundVelocityOrientationChangeThreshold
#ItsVru_TestCases.TC_VBS_TRCN_BV_10
# Check that consecutive individual VAM transmissions occur when the difference between the current estimated trajectory interception probability with vehicle(s) or other VRU(s) and the trajectory interception probability with vehicle(s) or other VRU(s) lastly reported in an individual VAM exceeds minTrajectoryInterceptionProbChangeThreshold
#ItsVru_TestCases.TC_VBS_TRCN_BV_11
# Check that consecutive individual VAM transmissions occur when one or more other VRUs are simultanously coming closer than Minimum Safe Lateral Distance(MSLaD) laterally, closer than Minimum Safe Longitudinal Distance (MSLoD) longitudinally and closer than Minimum Safe Vertical Distance (MSVD) vertically
#ItsVru_TestCases.TC_VBS_TRCN_BV_12










# Check that the minimum time elapsed between the start of consecutive VAM generation events is equal or larger than T_Gen_Vam
# Check that the minimum time elapsed between the start of consecutive VAM generation events is equal or larger than T_Gen_Vam
#ItsVru_TestCases.TC_VBS_FRPE_TI_01 runs on ItsVru system ItsVruSystem {
#ItsVru_TestCases.TC_VBS_FRPE_TI_01
# Check that the LF container is included in the first VAM generation
# Check that the LF container is included in the first VAM generation
#ItsVru_TestCases.TC_VBS_FRPE_BV_02
#ItsVru_TestCases.TC_VBS_FRPE_BV_02
# Check that the LF container is included periodically after 2000 ms
# Check that the LF container is included periodically after 2000 ms
#ItsVru_TestCases.TC_VBS_FRPE_BV_03
#ItsVru_TestCases.TC_VBS_FRPE_BV_03
# Check that the minimum time elapsed between the start of consecutive VAM generation events is equal or larger than T_Gen_Vam
#ItsVru_TestCases.TC_VBS_FRPE_TI_04
# Check that T_GenVam is set to T_GenVamMin if the value for T_GenVam is not provided by the VBS management entity or smaller than T_GenVamMin in case of ITS-G5
#ItsVru_TestCases.TC_VBS_FRPE_TI_05


# Check that the ITS-AID indicates the application for which permissions are being granted
# Check that the ITS-AID indicates the application for which permissions are being granted
#ItsVru_TestCases.TC_VBS_SECC_BV_02
#ItsVru_TestCases.TC_VBS_SECC_BV_02
Compare ab268c68 to d551da8d
Original line number Original line Diff line number Diff line
Subproject commit ab268c681dd7dc448661a6754dcdfcb3f4d0e909
Subproject commit d551da8d04f9ac7066ece452f99d1e61ea778fc7
Compare 75c82d2b to 98d3d7e1
Original line number Original line Diff line number Diff line
Subproject commit 75c82d2b1916c002da1b0c1dc9cbfdad1208ccc5
Subproject commit 98d3d7e1c0eab31aa63f329190d490d3fd51ab8c
Compare dbe05aa9 to 77bc2781
Original line number Original line Diff line number Diff line
Subproject commit dbe05aa91c4b01c39bc544bafd6760d002a6327e
Subproject commit 77bc278184cc79ad11c08f2725718d5d50ff7e96
Loading