Skip to content

Commit 9b76211

Browse files
author
Mark Needham
committed
all examples now show nodes
1 parent c17bfcd commit 9b76211

10 files changed

+373
-162
lines changed

‎notebooks/AllPairsShortestPath.ipynb‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -130,57 +130,57 @@
130130
" </tr>\n",
131131
" <tr>\n",
132132
" <th>1</th>\n",
133-
" <td>B</td>\n",
133+
" <td>D</td>\n",
134134
" <td>F</td>\n",
135-
" <td>90.0</td>\n",
135+
" <td>50.0</td>\n",
136136
" </tr>\n",
137137
" <tr>\n",
138138
" <th>2</th>\n",
139139
" <td>B</td>\n",
140-
" <td>B</td>\n",
141-
" <td>0.0</td>\n",
140+
" <td>F</td>\n",
141+
" <td>90.0</td>\n",
142142
" </tr>\n",
143143
" <tr>\n",
144144
" <th>3</th>\n",
145-
" <td>B</td>\n",
146145
" <td>D</td>\n",
147-
" <td>40.0</td>\n",
146+
" <td>D</td>\n",
147+
" <td>0.0</td>\n",
148148
" </tr>\n",
149149
" <tr>\n",
150150
" <th>4</th>\n",
151151
" <td>B</td>\n",
152-
" <td>E</td>\n",
153-
" <td>70.0</td>\n",
152+
" <td>B</td>\n",
153+
" <td>0.0</td>\n",
154154
" </tr>\n",
155155
" <tr>\n",
156156
" <th>5</th>\n",
157157
" <td>D</td>\n",
158-
" <td>F</td>\n",
159-
" <td>50.0</td>\n",
158+
" <td>E</td>\n",
159+
" <td>30.0</td>\n",
160160
" </tr>\n",
161161
" <tr>\n",
162162
" <th>6</th>\n",
163+
" <td>B</td>\n",
163164
" <td>D</td>\n",
164-
" <td>D</td>\n",
165-
" <td>0.0</td>\n",
165+
" <td>40.0</td>\n",
166166
" </tr>\n",
167167
" <tr>\n",
168168
" <th>7</th>\n",
169-
" <td>D</td>\n",
169+
" <td>B</td>\n",
170170
" <td>E</td>\n",
171-
" <td>30.0</td>\n",
171+
" <td>70.0</td>\n",
172172
" </tr>\n",
173173
" <tr>\n",
174174
" <th>8</th>\n",
175175
" <td>A</td>\n",
176-
" <td>F</td>\n",
177-
" <td>140.0</td>\n",
176+
" <td>A</td>\n",
177+
" <td>0.0</td>\n",
178178
" </tr>\n",
179179
" <tr>\n",
180180
" <th>9</th>\n",
181181
" <td>A</td>\n",
182-
" <td>A</td>\n",
183-
" <td>0.0</td>\n",
182+
" <td>F</td>\n",
183+
" <td>100.0</td>\n",
184184
" </tr>\n",
185185
" <tr>\n",
186186
" <th>10</th>\n",
@@ -198,13 +198,13 @@
198198
" <th>12</th>\n",
199199
" <td>A</td>\n",
200200
" <td>D</td>\n",
201-
" <td>90.0</td>\n",
201+
" <td>50.0</td>\n",
202202
" </tr>\n",
203203
" <tr>\n",
204204
" <th>13</th>\n",
205205
" <td>A</td>\n",
206206
" <td>E</td>\n",
207-
" <td>120.0</td>\n",
207+
" <td>80.0</td>\n",
208208
" </tr>\n",
209209
" <tr>\n",
210210
" <th>14</th>\n",
@@ -249,19 +249,19 @@
249249
"text/plain": [
250250
" source target distance\n",
251251
"0 F F 0.0\n",
252-
"1 B F 90.0\n",
253-
"2 B B 0.0\n",
254-
"3 B D 40.0\n",
255-
"4 B E 70.0\n",
256-
"5 D F 50.0\n",
257-
"6 D D 0.0\n",
258-
"7 D E 30.0\n",
259-
"8 A F 140.0\n",
260-
"9 A A 0.0\n",
252+
"1 D F 50.0\n",
253+
"2 B F 90.0\n",
254+
"3 D D 0.0\n",
255+
"4 B B 0.0\n",
256+
"5 D E 30.0\n",
257+
"6 B D 40.0\n",
258+
"7 B E 70.0\n",
259+
"8 A A 0.0\n",
260+
"9 A F 100.0\n",
261261
"10 A B 50.0\n",
262262
"11 A C 50.0\n",
263-
"12 A D 90.0\n",
264-
"13 A E 120.0\n",
263+
"12 A D 50.0\n",
264+
"13 A E 80.0\n",
265265
"14 E F 20.0\n",
266266
"15 E E 0.0\n",
267267
"16 C F 90.0\n",

‎notebooks/BetweennessCentrality.ipynb‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,53 +118,53 @@
118118
" <thead>\n",
119119
" <tr style=\"text-align: right;\">\n",
120120
" <th></th>\n",
121-
" <th>nodeId</th>\n",
121+
" <th>user</th>\n",
122122
" <th>centrality</th>\n",
123123
" </tr>\n",
124124
" </thead>\n",
125125
" <tbody>\n",
126126
" <tr>\n",
127127
" <th>0</th>\n",
128-
" <td>83</td>\n",
128+
" <td>Alice</td>\n",
129129
" <td>4.0</td>\n",
130130
" </tr>\n",
131131
" <tr>\n",
132132
" <th>1</th>\n",
133-
" <td>85</td>\n",
133+
" <td>Charles</td>\n",
134134
" <td>2.0</td>\n",
135135
" </tr>\n",
136136
" <tr>\n",
137137
" <th>2</th>\n",
138-
" <td>84</td>\n",
138+
" <td>Mark</td>\n",
139139
" <td>0.0</td>\n",
140140
" </tr>\n",
141141
" <tr>\n",
142142
" <th>3</th>\n",
143-
" <td>86</td>\n",
143+
" <td>Michael</td>\n",
144144
" <td>0.0</td>\n",
145145
" </tr>\n",
146146
" <tr>\n",
147147
" <th>4</th>\n",
148-
" <td>203</td>\n",
148+
" <td>Bridget</td>\n",
149149
" <td>0.0</td>\n",
150150
" </tr>\n",
151151
" <tr>\n",
152152
" <th>5</th>\n",
153-
" <td>204</td>\n",
153+
" <td>Doug</td>\n",
154154
" <td>0.0</td>\n",
155155
" </tr>\n",
156156
" </tbody>\n",
157157
"</table>\n",
158158
"</div>"
159159
],
160160
"text/plain": [
161-
" nodeId centrality\n",
162-
"0 83 4.0\n",
163-
"1 85 2.0\n",
164-
"2 84 0.0\n",
165-
"3 86 0.0\n",
166-
"4 203 0.0\n",
167-
"5 204 0.0"
161+
" user centrality\n",
162+
"0 Alice 4.0\n",
163+
"1 Charles 2.0\n",
164+
"2 Mark 0.0\n",
165+
"3 Michael 0.0\n",
166+
"4 Bridget 0.0\n",
167+
"5 Doug 0.0"
168168
]
169169
},
170170
"execution_count": 4,
@@ -175,8 +175,13 @@
175175
"source": [
176176
"streaming_query = \"\"\"\n",
177177
"CALL algo.betweenness.stream('User','MANAGE',{direction:'out'}) \n",
178-
"YIELD nodeId, centrality \n",
179-
"RETURN nodeId,centrality order by centrality desc limit 20;\n",
178+
"YIELD nodeId, centrality\n",
179+
"\n",
180+
"MATCH (user:User) WHERE id(user) = nodeId\n",
181+
"\n",
182+
"RETURN user.id AS user,centrality\n",
183+
"ORDER BY centrality DESC\n",
184+
"LIMIT 20;\n",
180185
"\"\"\"\n",
181186
"\n",
182187
"with driver.session() as session:\n",

‎notebooks/ClosenessCentrality.ipynb‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -118,47 +118,47 @@
118118
" <thead>\n",
119119
" <tr style=\"text-align: right;\">\n",
120120
" <th></th>\n",
121-
" <th>nodeId</th>\n",
121+
" <th>node</th>\n",
122122
" <th>centrality</th>\n",
123123
" </tr>\n",
124124
" </thead>\n",
125125
" <tbody>\n",
126126
" <tr>\n",
127127
" <th>0</th>\n",
128-
" <td>66</td>\n",
128+
" <td>C</td>\n",
129129
" <td>0.666667</td>\n",
130130
" </tr>\n",
131131
" <tr>\n",
132132
" <th>1</th>\n",
133-
" <td>88</td>\n",
133+
" <td>B</td>\n",
134134
" <td>0.571429</td>\n",
135135
" </tr>\n",
136136
" <tr>\n",
137137
" <th>2</th>\n",
138-
" <td>218</td>\n",
138+
" <td>D</td>\n",
139139
" <td>0.571429</td>\n",
140140
" </tr>\n",
141141
" <tr>\n",
142142
" <th>3</th>\n",
143-
" <td>89</td>\n",
143+
" <td>A</td>\n",
144144
" <td>0.400000</td>\n",
145145
" </tr>\n",
146146
" <tr>\n",
147147
" <th>4</th>\n",
148-
" <td>217</td>\n",
148+
" <td>E</td>\n",
149149
" <td>0.400000</td>\n",
150150
" </tr>\n",
151151
" </tbody>\n",
152152
"</table>\n",
153153
"</div>"
154154
],
155155
"text/plain": [
156-
" nodeId centrality\n",
157-
"0 66 0.666667\n",
158-
"1 88 0.571429\n",
159-
"2 218 0.571429\n",
160-
"3 89 0.400000\n",
161-
"4 217 0.400000"
156+
" node centrality\n",
157+
"0 C 0.666667\n",
158+
"1 B 0.571429\n",
159+
"2 D 0.571429\n",
160+
"3 A 0.400000\n",
161+
"4 E 0.400000"
162162
]
163163
},
164164
"execution_count": 4,
@@ -168,8 +168,14 @@
168168
],
169169
"source": [
170170
"streaming_query = \"\"\"\n",
171-
"CALL algo.closeness.stream('Node', 'LINK') YIELD nodeId, centrality\n",
172-
"RETURN nodeId,centrality order by centrality desc limit 20;\n",
171+
"CALL algo.closeness.stream('Node', 'LINK')\n",
172+
"YIELD nodeId, centrality\n",
173+
"\n",
174+
"MATCH (n:Node) WHERE id(n) = nodeId\n",
175+
"\n",
176+
"RETURN n.id AS node, centrality\n",
177+
"ORDER BY centrality DESC\n",
178+
"limit 20;\n",
173179
"\"\"\"\n",
174180
"\n",
175181
"with driver.session() as session:\n",

‎notebooks/Louvain.ipynb‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -126,53 +126,53 @@
126126
" <thead>\n",
127127
" <tr style=\"text-align: right;\">\n",
128128
" <th></th>\n",
129-
" <th>nodeId</th>\n",
129+
" <th>user</th>\n",
130130
" <th>community</th>\n",
131131
" </tr>\n",
132132
" </thead>\n",
133133
" <tbody>\n",
134134
" <tr>\n",
135135
" <th>0</th>\n",
136-
" <td>78</td>\n",
137-
" <td>1</td>\n",
136+
" <td>Alice</td>\n",
137+
" <td>0</td>\n",
138138
" </tr>\n",
139139
" <tr>\n",
140140
" <th>1</th>\n",
141-
" <td>79</td>\n",
142-
" <td>1</td>\n",
141+
" <td>Bridget</td>\n",
142+
" <td>0</td>\n",
143143
" </tr>\n",
144144
" <tr>\n",
145145
" <th>2</th>\n",
146-
" <td>155</td>\n",
147-
" <td>3</td>\n",
146+
" <td>Charles</td>\n",
147+
" <td>2</td>\n",
148148
" </tr>\n",
149149
" <tr>\n",
150150
" <th>3</th>\n",
151-
" <td>174</td>\n",
152-
" <td>3</td>\n",
151+
" <td>Doug</td>\n",
152+
" <td>2</td>\n",
153153
" </tr>\n",
154154
" <tr>\n",
155155
" <th>4</th>\n",
156-
" <td>175</td>\n",
157-
" <td>3</td>\n",
156+
" <td>Mark</td>\n",
157+
" <td>2</td>\n",
158158
" </tr>\n",
159159
" <tr>\n",
160160
" <th>5</th>\n",
161-
" <td>176</td>\n",
162-
" <td>1</td>\n",
161+
" <td>Michael</td>\n",
162+
" <td>0</td>\n",
163163
" </tr>\n",
164164
" </tbody>\n",
165165
"</table>\n",
166166
"</div>"
167167
],
168168
"text/plain": [
169-
" nodeId community\n",
170-
"0 78 1\n",
171-
"1 79 1\n",
172-
"2 155 3\n",
173-
"3 174 3\n",
174-
"4 175 3\n",
175-
"5 176 1"
169+
" user community\n",
170+
"0 Alice 0\n",
171+
"1 Bridget 0\n",
172+
"2 Charles 2\n",
173+
"3 Doug 2\n",
174+
"4 Mark 2\n",
175+
"5 Michael 0"
176176
]
177177
},
178178
"execution_count": 4,
@@ -184,7 +184,11 @@
184184
"streaming_query = \"\"\"\n",
185185
"CALL algo.louvain.stream('User', 'FRIEND', {})\n",
186186
"YIELD nodeId, community\n",
187-
"RETURN nodeId, community LIMIT 20;\n",
187+
"\n",
188+
"MATCH (user:User) WHERE id(user) = nodeId\n",
189+
"\n",
190+
"RETURN user.id AS user, community\n",
191+
"LIMIT 20;\n",
188192
"\"\"\"\n",
189193
"\n",
190194
"with driver.session() as session:\n",

0 commit comments

Comments
 (0)