mirror of https://github.com/CGAL/cgal
Add parentheses (was buggy code...) : warnings-=2
This commit is contained in:
parent
efeb130fad
commit
7d22fcd514
|
|
@ -100,10 +100,10 @@ class Data_access {
|
|||
RT fa,fb,fc,fd,ga,gb,gc,gd;
|
||||
tco.get_plane_coefficients(fpp,fa,fb,fc,fd);
|
||||
tco.get_plane_coefficients(gpp,ga,gb,gc,gd);
|
||||
return (fa<ga
|
||||
|| fa==ga && fb<gb
|
||||
|| fa==ga && fb==gb && fc<gc
|
||||
|| fa==ga && fb==gb && fc==gc && fd<gd);
|
||||
return fa<ga
|
||||
|| ( fa==ga && fb<gb )
|
||||
|| ( fa==ga && fb==gb && fc<gc )
|
||||
|| ( fa==ga && fb==gb && fc==gc && fd<gd );
|
||||
}
|
||||
};
|
||||
//Precondition: Plane Equation already computed in a deterministic way
|
||||
|
|
@ -124,14 +124,14 @@ class Data_access {
|
|||
tco.get_point_coordinates(hhead,hhx,hhy,hhz,hhh);
|
||||
|
||||
return (etx*hth <htx*eth ||
|
||||
etx*hth==htx*eth && ety*hth <hty*eth ||
|
||||
etx*hth==htx*eth && ety*hth==hty*eth && etz*hth <htz*eth ||
|
||||
etx*hth==htx*eth && ety*hth==hty*eth && etz*hth==htz*eth
|
||||
&& ehx*hhh <hhx*ehh ||
|
||||
etx*hth==htx*eth && ety*hth==hty*eth && etz*hth==htz*eth
|
||||
&& ehx*hhh==hhx*ehh && ehy*hhh <hhy*ehh ||
|
||||
etx*hth==htx*eth && ety*hth==hty*eth && etz*hth==htz*eth
|
||||
&& ehx*hhh==hhx*ehh && ehy*hhh==hhy*ehh && ehz*hhh<hhz*ehh
|
||||
( etx*hth==htx*eth && ety*hth <hty*eth ) ||
|
||||
( etx*hth==htx*eth && ety*hth==hty*eth && etz*hth <htz*eth ) ||
|
||||
( etx*hth==htx*eth && ety*hth==hty*eth && etz*hth==htz*eth
|
||||
&& ehx*hhh <hhx*ehh ) ||
|
||||
( etx*hth==htx*eth && ety*hth==hty*eth && etz*hth==htz*eth
|
||||
&& ehx*hhh==hhx*ehh && ehy*hhh <hhy*ehh ) ||
|
||||
( etx*hth==htx*eth && ety*hth==hty*eth && etz*hth==htz*eth
|
||||
&& ehx*hhh==hhx*ehh && ehy*hhh==hhy*ehh && ehz*hhh<hhz*ehh )
|
||||
);
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue