X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=math_utils.py;h=ed9c2f450f0fb0a9b121069a19d4a0b1fe7acfba;hb=562a15c6397610cf93646d9530005eb4a0d6e6f8;hp=dd26cb6f175dea80ae28181c9cf983115b37f323;hpb=f6ec577f04044f21076c4c24c6aa2ab784c6cfc9;p=python_utils.git diff --git a/math_utils.py b/math_utils.py index dd26cb6..ed9c2f4 100644 --- a/math_utils.py +++ b/math_utils.py @@ -41,6 +41,8 @@ class NumericPopulation(object): self.lowers, self.highers = [], [] self.aggregate = 0.0 self.sorted_copy: Optional[List[float]] = None + self.maximum = None + self.minimum = None def add_number(self, number: float): """Adds a number to the population. Runtime complexity of this @@ -52,6 +54,10 @@ class NumericPopulation(object): heappush(self.lowers, -number) # for lowers we need a max heap self.aggregate += number self._rebalance() + if not self.maximum or number > self.maximum: + self.maximum = number + if not self.minimum or number < self.minimum: + self.minimum = number def _rebalance(self): if len(self.lowers) - len(self.highers) > 1: @@ -96,7 +102,7 @@ class NumericPopulation(object): variance += (n - mean) ** 2 for n in self.highers: variance += (n - mean) ** 2 - count = len(self.lowers) + len(self.highers) - 1 + count = len(self.lowers) + len(self.highers) return math.sqrt(variance) / count def _create_sorted_copy_if_needed(self, count: int): @@ -120,7 +126,8 @@ class NumericPopulation(object): self._create_sorted_copy_if_needed(count) assert self.sorted_copy index = round(count * (n / 100.0)) - assert 0 <= index < count + index = max(0, index) + index = min(count - 1, index) return self.sorted_copy[index]