diff --git a/data/Fig2&3-objectives/meanBest.pickle b/data/Fig2&3-objectives/meanBest.pickle index d26812d..d42bea8 100644 Binary files a/data/Fig2&3-objectives/meanBest.pickle and b/data/Fig2&3-objectives/meanBest.pickle differ diff --git a/data/Fig2&3-objectives/meanGreedy.pickle b/data/Fig2&3-objectives/meanGreedy.pickle index 50c023f..724101c 100644 Binary files a/data/Fig2&3-objectives/meanGreedy.pickle and b/data/Fig2&3-objectives/meanGreedy.pickle differ diff --git a/data/solverData.csv b/data/solverData.csv index f2cfe7d..8e3a2dc 100644 --- a/data/solverData.csv +++ b/data/solverData.csv @@ -70,3 +70,9 @@ Uni-criterion: discreteCoverage,greedySwap,1000,10,10,0.10966670885682106,-53.0 Uni-criterion: clusterCenters,worstOfRandom,1000,2,10,0.029493208974599838,11.847265520187392 Uni-criterion: clusterCenters,bestOfRandom,1000,2,10,0.02857504179701209,2.789513312747127 Uni-criterion: clusterCenters,greedySwap,1000,2,10,0.13878262508660555,0.7724079671652213 +"Uni-criterion: preserveMetric, mean",worstOfRandom,1000,10,10,0.02800250006839633,9.50451408816041 +"Uni-criterion: preserveMetric, mean",bestOfRandom,1000,10,10,0.02774458285421133,1.4512032863232234 +"Uni-criterion: preserveMetric, mean",greedySwap,1000,10,10,0.13165183318778872,0.5215736802170967 +"Uni-criterion: preserveMetric, mean",worstOfRandom,1000,10,10,0.031927124597132206,9.503260009237106 +"Uni-criterion: preserveMetric, mean",bestOfRandom,1000,10,10,0.027917416766285896,1.460277122561562 +"Uni-criterion: preserveMetric, mean",greedySwap,1000,10,10,0.132963459007442,0.5640211475433015 diff --git a/jupyter/Fig2&3-objectives.ipynb b/jupyter/Fig2&3-objectives.ipynb index 69a7098..8dd31ce 100644 --- a/jupyter/Fig2&3-objectives.ipynb +++ b/jupyter/Fig2&3-objectives.ipynb @@ -28,9 +28,7 @@ "import numpy as np\n", "import seaborn as sns \n", "\n", - "from sklearn.cluster import KMeans\n", - "\n", - "# Local\n", + "# Local files\n", "import flexibleSubsetSelection as fss\n", "\n", "# Initialize notebook settings\n", @@ -58,11 +56,11 @@ "source": [ "directory = \"Fig2&3-objectives\" # data directory for this notebook\n", "seed = 123456789 # random seed for replicability\n", - "fss.logger.setup(level=logging.WARNING) # set logging level for the package\n", + "fss.logger.setup(level=logging.DEBUG) # set logging level for the package\n", "subsetSize = 10 # size of subset selected\n", "\n", "firstDataset = fss.Dataset(randTypes=\"multimodal\", size=(1000, 10), seed=seed)\n", - "firstDataset.save(f\"{directory}/firstSetFull\")" + "firstDataset.save(name=\"firstSetFull\", directory=Path(\"..\")/\"data\"/directory)" ] }, { @@ -488,7 +486,7 @@ "subsetSize = 10 # size of subset selected\n", "\n", "secondDataset = fss.Dataset(randTypes=\"blobs\", size=(1000, 2), seed=seed)\n", - "secondDataset.save(f\"{directory}/secondSetFull\")" + "secondDataset.save(name=\"secondSetFull\", directory=Path(\"..\")/\"data\"/directory)" ] }, {