Add parentheses (was buggy code...) : warnings-=2

This commit is contained in:
Sylvain Pion 2007-03-08 10:02:46 +00:00
parent efeb130fad
commit 7d22fcd514
1 changed files with 12 additions and 12 deletions

View File

@ -100,10 +100,10 @@ class Data_access {
RT fa,fb,fc,fd,ga,gb,gc,gd; RT fa,fb,fc,fd,ga,gb,gc,gd;
tco.get_plane_coefficients(fpp,fa,fb,fc,fd); tco.get_plane_coefficients(fpp,fa,fb,fc,fd);
tco.get_plane_coefficients(gpp,ga,gb,gc,gd); tco.get_plane_coefficients(gpp,ga,gb,gc,gd);
return (fa<ga return fa<ga
|| fa==ga && fb<gb || ( fa==ga && fb<gb )
|| fa==ga && fb==gb && fc<gc || ( fa==ga && fb==gb && fc<gc )
|| fa==ga && fb==gb && fc==gc && fd<gd); || ( fa==ga && fb==gb && fc==gc && fd<gd );
} }
}; };
//Precondition: Plane Equation already computed in a deterministic way //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); tco.get_point_coordinates(hhead,hhx,hhy,hhz,hhh);
return (etx*hth <htx*eth || return (etx*hth <htx*eth ||
etx*hth==htx*eth && ety*hth <hty*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 ) ||
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 || && ehx*hhh <hhx*ehh ) ||
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 && ehy*hhh <hhy*ehh || && ehx*hhh==hhx*ehh && ehy*hhh <hhy*ehh ) ||
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 && ehy*hhh==hhy*ehh && ehz*hhh<hhz*ehh && ehx*hhh==hhx*ehh && ehy*hhh==hhy*ehh && ehz*hhh<hhz*ehh )
); );
} }
}; };