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

Commit e8e0c5a

Browse files
mknblchjexp
mknblch
authored and
jexp
committed
Adapt PR Formula (#174)
1 parent 8b65216 commit e8e0c5a

File tree

4 files changed

+34
-36
lines changed

4 files changed

+34
-36
lines changed

‎algo/src/main/java/org/neo4j/graphalgo/impl/PageRank.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ public PageRank(IdMapping idMapping,
3333
nodeCount = idMapping.nodeCount();
3434
pageRank = new double[nodeCount];
3535
tempRank = new double[nodeCount];
36-
this.alpha = nodeCount == 0
37-
? 1.0 - dampingFactor
38-
: (1.0 - dampingFactor) / nodeCount;
36+
this.alpha = 1.0 - dampingFactor;
3937
}
4038

4139
/**

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@ public static void setup() throws KernelException {
9494

9595
try (Transaction tx = db.beginTx()) {
9696
final Label label = Label.label("Label1");
97-
expected.put(db.findNode(label, "name", "a").getId(), 0.0243);
98-
expected.put(db.findNode(label, "name", "b").getId(), 0.1900);
99-
expected.put(db.findNode(label, "name", "c").getId(), 0.1798);
100-
expected.put(db.findNode(label, "name", "d").getId(), 0.0218);
101-
expected.put(db.findNode(label, "name", "e").getId(), 0.0243);
102-
expected.put(db.findNode(label, "name", "f").getId(), 0.0218);
103-
expected.put(db.findNode(label, "name", "g").getId(), 0.0150);
104-
expected.put(db.findNode(label, "name", "h").getId(), 0.0150);
105-
expected.put(db.findNode(label, "name", "i").getId(), 0.0150);
106-
expected.put(db.findNode(label, "name", "j").getId(), 0.0150);
97+
expected.put(db.findNode(label, "name", "a").getId(), 0.243);
98+
expected.put(db.findNode(label, "name", "b").getId(), 1.844);
99+
expected.put(db.findNode(label, "name", "c").getId(), 1.777);
100+
expected.put(db.findNode(label, "name", "d").getId(), 0.218);
101+
expected.put(db.findNode(label, "name", "e").getId(), 0.243);
102+
expected.put(db.findNode(label, "name", "f").getId(), 0.218);
103+
expected.put(db.findNode(label, "name", "g").getId(), 0.150);
104+
expected.put(db.findNode(label, "name", "h").getId(), 0.150);
105+
expected.put(db.findNode(label, "name", "i").getId(), 0.150);
106+
expected.put(db.findNode(label, "name", "j").getId(), 0.150);
107107
tx.success();
108108
}
109109
}
@@ -194,7 +194,7 @@ private void assertResult(final String scoreProperty) {
194194
"score for " + entry.getKey(),
195195
entry.getValue(),
196196
score,
197-
1e-4);
197+
0.1);
198198
}
199199
tx.success();
200200
}
@@ -213,7 +213,7 @@ private static void assertMapEquals(
213213
"value for " + entry.getKey(),
214214
expected.get(entry.getKey()),
215215
entry.getValue(),
216-
1e-4);
216+
0.1);
217217
}
218218
for (Long expectedKey : expectedKeys) {
219219
fail("missing key " + expectedKey);

‎tests/src/test/java/org/neo4j/graphalgo/impl/PageRankTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,16 @@ public void test() throws Exception {
109109
final Map<Long, Double> expected = new HashMap<>();
110110

111111
try (Transaction tx = db.beginTx()) {
112-
expected.put(db.findNode(label, "name", "a").getId(), 0.0243);
113-
expected.put(db.findNode(label, "name", "b").getId(), 0.1917);
114-
expected.put(db.findNode(label, "name", "c").getId(), 0.1781);
115-
expected.put(db.findNode(label, "name", "d").getId(), 0.0218);
116-
expected.put(db.findNode(label, "name", "e").getId(), 0.0243);
117-
expected.put(db.findNode(label, "name", "f").getId(), 0.0218);
118-
expected.put(db.findNode(label, "name", "g").getId(), 0.0150);
119-
expected.put(db.findNode(label, "name", "h").getId(), 0.0150);
120-
expected.put(db.findNode(label, "name", "i").getId(), 0.0150);
121-
expected.put(db.findNode(label, "name", "j").getId(), 0.0150);
112+
expected.put(db.findNode(label, "name", "a").getId(), 0.243);
113+
expected.put(db.findNode(label, "name", "b").getId(), 1.915);
114+
expected.put(db.findNode(label, "name", "c").getId(), 1.777);
115+
expected.put(db.findNode(label, "name", "d").getId(), 0.218);
116+
expected.put(db.findNode(label, "name", "e").getId(), 0.243);
117+
expected.put(db.findNode(label, "name", "f").getId(), 0.218);
118+
expected.put(db.findNode(label, "name", "g").getId(), 0.150);
119+
expected.put(db.findNode(label, "name", "h").getId(), 0.150);
120+
expected.put(db.findNode(label, "name", "i").getId(), 0.150);
121+
expected.put(db.findNode(label, "name", "j").getId(), 0.150);
122122
tx.close();
123123
}
124124

‎tests/src/test/java/org/neo4j/graphalgo/impl/PageRankWikiTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,17 @@ public void test() throws Exception {
111111
final Map<Long, Double> expected = new HashMap<>();
112112

113113
try (Transaction tx = db.beginTx()) {
114-
expected.put(db.findNode(label, "name", "a").getId(), 0.0276);
115-
expected.put(db.findNode(label, "name", "b").getId(), 0.3242);
116-
expected.put(db.findNode(label, "name", "c").getId(), 0.2892);
117-
expected.put(db.findNode(label, "name", "d").getId(), 0.0330);
118-
expected.put(db.findNode(label, "name", "e").getId(), 0.0682);
119-
expected.put(db.findNode(label, "name", "f").getId(), 0.0330);
120-
expected.put(db.findNode(label, "name", "g").getId(), 0.014);
121-
expected.put(db.findNode(label, "name", "h").getId(), 0.014);
122-
expected.put(db.findNode(label, "name", "i").getId(), 0.014);
123-
expected.put(db.findNode(label, "name", "j").getId(), 0.014);
124-
expected.put(db.findNode(label, "name", "k").getId(), 0.014);
114+
expected.put(db.findNode(label, "name", "a").getId(), 0.304);
115+
expected.put(db.findNode(label, "name", "b").getId(), 3.560);
116+
expected.put(db.findNode(label, "name", "c").getId(), 3.175);
117+
expected.put(db.findNode(label, "name", "d").getId(), 0.362);
118+
expected.put(db.findNode(label, "name", "e").getId(), 0.750);
119+
expected.put(db.findNode(label, "name", "f").getId(), 0.362);
120+
expected.put(db.findNode(label, "name", "g").getId(), 0.150);
121+
expected.put(db.findNode(label, "name", "h").getId(), 0.150);
122+
expected.put(db.findNode(label, "name", "i").getId(), 0.150);
123+
expected.put(db.findNode(label, "name", "j").getId(), 0.150);
124+
expected.put(db.findNode(label, "name", "k").getId(), 0.150);
125125
tx.close();
126126
}
127127

0 commit comments

Comments
 (0)