Jupyter book cell hide-input

uwgraphics · Jul 20, 2024 · 26b2410 · 26b2410
1 parent b715620
commit 26b2410
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 2 deletions.
diff --git a/data/Fig1-designProcess/blend1Subset.pickle b/data/Fig1-designProcess/blend1Subset.pickle
diff --git a/data/Fig1-designProcess/blend2Subset.pickle b/data/Fig1-designProcess/blend2Subset.pickle
diff --git a/data/Fig1-designProcess/blend3Subset.pickle b/data/Fig1-designProcess/blend3Subset.pickle
diff --git a/data/Fig1-designProcess/distinct1Subset.pickle b/data/Fig1-designProcess/distinct1Subset.pickle
diff --git a/data/Fig1-designProcess/distinct2Subset.pickle b/data/Fig1-designProcess/distinct2Subset.pickle
diff --git a/data/Fig1-designProcess/distinct3Subset.pickle b/data/Fig1-designProcess/distinct3Subset.pickle
diff --git a/data/Fig1-designProcess/distinctSubset.pickle b/data/Fig1-designProcess/distinctSubset.pickle
diff --git a/data/Fig1-designProcess/fullData.pickle b/data/Fig1-designProcess/fullData.pickle
diff --git a/data/Fig1-designProcess/hullSubset.pickle b/data/Fig1-designProcess/hullSubset.pickle
diff --git a/data/Fig1-designProcess/outliersSubset.pickle b/data/Fig1-designProcess/outliersSubset.pickle
diff --git a/data/solverLog.csv b/data/solverLog.csv
@@ -194,3 +194,12 @@ Uni-criterion: discreteCoverage,greedySwap,1000,10,10,0.10554337501525879,-53.0
 Uni-criterion: clusterCenters,worstOfRandom,1000,2,10,0.028890457935631275,10.970521918610308
 Uni-criterion: clusterCenters,bestOfRandom,1000,2,10,0.02879470819607377,2.513555554071612
 Uni-criterion: clusterCenters,greedySwap,1000,2,10,0.13824820891022682,0.7651631287086615
+"Uni-criterion: preserveMetric, hull",greedyMinSubset,200,2,10,0.8333522151224315,0.0
+"Uni-criterion: sum, outlierness",greedySwap,200,2,40,0.14365031104534864,-69.2782944073144
+"Uni-criterion: distinctness, distances",greedySwap,200,2,60,0.3802729081362486,-70.9729159793774
+"Multi-criterion: 100*(earthMoversDistance) + 1*(distinctness, distances)",greedySwap,200,2,80,16.162458459381014,-38.17635129972456
+"Multi-criterion: 10*(earthMoversDistance) + 1*(distinctness, distances)",greedySwap,200,2,80,16.57248892588541,-67.0834787251535
+"Multi-criterion: 1*(earthMoversDistance) + 1*(distinctness, distances)",greedySwap,200,2,80,17.910313550848514,-73.27776302088019
+"Uni-criterion: distinctness, distances",greedyMixed,200,2,27,0.12416926166042686,-41.35106343740662
+"Uni-criterion: distinctness, distances",greedyMixed,200,2,14,0.0512898382730782,-42.63467324402975
+"Uni-criterion: distinctness, distances",greedyMixed,200,2,91,0.3911852678284049,-69.8726033176274
diff --git a/figures/Fig1-designProcess/blend.pdf b/figures/Fig1-designProcess/blend.pdf
diff --git a/figures/Fig1-designProcess/express.pdf b/figures/Fig1-designProcess/express.pdf
diff --git a/figures/Fig1-designProcess/tune.pdf b/figures/Fig1-designProcess/tune.pdf
diff --git a/jupyter/Fig1-designProcess.ipynb b/jupyter/Fig1-designProcess.ipynb
@@ -306,7 +306,7 @@
     "    ax.set_xticks([])\n",
     "    ax.set_yticks([])\n",
     "    ax.set_title(titles[i], fontsize=subtitleSize)\n",
-    "    ax.set_aspect(\"equal\")\n",
+    "    # ax.set_aspect(\"equal\")\n",
     "\n",
     "    fss.plot.scatter(ax = ax, \n",
     "                 color = color, \n",
@@ -387,7 +387,7 @@
     "    ax.set_xticks([])\n",
     "    ax.set_yticks([])\n",
     "    ax.set_title(titles[i], fontsize=subtitleSize)\n",
-    "    ax.set_aspect(\"equal\")\n",
+    "    # ax.set_aspect(\"equal\")\n",
     "\n",
     "    fss.plot.scatter(ax = ax, \n",
     "                 color = color, \n",