| @@ -10,7 +10,7 @@ |
| import java.util.Iterator; |
| |
| /** |
| -* Last Updated: 9-July-2014 |
| +* Last Updated: 18-July-2014 |
| * @author Tyler Wible |
| * @since 21-June-2012 |
| */ |
| @@ -590,19 +590,19 @@ |
| }else if(units.equalsIgnoreCase("#/ml")){ |
| conversion = (1000)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("MPN/100 ml")){ |
| - conversion = (100)*(1000)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| + conversion = (1.0/100.0)*(1000)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("MPN/100L")){ |
| - conversion = (100)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| + conversion = (1.0/100.0)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("cfu/100ml")){ |
| - conversion = (100)*(1000)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| + conversion = (1.0/100.0)*(1000)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("cfu/mL")){ |
| conversion = (1000)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("col/mL")){ |
| conversion = (1000)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("cysts/100L")){ |
| - conversion = (100)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| + conversion = (1.0/100.0)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("cysts/10L")){ |
| - conversion = (10)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| + conversion = (1.0/10.0)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("g/cm3") || units.equalsIgnoreCase("g/mL @ 20C")){ |
| conversion = (java.lang.Math.pow(10,-6))*(1/1)*(1000)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("g/m3")){ |
| @@ -621,13 +621,13 @@ |
| }else if(units.equalsIgnoreCase("ng/m3") || units.equalsIgnoreCase("pg/l")){ |
| conversion = (java.lang.Math.pow(10,-12))*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("ocyst/100L")){ |
| - conversion = (100)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| + conversion = (1.0/100.0)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("oocyst/10L")){ |
| - conversion = (10)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| + conversion = (1.0/10.0)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("pfu/100L")){ |
| - conversion = (100)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| + conversion = (1.0/100.0)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("pfu/100ml")){ |
| - conversion = (100)*(1000)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| + conversion = (1.0/100.0)*(1000)*(1000)*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("pg/m3")){ |
| conversion = (java.lang.Math.pow(10,-15))*(java.lang.Math.pow(0.3048,3))*(86400); |
| }else if(units.equalsIgnoreCase("ug/L 2,4-D") || units.equalsIgnoreCase("ug/L U3O8") || units.equalsIgnoreCase("ug/L as As") || |