Merge branch 'master' into development (@unpairedbracket, make sure I did this right)

Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
	src/main/java/mekanism/common/util/MekanismUtils.java
This commit is contained in:
Aidan C. Brady committed 2015-02-19 16:12:28 -05:00
commit 2fe4cf290d
7 files changed
+73 -34

No files matched your search

@@ -15,16 +15,18 @@ public class StatUtils
public static int inversePoisson(double mean)
{
double r = rand.nextDouble() * exp(mean);
double r = rand.nextDouble()*exp(mean);
int m = 0;
double p = 1;
double stirlingValue = mean * E;
double stirlingCoeff = 1 / sqrt(2 * PI);
while ((p < r) && (m < 3*ceil(mean)))
double stirlingValue = mean*E;
double stirlingCoeff = 1/sqrt(2*PI);
while((p < r) && (m < 3*ceil(mean)))
{
m ++;
p += stirlingCoeff/sqrt(m) * pow((stirlingValue/m), m);
m++;
p += stirlingCoeff/sqrt(m)*pow((stirlingValue/m), m);
}
return m;
}
}