From 13dd754ba6ada78d0d500b80e1fd0abfc9d7f469 Mon Sep 17 00:00:00 2001
From: "Michael Pilosov, PhD" <consistentbayes@gmail.com>
Date: Tue, 13 Feb 2024 06:46:18 +0000
Subject: [PATCH] nice set of params

---
 makefile                       |   2 +-
 scripts/lex_sorted_indices.npy | Bin 7720 -> 0 bytes
 scripts/sortcolor.py           |  18 +++++++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)
 delete mode 100644 scripts/lex_sorted_indices.npy

diff --git a/makefile b/makefile
index 4268fd8..3dd1b09 100644
--- a/makefile
+++ b/makefile
@@ -59,7 +59,7 @@ sort_umap:
 	python scripts/sortcolor.py -s umap --dpi 300 --seed 21
 
 parallel_umap:
-	parallel -j 8 python scripts/sortcolor.py -s umap --dpi 300 --seed ::: {1..8}
+	parallel -j 12 python scripts/sortcolor.py -s umap --dpi 300 --seed ::: $$(seq 101 112)
 
 sort_lex:
 	python scripts/sortcolor.py -s lex --dpi 300
diff --git a/scripts/lex_sorted_indices.npy b/scripts/lex_sorted_indices.npy
deleted file mode 100644
index 971bb7af3caa86f1e053f2ba4cf65bc7bf71248f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7720
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
SAs>jj?Yqij+eN0U>HP!0VBX{a

diff --git a/scripts/sortcolor.py b/scripts/sortcolor.py
index d50bc00..8ceb975 100644
--- a/scripts/sortcolor.py
+++ b/scripts/sortcolor.py
@@ -86,14 +86,16 @@ elif KIND == "umap":
     reducer = UMAP(
         n_components=1,
         n_neighbors=250,
-        min_dist=0.005,
+        min_dist=1e-2,
         metric="euclidean",
         random_state=SEED,
+        negative_sample_rate=2,
     )
     embedding = reducer.fit_transform(np.array(rgb_values))
 
     # Sort colors by the 1D representation
     preds = embedding[:, 0]
+    del reducer, embedding
 
 elif KIND in ("cielab", "lab", "ciede2000"):
     from skimage.color import deltaE_ciede2000, rgb2lab
@@ -130,10 +132,11 @@ else:
 sorted_indices = np.argsort(preds)
 
 # Save the sorted indices to disk
-if (KIND == "umap" and SEED == 21) or (KIND != "umap"):
-    file_path = f"scripts/{KIND}_sorted_indices.npy"
-    np.save(file_path, sorted_indices)
-    print(f"Sorted indices saved to {file_path}")
+# if (KIND == "umap") or (KIND != "umap"):
+Path(f"scripts/{KIND}").mkdir(parents=True, exist_ok=True)
+file_path = f"scripts/{KIND}/preds_{SEED:06d}.npy"
+np.save(file_path, preds)
+print(f"Predictions saved to {file_path}")
 
 # Sort colors by the 1D representation
 sorted_colors = [colors[i] for i in sorted_indices]
@@ -280,18 +283,19 @@ def plot_preds(
 
 prefix = ""
 if KIND == "umap":
-    prefix = f"{SEED:02d}"
+    prefix = f"{SEED:04d}"
 fname = f"{DIR}/{prefix}{KIND}_sorted_colors_circle.png"
 
 plot_preds(
     preds,
     np.array(rgb_values),
     fname,
-    roll=True,
+    roll=False,
     dpi=DPI,
     inner_radius=INNER_RADIUS,
     figsize=(SIZE, SIZE),
 )
+print(f"saved {fname}")
 
 HILBERT = False