replace some formats

zingale · zingale · commit 32f176908b1b · 2024-01-17T10:16:17.000-05:00
diff --git a/content/01-python/w3-python-exercises.ipynb b/content/01-python/w3-python-exercises.ipynb
@@ -271,7 +271,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [
     {
@@ -288,7 +288,7 @@
        " 's9': ''}"
       ]
      },
-     "execution_count": 9,
+     "execution_count": 1,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -298,7 +298,7 @@
     "\n",
     "def initialize_board(play):\n",
     "    for n in range(9):\n",
-    "        play[\"s{}\".format(n+1)] = \"\"\n",
+    "        play[f\"s{n+1}\"] = \"\"\n",
     "\n",
     "initialize_board(play)\n",
     "play"
diff --git a/content/01-python/w4-python-exercises.ipynb b/content/01-python/w4-python-exercises.ipynb
@@ -112,7 +112,7 @@
     "        self.quantity = quantity\n",
     "        \n",
     "    def __repr__(self):\n",
-    "        return \"{}: {}\".format(self.name, self.quantity)\n",
+    "        return f\"{self.name}: {self.quantity}\"\n",
     "        \n",
     "    def __eq__(self, other):\n",
     "        \"\"\"check if the items have the same name\"\"\"\n",
@@ -417,7 +417,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.2"
+   "version": "3.11.6"
   }
  },
  "nbformat": 4,
diff --git a/content/02-numpy/numpy-basics.ipynb b/content/02-numpy/numpy-basics.ipynb
@@ -18,9 +18,10 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "<div class=\"alert alert-block alert-warning\">\n",
+    "````{note}\n",
     "    \n",
-    "Note that the traditional way to import numpy is to rename it np.  This saves on typing and makes your code a little more compact.</div>"
+    "Note that the traditional way to import numpy is to rename it np.  This saves on typing and makes your code a little more compact.\n",
+    "````"
    ]
   },
   {
@@ -1146,7 +1147,7 @@
     "        g[i,j] = np.sin(2.0*np.pi*x[i]*y[j])\n",
     "        \n",
     "t1 = time.time()\n",
-    "print(\"time elapsed: {} s\".format(t1-t0))"
+    "print(f\"time elapsed: {t1-t0} s\""
    ]
   },
   {
@@ -1180,7 +1181,7 @@
     "t0 = time.time()\n",
     "g2 = np.sin(2.0*np.pi*x2d*y2d)\n",
     "t1 = time.time()\n",
-    "print(\"time elapsed: {} s\".format(t1-t0))"
+    "print(f\"time elapsed: {t1-t0} s\""
    ]
   },
   {
@@ -1273,7 +1274,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.9"
+   "version": "3.11.6"
   }
  },
  "nbformat": 4,
diff --git a/content/02-numpy/numpy-exercises.ipynb b/content/02-numpy/numpy-exercises.ipynb
@@ -224,7 +224,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.2"
+   "version": "3.11.6"
   }
  },
  "nbformat": 4,
diff --git a/content/11-machine-learning/keras-mnist.ipynb b/content/11-machine-learning/keras-mnist.ipynb
@@ -960,7 +960,7 @@
     "    try:\n",
     "        res = model.predict(np.array([x]), verbose=0)\n",
     "        if np.argmax(res) != np.argmax(y):\n",
-    "            print(\"test {}: prediction = {}, truth is {}\".format(n, np.argmax(res), np.argmax(y)))\n",
+    "            print(f\"test {n}: prediction = {np.argmax(res)}, truth is {np.argmax(y)}\"\n",
     "            plt.imshow(x.reshape(28, 28), cmap=\"gray_r\")\n",
     "            plt.show()\n",
     "            wrong += 1\n",

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,10 @@`
`18`	`18`	`"cell_type": "markdown",`
`19`	`19`	`"metadata": {},`
`20`	`20`	`"source": [`
`21`		`- "<div class=\"alert alert-block alert-warning\">\n",`
	`21`	+ "````{note}\n",
`22`	`22`	`" \n",`
`23`		`- "Note that the traditional way to import numpy is to rename it np. This saves on typing and makes your code a little more compact.</div>"`
	`23`	`+ "Note that the traditional way to import numpy is to rename it np. This saves on typing and makes your code a little more compact.\n",`
	`24`	+ "````"
`24`	`25`	`]`
`25`	`26`	`},`
`26`	`27`	`{`
`@@ -1146,7 +1147,7 @@`
`1146`	`1147`	`" g[i,j] = np.sin(2.0np.pix[i]*y[j])\n",`
`1147`	`1148`	`" \n",`
`1148`	`1149`	`"t1 = time.time()\n",`
`1149`		`- "print(\"time elapsed: {} s\".format(t1-t0))"`
	`1150`	`+ "print(f\"time elapsed: {t1-t0} s\""`
`1150`	`1151`	`]`
`1151`	`1152`	`},`
`1152`	`1153`	`{`
`@@ -1180,7 +1181,7 @@`
`1180`	`1181`	`"t0 = time.time()\n",`
`1181`	`1182`	`"g2 = np.sin(2.0np.pix2d*y2d)\n",`
`1182`	`1183`	`"t1 = time.time()\n",`
`1183`		`- "print(\"time elapsed: {} s\".format(t1-t0))"`
	`1184`	`+ "print(f\"time elapsed: {t1-t0} s\""`
`1184`	`1185`	`]`
`1185`	`1186`	`},`
`1186`	`1187`	`{`
`@@ -1273,7 +1274,7 @@`
`1273`	`1274`	`"name": "python",`
`1274`	`1275`	`"nbconvert_exporter": "python",`
`1275`	`1276`	`"pygments_lexer": "ipython3",`
`1276`		`- "version": "3.10.9"`
	`1277`	`+ "version": "3.11.6"`
`1277`	`1278`	`}`
`1278`	`1279`	`},`
`1279`	`1280`	`"nbformat": 4,`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@`
`224`	`224`	`"name": "python",`
`225`	`225`	`"nbconvert_exporter": "python",`
`226`	`226`	`"pygments_lexer": "ipython3",`
`227`		`- "version": "3.10.2"`
	`227`	`+ "version": "3.11.6"`
`228`	`228`	`}`
`229`	`229`	`},`
`230`	`230`	`"nbformat": 4,`