Merge pull request rasbt#125 from elfelround/patch-3

for loop fix to follow math formula
ff-uva · May 5, 2020 · f4bb301 · f4bb301
2 parents a19b19c + 15f171f
commit f4bb301
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ch15/ch15_part1.ipynb b/ch15/ch15_part1.ipynb
@@ -241,7 +241,7 @@
     "        x_padded = np.concatenate(\n",
     "            [zero_pad, x_padded, zero_pad])\n",
     "    res = []\n",
-    "    for i in range(0, int(len(x)/s),s):\n",
+    "    for i in range(0, int((len(x_padded) - len(w_rot)) / s) + 1, s):\n",
     "        res.append(np.sum(\n",
     "            x_padded[i:i+w_rot.shape[0]] * w_rot))\n",
     "    return np.array(res)\n",

diff --git a/ch15/ch15_part1.py b/ch15/ch15_part1.py
@@ -80,7 +80,7 @@ def conv1d(x, w, p=0, s=1):
         x_padded = np.concatenate(
             [zero_pad, x_padded, zero_pad])
     res = []
-    for i in range(0, int(len(x)/s),s):
+    for i in range(0, int((len(x_padded) - len(w_rot)) / s) + 1, s):
         res.append(np.sum(
             x_padded[i:i+w_rot.shape[0]] * w_rot))
     return np.array(res)