Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR to fix issue with bandits incorrectly using batch index #104 #105

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

PR to fix issue with bandits incorrectly using batch index #104 #105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a20964d
pushing fix for batch idx issue
ashraym Aug 5, 2024
00faca8
adding final newline
ashraym Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions gam/clustering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,9 @@ def _swap_pairs(
i = a_swap[1]
d_ji = d[:, i]

E_batch = E[idx_ref]
D_batch = D[idx_ref]

if h_i == "h":
if isinstance(X, da.Array):
d_jh = dask_distance.cdist(
Expand All @@ -818,14 +821,14 @@ def _swap_pairs(
X[idx_ref, :], X[h, :].reshape(1, -1), metric=dist_func
).squeeze()
K_jih = np.zeros(self.batchsize)
diff_ji = d_ji[idx_ref] - D[idx_ref]
diff_ji = d_ji[idx_ref] - D_batch
idx = np.where(diff_ji > 0)

diff_jh = d_jh - D[idx_ref]
diff_jh = d_jh - D_batch
K_jih[idx] = np.minimum(diff_jh[idx], 0)

idx = np.where(diff_ji == 0)
K_jih[idx] = np.minimum(d_jh[idx], E[idx]) - D[idx]
K_jih[idx] = np.minimum(d_jh[idx], E_batch[idx]) - D_batch[idx]

# base-line update of mu and sigma
mu_x[h, i] = ((n_used_ref * mu_x[h, i]) + np.sum(K_jih)) / (
Expand Down Expand Up @@ -1011,3 +1014,4 @@ def _swap_bandit(self, X, centers, dist_func, max_iter, tol, verbose):
# our best swap would degrade the clustering (min Tih > 0)
current_iteration = current_iteration + 1
return centers