Merge branch 'feature'
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
/**********************************版本信息*************************************************/
|
||||
#define MAJOR_VERSION 1
|
||||
#define MINOR_VERSION 5
|
||||
#define PATCH_VERSION 6
|
||||
#define PATCH_VERSION 7
|
||||
#ifdef PHASE_SCANNING
|
||||
#define VERSION_INFO "PS"
|
||||
#else
|
||||
|
||||
@@ -730,29 +730,27 @@ void Track_Asso:: model_filter(std::vector <Trust_Track> *trust_track,struct Ra
|
||||
if((*trust_track)[i].Extrapolate_round <= MAX_EXTRAPOLATE_NUM)
|
||||
{
|
||||
double v_track = sqrt(pow((*trust_track)[i].X[1],2)+pow((*trust_track)[i].X[4],2));
|
||||
|
||||
double delta_T = (latest_timestamp - (*trust_track)[i].T_track)/1000.0;
|
||||
if (delta_T <= 0)
|
||||
continue;
|
||||
|
||||
//
|
||||
//
|
||||
// if(Work_Parameter.work_mode == 0)
|
||||
// {
|
||||
// delta_T = Work_Parameter.DATA_RATE_SHORT;
|
||||
// }
|
||||
// else if(Work_Parameter.work_mode == 1)
|
||||
// {
|
||||
// delta_T = Work_Parameter.DATA_RATE_MIDDLE;
|
||||
// }
|
||||
// else if(Work_Parameter.work_mode == 2)
|
||||
// {
|
||||
// delta_T = Work_Parameter.DATA_RATE_FAR;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// delta_T = Work_Parameter.DATA_RATE_SHORT;
|
||||
// }
|
||||
double delta_T = 0;
|
||||
// double delta_T = (latest_timestamp - (*trust_track)[i].T_track)/1000.0;
|
||||
// if (delta_T <= 0)
|
||||
// continue;
|
||||
|
||||
if(Work_Parameter.work_mode == 0)
|
||||
{
|
||||
delta_T = Work_Parameter.DATA_RATE_SHORT;
|
||||
}
|
||||
else if(Work_Parameter.work_mode == 1)
|
||||
{
|
||||
delta_T = Work_Parameter.DATA_RATE_MIDDLE;
|
||||
}
|
||||
else if(Work_Parameter.work_mode == 2)
|
||||
{
|
||||
delta_T = Work_Parameter.DATA_RATE_FAR;
|
||||
}
|
||||
else
|
||||
{
|
||||
delta_T = Work_Parameter.DATA_RATE_SHORT;
|
||||
}
|
||||
|
||||
double F[6][6], Q1[6][6], Q2[6][6], Q3[6][6];
|
||||
IMM_F_Q_gen( v_track, delta_T, F, Q1, Q2, Q3,Work_Parameter);
|
||||
|
||||
Reference in New Issue
Block a user