|
|
@ -155,13 +155,13 @@ inline double distan(P A, P B, int inOut1, int inOut2) |
|
|
|
penalty_par_intersection = 1; |
|
|
|
else |
|
|
|
penalty_par_intersection = 100; //*原400
|
|
|
|
cout << "out: len:" << len << " intersection_distance" << intersection_distance << endl; |
|
|
|
// cout << "out: len:" << len << " intersection_distance" << intersection_distance << endl;
|
|
|
|
//----------------------mark-----------------------//
|
|
|
|
// 注释下面效果可能好
|
|
|
|
if (len > intersection_distance) |
|
|
|
penalty_par_distance = 8; |
|
|
|
else |
|
|
|
penalty_par_distance = 1; |
|
|
|
// if (len > intersection_distance)
|
|
|
|
// penalty_par_distance = 8;
|
|
|
|
// else
|
|
|
|
// penalty_par_distance = 1;
|
|
|
|
} |
|
|
|
|
|
|
|
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; |
|
|
|
else |
|
|
|
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) |
|
|
|
penalty_par_distance = 8; |
|
|
|
else |
|
|
|