diff options
| -rw-r--r-- | epare/simulate.ipynb | 33 | ||||
| -rw-r--r-- | epare/visualize.ipynb | 2 |
2 files changed, 26 insertions, 9 deletions
diff --git a/epare/simulate.ipynb b/epare/simulate.ipynb index 54e29ca..638be5a 100644 --- a/epare/simulate.ipynb +++ b/epare/simulate.ipynb @@ -61,6 +61,16 @@ { "cell_type": "code", "execution_count": null, + "id": "a95b27fc-96a9-41b5-9972-dc8386ed386d", + "metadata": {}, + "outputs": [], + "source": [ + "print(len(all_mults_with_ctr))" + ] + }, + { + "cell_type": "code", + "execution_count": null, "id": "07bc266d-35eb-4f6d-bdba-e9f6f66827f1", "metadata": {}, "outputs": [], @@ -176,12 +186,16 @@ " else:\n", " # Accumulate\n", " multiples_mults[mult].merge(res)\n", + "\n", " # Handle the enable_spawn trick that messes up class modules.\n", " for k, v in multiples_mults.items():\n", " v.__class__ = MultResults\n", " v.__module__ = \"common\"\n", + "\n", + "# Save\n", "with open(f\"multiples_{category}_{curve}_{bits}_ctr_chunk{chunk_id}.pickle\",\"wb\") as h:\n", - " pickle.dump(multiples_mults, h)" + " for mult, res in multiples_mults.items():\n", + " pickle.dump((mult, res), h)" ] }, { @@ -205,12 +219,15 @@ "multiples_mults = {}\n", "for fname in glob.glob(f\"multiples_{category}_{curve}_{bits}_chunk*.pickle\"):\n", " with open(fname, \"rb\") as f:\n", - " multiples_loaded = pickle.load(f)\n", - " for mult, vals in multiples_loaded.items():\n", - " if mult not in multiples_mults:\n", - " multiples_mults[mult] = vals\n", - " else:\n", - " multiples_mults[mult].merge(vals)" + " while True:\n", + " try:\n", + " mult, vals = pickle.load(f)\n", + " if mult not in multiples_mults:\n", + " multiples_mults[mult] = vals\n", + " else:\n", + " multiples_mults[mult].merge(vals)\n", + " except EOFError:\n", + " break" ] }, { @@ -238,7 +255,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.3" + "version": "3.13.1" } }, "nbformat": 4, diff --git a/epare/visualize.ipynb b/epare/visualize.ipynb index f423f78..5731b13 100644 --- a/epare/visualize.ipynb +++ b/epare/visualize.ipynb @@ -485,7 +485,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.3" + "version": "3.13.1" } }, "nbformat": 4, |