|
121 | 121 | "outputs": [],
|
122 | 122 | "source": [
|
123 | 123 | "def get_path_length(path):\n",
|
124 |
| - " return np.sum(geocalc(path[1:, 0], path[1:, 1],\n", |
125 |
| - " path[:-1, 0], path[:-1, 1]))" |
| 124 | + " return np.sum(geocalc(path[1:, 1], path[1:, 0],\n", |
| 125 | + " path[:-1, 1], path[:-1, 0]))" |
126 | 126 | ]
|
127 | 127 | },
|
128 | 128 | {
|
|
170 | 170 | ],
|
171 | 171 | "source": [
|
172 | 172 | "# Compute the shortest path.\n",
|
173 |
| - "path = nx.shortest_path(sg,\n", |
174 |
| - " source=tuple(nodes[pos0_i]),\n", |
175 |
| - " target=tuple(nodes[pos1_i]),\n", |
176 |
| - " weight='distance')\n", |
| 173 | + "path = nx.shortest_path(\n", |
| 174 | + " sg,\n", |
| 175 | + " source=tuple(nodes[pos0_i]),\n", |
| 176 | + " target=tuple(nodes[pos1_i]),\n", |
| 177 | + " weight='distance')\n", |
177 | 178 | "len(path)"
|
178 | 179 | ]
|
179 | 180 | },
|
|
198 | 199 | }
|
199 | 200 | ],
|
200 | 201 | "source": [
|
201 |
| - "roads = pd.DataFrame([sg.edges[path[i], path[i + 1]]\n", |
202 |
| - " for i in range(len(path) - 1)],\n", |
203 |
| - " columns=['FULLNAME', 'MTFCC',\n", |
204 |
| - " 'RTTYP', 'distance'])\n", |
| 202 | + "roads = pd.DataFrame(\n", |
| 203 | + " [sg.edges[path[i], path[i + 1]]\n", |
| 204 | + " for i in range(len(path) - 1)],\n", |
| 205 | + " columns=['FULLNAME', 'MTFCC', 'RTTYP', 'distance'])\n", |
205 | 206 | "roads"
|
206 | 207 | ]
|
207 | 208 | },
|
|
248 | 249 | " p = get_path(path[i], path[i + 1])\n",
|
249 | 250 | " if curp is None:\n",
|
250 | 251 | " curp = p\n",
|
251 |
| - " if (np.sum((p[0] - curp)**2) >\n", |
252 |
| - " np.sum((p[-1] - curp)**2)):\n", |
| 252 | + " if (np.sum((p[0] - curp) ** 2) >\n", |
| 253 | + " np.sum((p[-1] - curp) ** 2)):\n", |
253 | 254 | " p = p[::-1, :]\n",
|
254 | 255 | " p_list.append(p)\n",
|
255 | 256 | " curp = p[-1]\n",
|
|
0 commit comments