Skip to content

Commit

Permalink
zpv -> rsv (radar sim vector)
Browse files Browse the repository at this point in the history
  • Loading branch information
rookiepeng committed Sep 3, 2024
1 parent 946fafe commit 2b969a7
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
44 changes: 22 additions & 22 deletions src/radarsim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@ int Add_Txchannel(float *location, float *polar_real, float *polar_imag,
std::complex<float>(pulse_mod_real[idx], pulse_mod_imag[idx]));
}

zpv::Vec3<std::complex<float>> polar_complex = zpv::Vec3<std::complex<float>>(
rsv::Vec3<std::complex<float>> polar_complex = rsv::Vec3<std::complex<float>>(
std::complex<float>(polar_real[0], polar_imag[0]),
std::complex<float>(polar_real[1], polar_imag[1]),
std::complex<float>(polar_real[2], polar_imag[2]));

ptr_tx_c->_ptr_transmitter->AddChannel(TxChannel<float>(
zpv::Vec3<float>(location[0], location[1], location[2]), polar_complex,
rsv::Vec3<float>(location[0], location[1], location[2]), polar_complex,
phi_vt, phi_ptn_vt, theta_vt, theta_ptn_vt, antenna_gain, mod_t_vt,
mod_var_vt, pulse_mod_vt, delay, grid));
return 0;
Expand Down Expand Up @@ -288,13 +288,13 @@ int Add_Rxchannel(float *location, float *polar_real, float *polar_imag,
theta_ptn_vt.push_back(theta_ptn[idx]);
}

zpv::Vec3<std::complex<float>> polar_complex = zpv::Vec3<std::complex<float>>(
rsv::Vec3<std::complex<float>> polar_complex = rsv::Vec3<std::complex<float>>(
std::complex<float>(polar_real[0], polar_imag[0]),
std::complex<float>(polar_real[1], polar_imag[1]),
std::complex<float>(polar_real[2], polar_imag[2]));

ptr_rx_c->_ptr_receiver->AddChannel(RxChannel<float>(
zpv::Vec3<float>(location[0], location[1], location[2]), polar_complex,
rsv::Vec3<float>(location[0], location[1], location[2]), polar_complex,
phi_vt, phi_ptn_vt, theta_vt, theta_ptn_vt, antenna_gain));
return 0;
}
Expand Down Expand Up @@ -348,17 +348,17 @@ t_Radar *Create_Radar(t_Transmitter *ptr_tx_c, t_Receiver *ptr_rx_c,
float *location, float *speed, float *rotation,
float *rotation_rate) {
t_Radar *ptr_radar_c;
std::vector<zpv::Vec3<float>> loc_vt, spd_vt, rot_vt, rrt_vt;
std::vector<rsv::Vec3<float>> loc_vt, spd_vt, rot_vt, rrt_vt;

ptr_radar_c = (t_Radar *)malloc(sizeof(t_Radar));
ptr_radar_c->_ptr_tx = ptr_tx_c;
ptr_radar_c->_ptr_rx = ptr_rx_c;

loc_vt.push_back(zpv::Vec3<float>(location[0], location[1], location[2]));
spd_vt.push_back(zpv::Vec3<float>(speed[0], speed[1], speed[2]));
rot_vt.push_back(zpv::Vec3<float>(rotation[0], rotation[1], rotation[2]));
loc_vt.push_back(rsv::Vec3<float>(location[0], location[1], location[2]));
spd_vt.push_back(rsv::Vec3<float>(speed[0], speed[1], speed[2]));
rot_vt.push_back(rsv::Vec3<float>(rotation[0], rotation[1], rotation[2]));
rrt_vt.push_back(
zpv::Vec3<float>(rotation_rate[0], rotation_rate[1], rotation_rate[2]));
rsv::Vec3<float>(rotation_rate[0], rotation_rate[1], rotation_rate[2]));

ptr_radar_c->_ptr_radar =
new Radar<float>(*ptr_tx_c->_ptr_transmitter, *ptr_rx_c->_ptr_receiver,
Expand Down Expand Up @@ -419,8 +419,8 @@ int Add_Point_Target(float *location, float *speed, float rcs, float phs,
return 1;
}
ptr_targets_c->_ptr_points->Add_Point(
Point<float>(zpv::Vec3<float>(location[0], location[1], location[2]),
zpv::Vec3<float>(speed[0], speed[1], speed[2]), rcs, phs));
Point<float>(rsv::Vec3<float>(location[0], location[1], location[2]),
rsv::Vec3<float>(speed[0], speed[1], speed[2]), rcs, phs));
return 0;
}

Expand Down Expand Up @@ -454,26 +454,26 @@ int Add_Mesh_Target(float *points, int *cells, int cell_size, float *origin,
if (IsFreeTier() && cell_size > 32) {
return 1;
}
std::vector<zpv::Vec3<float>> loc_vt;
loc_vt.push_back(zpv::Vec3<float>(location[0], location[1], location[2]));
std::vector<rsv::Vec3<float>> loc_vt;
loc_vt.push_back(rsv::Vec3<float>(location[0], location[1], location[2]));

std::vector<zpv::Vec3<float>> spd_vt;
spd_vt.push_back(zpv::Vec3<float>(speed[0], speed[1], speed[2]));
std::vector<rsv::Vec3<float>> spd_vt;
spd_vt.push_back(rsv::Vec3<float>(speed[0], speed[1], speed[2]));

std::vector<zpv::Vec3<float>> rot_vt;
rot_vt.push_back(zpv::Vec3<float>(rotation[0], rotation[1], rotation[2]));
std::vector<rsv::Vec3<float>> rot_vt;
rot_vt.push_back(rsv::Vec3<float>(rotation[0], rotation[1], rotation[2]));

std::vector<zpv::Vec3<float>> rrt_vt;
std::vector<rsv::Vec3<float>> rrt_vt;
rrt_vt.push_back(
zpv::Vec3<float>(rotation_rate[0], rotation_rate[1], rotation_rate[2]));
rsv::Vec3<float>(rotation_rate[0], rotation_rate[1], rotation_rate[2]));

std::complex<float> ep = std::complex(ep_real, ep_imag);

std::complex<float> mu = std::complex(mu_real, mu_imag);

ptr_targets_c->_ptr_targets->Add_Target(
Target<float>(points, cells, cell_size,
zpv::Vec3<float>(origin[0], origin[1], origin[2]), loc_vt,
rsv::Vec3<float>(origin[0], origin[1], origin[2]), loc_vt,
spd_vt, rot_vt, rrt_vt, ep, mu, is_ground));
return 0;
}
Expand Down Expand Up @@ -577,8 +577,8 @@ void Run_Simulator(t_Radar *ptr_radar_c, t_Targets *ptr_targets_c, int level,
}
}

zpv::Vec2<int> ray_filter_vec2 =
zpv::Vec2<int>(ray_filter[0], ray_filter[1]);
rsv::Vec2<int> ray_filter_vec2 =
rsv::Vec2<int>(ray_filter[0], ray_filter[1]);

scene_c.Run(*ptr_radar_c->_ptr_radar,
ptr_targets_c->_ptr_targets->ptr_targets_, level, false,
Expand Down
2 changes: 1 addition & 1 deletion src/radarsimcpp

0 comments on commit 2b969a7

Please sign in to comment.