Displaying differences for changeset |
@@ -102,8 +102,8 @@ |
comp_srp_number = this.computeSRPHsgC(ip); |
break; |
case "D": |
- if (ip.getWtbl().equals("Perched") |
- || ip.getWtbl().equals("Apparent") && ip.isHwt_lt_24()) { |
+ if ((ip.getWtbl().equals("Perched") |
+ || ip.getWtbl().equals("Apparent")) || ip.isHwt_lt_24()) { |
comp_srp_number = 3; |
} else if (ip.getSlope() < 2 && ip.getKfact() < 0.28) { |
comp_srp_number = 0; |
@@ -182,8 +182,8 @@ |
srp_number = 1; |
} else if (ip.getSlope() >= 2 && ip.getSlope() <= 4) { |
srp_number = 2; |
- } else if ((ip.getSlope() > 4) || (ip.getWtbl().equals("Perched") |
- || ip.getWtbl().equals("Apparent") && ip.isHwt_lt_24())) { |
+ } else if ((ip.getSlope() > 4) || ((ip.getWtbl().equals("Perched") |
+ || ip.getWtbl().equals("Apparent")) || ip.isHwt_lt_24())) { |
srp_number = 3; |
} |
return srp_number; |