1 files changed, 0 insertions, 29 deletions

diff --git a/analysis/scalarmults/simulate.ipynb b/analysis/scalarmults/simulate.ipynb
index d402549..c1f123a 100644
--- a/analysis/scalarmults/simulate.ipynb
+++ b/analysis/scalarmults/simulate.ipynb
@@ -138,17 +138,10 @@
     "\n",
     "use_init = True\n",
     "use_multiply = True\n",
-<<<<<<< HEAD
     "\n",
     "num_workers = 30\n",
     "samples = 1000\n",
     "\n",
-=======
-    "params = get_params(category, curve, \"projective\")\n",
-    "num_workers = 30\n",
-    "bits = params.order.bit_length()\n",
-    "samples = 1000\n",
->>>>>>> 6a6ef6a (Fixup some nits in simulate ntb.)
     "selected_mults = all_mults"
    ]
   },
@@ -198,17 +191,11 @@
     "                              bits: int,\n",
     "                              fname: str,\n",
     "                              samples: int = 100,\n",
-<<<<<<< HEAD
     "                              seed: bytes | None = None) -> str:\n",
     "    \"\"\"\n",
     "    Like the `simulate_multiples` function above, but stores the pickled output directly\n",
     "    into a file named `fname`.\n",
     "    \"\"\"\n",
-=======
-    "                              use_init: bool = True,\n",
-    "                              use_multiply: bool = True,\n",
-    "                              seed: bytes | None = None) -> MultResults:\n",
->>>>>>> 6a6ef6a (Fixup some nits in simulate ntb.)
     "    results = []\n",
     "    if seed is not None:\n",
     "        random.seed(seed)\n",
@@ -222,11 +209,7 @@
     "        scalars = [one for _ in range(samples)]\n",
     "\n",
     "    for scalar in scalars:\n",
-<<<<<<< HEAD
     "        results.append(multiple_graph(scalar, params, mult.klass, mult.partial))\n",
-=======
-    "        results.append(multiple_graph(scalar, params, mult.klass, mult.partial, use_init, use_multiply))\n",
->>>>>>> 6a6ef6a (Fixup some nits in simulate ntb.)
     "    result = MultResults(results, samples)\n",
     "    with open(fname, \"wb\") as f:\n",
     "        pickle.dump((mult, result), f)\n",
@@ -335,13 +318,8 @@
     "    for i, mult in enumerate(all_mults_with_ctr):\n",
     "        pool.submit_task(mult,\n",
     "                         simulate_multiples_direct,\n",
-<<<<<<< HEAD
     "                         mult, params, bits, tmp_path / f\"{i}.pickle\", samples, seed=chunk_id)\n",
     "    with open(f\"multiples_{bits}_chunk{chunk_id}.pickle\",\"wb\") as h:\n",
-=======
-    "                         mult, params, bits, tmp_path / f\"{i}.pickle\", samples, seed=chunk_id, use_init=use_init, use_multiply=use_multiply)\n",
-    "    with open(f\"multiples_{bits}_{'init' if use_init else 'noinit'}_{'mult' if use_multiply else 'nomult'}_chunk{chunk_id}.pickle\",\"wb\") as h:\n",
->>>>>>> 6a6ef6a (Fixup some nits in simulate ntb.)
     "        for mult, future in tqdm(pool.as_completed(), desc=\"Computing multiple graphs.\", total=len(pool.tasks)):\n",
     "            #print(f\"Got {mult}.\")\n",
     "            if error := future.exception():\n",
@@ -378,14 +356,7 @@
     "with TaskExecutor(max_workers=num_workers, initializer=silence) as pool:\n",
     "    for in_fname in tqdm(glob.glob(f\"multiples_{bits}_chunk*.pickle\"), desc=\"Processing chunks\", smoothing=0):\n",
     "        \n",
-<<<<<<< HEAD
     "        match = re.match(\"multiples_(?P<bits>[0-9]+)_chunk(?P<id>[0-9a-f]+).pickle\", in_fname)\n",
-=======
-    "        match = re.match(\"multiples_(?P<bits>[0-9]+)_(?P<init>(?:no)?init)_(?P<mult>(?:no)?mult)_chunk(?P<id>[0-9a-f]+).pickle\", in_fname)\n",
-    "        bits = int(match.group(\"bits\"))\n",
-    "        use_init = match.group(\"init\")\n",
-    "        use_multiply = match.group(\"mult\")\n",
->>>>>>> 6a6ef6a (Fixup some nits in simulate ntb.)
     "        chunk_id = match.group(\"id\")\n",
     "        out_fname = f\"probs_{bits}_{'i' if use_init else 'ni'}_{'m' if use_multiply else 'nm'}_chunk{chunk_id}.pickle\"\n",
     "\n",