Skip to content
This repository was archived by the owner on Apr 22, 2020. It is now read-only.

Commit 862c151

Browse files
mneedhamMark Needham
mneedham
authored and
Mark Needham
committed
Moving Harmonic and Dangalchev under algo.closeness (#557)
1 parent 2d132a4 commit 862c151

File tree

8 files changed

+20
-21
lines changed

8 files changed

+20
-21
lines changed

‎algo/src/main/java/org/neo4j/graphalgo/DangalchevCentralityProc.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public class DangalchevCentralityProc {
5555
@Context
5656
public KernelTransaction transaction;
5757

58-
@Procedure(value = "algo.dangalchev.stream")
59-
@Description("CALL algo.dangalchev.stream(label:String, relationship:String{concurrency:4}) YIELD nodeId, centrality - yields centrality for each node")
58+
@Procedure(value = "algo.closeness.dangalchev.stream")
59+
@Description("CALL algo.closeness.dangalchev.stream(label:String, relationship:String{concurrency:4}) YIELD nodeId, centrality - yields centrality for each node")
6060
public Stream<DangalchevClosenessCentrality.Result> dangalchevStream(
6161
@Name(value = "label", defaultValue = "") String label,
6262
@Name(value = "relationship", defaultValue = "") String relationship,
@@ -86,8 +86,8 @@ public Stream<DangalchevClosenessCentrality.Result> dangalchevStream(
8686
return algo.resultStream();
8787
}
8888

89-
@Procedure(value = "algo.dangalchev", mode = Mode.WRITE)
90-
@Description("CALL algo.dangalchev(label:String, relationship:String, {write:true, writeProperty:'centrality, concurrency:4'}) YIELD " +
89+
@Procedure(value = "algo.closeness.dangalchev", mode = Mode.WRITE)
90+
@Description("CALL algo.closeness.dangalchev(label:String, relationship:String, {write:true, writeProperty:'centrality, concurrency:4'}) YIELD " +
9191
"loadMillis, computeMillis, writeMillis, nodes] - yields evaluation details")
9292
public Stream<CentralityProcResult> dangalchev(
9393
@Name(value = "label", defaultValue = "") String label,

‎algo/src/main/java/org/neo4j/graphalgo/HarmonicCentralityProc.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public class HarmonicCentralityProc {
5555
@Context
5656
public KernelTransaction transaction;
5757

58-
@Procedure(value = "algo.harmonic.stream")
59-
@Description("CALL algo.harmonic.stream(label:String, relationship:String{concurrency:4}) YIELD nodeId, centrality - yields centrality for each node")
58+
@Procedure(value = "algo.closeness.harmonic.stream")
59+
@Description("CALL algo.closeness.harmonic.stream(label:String, relationship:String{concurrency:4}) YIELD nodeId, centrality - yields centrality for each node")
6060
public Stream<HarmonicCentrality.Result> harmonicStream(
6161
@Name(value = "label", defaultValue = "") String label,
6262
@Name(value = "relationship", defaultValue = "") String relationship,
@@ -86,8 +86,8 @@ public Stream<HarmonicCentrality.Result> harmonicStream(
8686
return algo.resultStream();
8787
}
8888

89-
@Procedure(value = "algo.harmonic", mode = Mode.WRITE)
90-
@Description("CALL algo.harmonic(label:String, relationship:String, {write:true, writeProperty:'centrality, concurrency:4'}) YIELD " +
89+
@Procedure(value = "algo.closeness.harmonic", mode = Mode.WRITE)
90+
@Description("CALL algo.closeness.harmonic(label:String, relationship:String, {write:true, writeProperty:'centrality, concurrency:4'}) YIELD " +
9191
"loadMillis, computeMillis, writeMillis, nodes] - yields evaluation details")
9292
public Stream<CentralityProcResult> harmonic(
9393
@Name(value = "label", defaultValue = "") String label,

‎doc/harmonic-centrality.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ of each cell and multiply by 1/(n-1)
108108
.Running algorithm and writing back results
109109
[source,cypher]
110110
----
111-
CALL algo.harmonic(label:String, relationship:String,
111+
CALL algo.closeness.harmonic(label:String, relationship:String,
112112
{write:true, writeProperty:'centrality',graph:'heavy', concurrency:4})
113113
YIELD nodes,loadMillis, computeMillis, writeMillis
114114
- calculates closeness centrality and potentially writes back
@@ -142,7 +142,7 @@ YIELD nodes,loadMillis, computeMillis, writeMillis
142142
.Running algorithm and streaming results
143143
[source,cypher]
144144
----
145-
CALL algo.harmonic.stream(label:String, relationship:String,{concurrency:4})
145+
CALL algo.closeness.harmonic.stream(label:String, relationship:String,{concurrency:4})
146146
YIELD nodeId, centrality - yields centrality for each node
147147
----
148148

‎doc/scripts/harmonic-centrality.cypher‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CREATE (a)-[:LINK]->(b),
1313

1414
// tag::stream-sample-graph[]
1515

16-
CALL algo.harmonic.stream('Node', 'LINKS') YIELD nodeId, centrality
16+
CALL algo.closeness.harmonic.stream('Node', 'LINKS') YIELD nodeId, centrality
1717
RETURN nodeId,centrality
1818
ORDER BY centrality DESC
1919
LIMIT 20;
@@ -22,14 +22,14 @@ LIMIT 20;
2222

2323
// tag::write-sample-graph[]
2424

25-
CALL algo.harmonic('Node', 'LINK', {writeProperty:'centrality'})
25+
CALL algo.closeness.harmonic('Node', 'LINK', {writeProperty:'centrality'})
2626
YIELD nodes,loadMillis, computeMillis, writeMillis;
2727

2828
// end::write-sample-graph[]
2929

3030
// tag::cypher-loading[]
3131

32-
CALL algo.harmonic(
32+
CALL algo.closeness.harmonic(
3333
'MATCH (p:Node) RETURN id(p) as id',
3434
'MATCH (p1:Node)-[:LINK]-(p2:Node) RETURN id(p1) as source, id(p2) as target',
3535
{graph:'cypher', writeProperty: 'centrality'}

‎readme.adoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ These algorithms determine the importance of distinct nodes in a network.
2323
* Page Rank (`algo.pageRank`)
2424
* Betweenness Centrality (`algo.betweenness`)
2525
* Closeness Centrality (`algo.closeness`)
26-
* Harmonic Centrality (`algo.harmonic`)
2726

2827
=== Community Detection
2928

‎tests/src/test/java/org/neo4j/graphalgo/algo/DangalchevCentralityIntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public static void tearDown() throws Exception {
108108
@Test
109109
public void testClosenessStream() throws Exception {
110110

111-
db.execute("CALL algo.dangalchev.stream('Node', 'TYPE') YIELD nodeId, centrality")
111+
db.execute("CALL algo.closeness.dangalchev.stream('Node', 'TYPE') YIELD nodeId, centrality")
112112
.accept((Result.ResultVisitor<Exception>) row -> {
113113
consumer.accept(
114114
row.getNumber("nodeId").longValue(),
@@ -122,7 +122,7 @@ public void testClosenessStream() throws Exception {
122122
@Test
123123
public void testClosenessWrite() throws Exception {
124124

125-
db.execute("CALL algo.dangalchev('','', {write:true, stats:true, writeProperty:'centrality'}) YIELD " +
125+
db.execute("CALL algo.closeness.dangalchev('','', {write:true, stats:true, writeProperty:'centrality'}) YIELD " +
126126
"nodes, loadMillis, computeMillis, writeMillis")
127127
.accept((Result.ResultVisitor<Exception>) row -> {
128128
assertNotEquals(-1L, row.getNumber("writeMillis"));

‎tests/src/test/java/org/neo4j/graphalgo/algo/HarmonicCentralityIntegrationTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static void setupGraph() throws KernelException {
102102
@Test
103103
public void testHarmonicStream() throws Exception {
104104

105-
db.execute("CALL algo.harmonic.stream('Node', 'TYPE') YIELD nodeId, centrality")
105+
db.execute("CALL algo.closeness.harmonic.stream('Node', 'TYPE') YIELD nodeId, centrality")
106106
.accept((Result.ResultVisitor<Exception>) row -> {
107107
consumer.accept(
108108
row.getNumber("nodeId").longValue(),
@@ -117,7 +117,7 @@ public void testHarmonicStream() throws Exception {
117117
@Test
118118
public void testHugeHarmonicStream() throws Exception {
119119

120-
db.execute("CALL algo.harmonic.stream('Node', 'TYPE', {graph:'huge'}) YIELD nodeId, centrality")
120+
db.execute("CALL algo.closeness.harmonic.stream('Node', 'TYPE', {graph:'huge'}) YIELD nodeId, centrality")
121121
.accept((Result.ResultVisitor<Exception>) row -> {
122122
consumer.accept(
123123
row.getNumber("nodeId").longValue(),
@@ -131,7 +131,7 @@ public void testHugeHarmonicStream() throws Exception {
131131
@Test
132132
public void testHarmonicWrite() throws Exception {
133133

134-
db.execute("CALL algo.harmonic('','', {write:true, stats:true, writeProperty:'centrality'}) YIELD " +
134+
db.execute("CALL algo.closeness.harmonic('','', {write:true, stats:true, writeProperty:'centrality'}) YIELD " +
135135
"nodes, loadMillis, computeMillis, writeMillis")
136136
.accept((Result.ResultVisitor<Exception>) row -> {
137137
assertNotEquals(-1L, row.getNumber("writeMillis"));
@@ -154,7 +154,7 @@ public void testHarmonicWrite() throws Exception {
154154
@Test
155155
public void testHugeHarmonicWrite() throws Exception {
156156

157-
db.execute("CALL algo.harmonic('','', {write:true, stats:true, writeProperty:'centrality', graph:'huge'}) YIELD " +
157+
db.execute("CALL algo.closeness.harmonic('','', {write:true, stats:true, writeProperty:'centrality', graph:'huge'}) YIELD " +
158158
"nodes, loadMillis, computeMillis, writeMillis")
159159
.accept((Result.ResultVisitor<Exception>) row -> {
160160
assertNotEquals(-1L, row.getNumber("writeMillis"));

‎tests/src/test/java/org/neo4j/graphalgo/algo/HarmonicCentralityIntegrationTest_477.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static void setupGraph() throws KernelException {
7878
@Test
7979
public void testLoad() throws Exception {
8080

81-
String cypher = "CALL algo.harmonic.stream(\n" +
81+
String cypher = "CALL algo.closeness.harmonic.stream(\n" +
8282
"'MATCH (u:Person) RETURN id(u) as id\n" +
8383
"','\n" +
8484
"MATCH (u1:Person)-[k:KNOWS]-(u2:Person) \n" +

0 commit comments

Comments
 (0)