Minor formatting fixes for sort_and_normalize_weights
This commit is contained in:
@@ -115,22 +115,27 @@ class Psk(object):
|
|||||||
|
|
||||||
def sort_and_normalize_weights(self):
|
def sort_and_normalize_weights(self):
|
||||||
self.weights.sort(key=lambda x: x.point_index)
|
self.weights.sort(key=lambda x: x.point_index)
|
||||||
|
|
||||||
weight_index = 0
|
weight_index = 0
|
||||||
weight_total = len(self.weights)
|
weight_total = len(self.weights)
|
||||||
|
|
||||||
while weight_index < weight_total:
|
while weight_index < weight_total:
|
||||||
|
point_index = self.weights[weight_index].point_index
|
||||||
|
weight_sum = self.weights[weight_index].weight
|
||||||
point_weight_total = 1
|
point_weight_total = 1
|
||||||
point_index: int = self.weights[weight_index].point_index
|
|
||||||
weight_sum: float = self.weights[weight_index].weight
|
# Calculate the sum of weights for the current point_index.
|
||||||
# Count the number of weights with contiguous point indices and sum the total weights.
|
for i in range(weight_index + 1, weight_total):
|
||||||
for w in range(weight_index + 1, weight_total):
|
if self.weights[i].point_index != point_index:
|
||||||
if point_index != self.weights[w].point_index:
|
|
||||||
break
|
break
|
||||||
|
weight_sum += self.weights[i].weight
|
||||||
point_weight_total += 1
|
point_weight_total += 1
|
||||||
weight_sum += self.weights[w].weight
|
|
||||||
# Now normalize the weights against the sum of all weights.
|
# Normalize the weights for the current point_index.
|
||||||
for weight in self.weights[weight_index:weight_index+point_weight_total]:
|
for i in range(weight_index, weight_index + point_weight_total):
|
||||||
weight.weight /= weight_sum
|
self.weights[i].weight /= weight_sum
|
||||||
# Increment
|
|
||||||
|
# Move to the next group of weights.
|
||||||
weight_index += point_weight_total
|
weight_index += point_weight_total
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user