Browse Source

- penalty_par_intersection 100 或 400 结果差不多

- 注释penalty_par_distance=8 的intersection_distance截断可以跑多线缆,否则只有单线缆
- 不判断求交效果比较好
divide_struct_def_imp
郑敬润 10 months ago
parent
commit
8c1f0142ca
  1. 12
      include/Const.h

12
include/Const.h

@ -155,13 +155,13 @@ inline double distan(P A, P B, int inOut1, int inOut2)
penalty_par_intersection = 1; penalty_par_intersection = 1;
else else
penalty_par_intersection = 100; //*原400 penalty_par_intersection = 100; //*原400
cout << "out: len:" << len << " intersection_distance" << intersection_distance << endl; // cout << "out: len:" << len << " intersection_distance" << intersection_distance << endl;
//----------------------mark-----------------------// //----------------------mark-----------------------//
// 注释下面效果可能好 // 注释下面效果可能好
if (len > intersection_distance) // if (len > intersection_distance)
penalty_par_distance = 8; // penalty_par_distance = 8;
else // else
penalty_par_distance = 1; // penalty_par_distance = 1;
} }
double len1 = sqrt((A.y - Ycenter) * (A.y - Ycenter) + (A.z - Zcenter) * (A.z - Zcenter)); double len1 = sqrt((A.y - Ycenter) * (A.y - Ycenter) + (A.z - Zcenter) * (A.z - Zcenter));
@ -237,7 +237,7 @@ inline double distan(P A, P B)
penalty_par_intersection = 1; penalty_par_intersection = 1;
else else
penalty_par_intersection = 100; //*原400 penalty_par_intersection = 100; //*原400
cout << "no_out: len:" << len << " intersection_distance" << intersection_distance << endl; // cout << "no_out: len:" << len << " intersection_distance" << intersection_distance << endl;
if (len > intersection_distance) if (len > intersection_distance)
penalty_par_distance = 8; penalty_par_distance = 8;
else else

Loading…
Cancel
Save