feat: add degree centrality #77

zyxxoo · 2021-08-03T11:33:44Z

No description provided.

.../src/main/java/com/baidu/hugegraph/computer/algorithm/degreecentrality/DegreeCentrality.java

codecov · 2021-08-03T11:53:37Z

Codecov Report

❗ No coverage uploaded for pull request base (master@9a14659). Click here to learn what that means.
The diff coverage is 33.33%.

@@ Coverage Diff @@ ## master #77 +/- ## ========================================= Coverage ? 87.95% Complexity ? 2618 ========================================= Files ? 271 Lines ? 9874 Branches ? 829 ========================================= Hits ? 8685 Misses ? 785 Partials ? 404

Impacted Files	Coverage Δ
...r/algorithm/degreecentrality/DegreeCentrality.java	`0.00% <0.00%> (ø)`
...gegraph/computer/core/graph/value/DoubleValue.java	`86.20% <0.00%> (ø)`
...ugegraph/computer/core/graph/value/FloatValue.java	`86.20% <0.00%> (ø)`
.../hugegraph/computer/core/graph/value/IntValue.java	`86.20% <0.00%> (ø)`
...hugegraph/computer/core/graph/value/LongValue.java	`86.20% <0.00%> (ø)`
.../algorithm/centrality/degree/DegreeCentrality.java	`35.29% <35.29%> (ø)`
...ithm/centrality/degree/DegreeCentralityParams.java	`100.00% <100.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9a14659...9408263. Read the comment docs.

.../src/main/java/com/baidu/hugegraph/computer/algorithm/degreecentrality/DegreeCentrality.java

javeme · 2021-08-04T06:08:33Z

.../src/main/java/com/baidu/hugegraph/computer/algorithm/degreecentrality/DegreeCentrality.java

+ @Override
+ public void init(Config config) {
+ // pass
+ }
+
+ @Override
+ public void close(Config config) {
+ // pass
+ }


remove these empty methods

This class inherits Computer interface, must override these methods

javeme · 2021-08-04T06:08:41Z

.../src/main/java/com/baidu/hugegraph/computer/algorithm/degreecentrality/DegreeCentrality.java

+ public void beforeSuperstep(WorkerContext context) {
+ // pass
+ }
+
+ @Override
+ public void afterSuperstep(WorkerContext context) {
+ // pass
+ }


remove these empty methods

javeme · 2021-08-04T06:09:37Z

.../src/main/java/com/baidu/hugegraph/computer/algorithm/degreecentrality/DegreeCentrality.java

+ @Override
+ public void compute0(ComputationContext context, Vertex vertex) {
+ long normalization = context.totalVertexCount() - 1;
+ if (normalization <= 0) {


ok, this version we don't use normalization

.../src/main/java/com/baidu/hugegraph/computer/algorithm/degreecentrality/DegreeCentrality.java

javeme · 2021-08-04T06:38:11Z

.../src/main/java/com/baidu/hugegraph/computer/algorithm/degreecentrality/DegreeCentrality.java

+ if (normalization <= 0) {
+ vertex.value(new DoubleValue(1.0));
+ } else {
+ vertex.value(new DoubleValue(vertex.numEdges() / normalization));


don't need to this version, since context.totalVertexCount() - 1 is not the max degree in hugegraph

...src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentrality.java

...main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentralityTest.java

...in/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentralityParams.java

computer-test/src/main/java/com/baidu/hugegraph/computer/algorithm/AlgorithmTestBase.java

...main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentralityTest.java

...er-test/src/main/java/com/baidu/hugegraph/computer/algorithm/rank/pagerank/PageRankTest.java

javeme · 2021-08-06T12:18:59Z

...src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentrality.java

+ while (edges.hasNext()) {
+ edge = edges.next();
+ DoubleValue value = edge.properties().get(this.weight);
+ E.checkArgumentNotNull(value, "The edge's '%s' weight " +


set 0 if not exist weight property?

graph server weightShortestPath default value is 1.0 if not exist, so here we also set 1.0 if not exist

...src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentrality.java

javeme · 2021-08-09T03:48:27Z

...ava/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentralityTestOutput.java

+ @Override
+ public void write(Vertex vertex) {
+ super.write(vertex);
+ isRun = true;


change to counter++?

algorithm verify logic lie on write code block, isRun only mark the algorithm is running, so use boolean maybe is enough

if use counter, can assert write times is expected.

in fact, assert logic is different on different algorithm, degree centrality don't need verify write times, so maybe other algorithm can use counter

...src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentrality.java

javeme · 2021-08-10T03:38:19Z

...src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentrality.java

+ vertex.value(new DoubleValue(vertex.numEdges()));
+ } else {
+ Edge edge = null;
+ BigDecimal totalWeight = BigDecimal.valueOf(0.0);


seems double value is ok?

==, here consider super vertex, and maybe overflow

calling totalWeight.doubleValue() with BigDecimal may also overflow

yeah, BigDecimal can handle overflow, but BigDecimal.doubleValue() can overflow

we consider implement "BigDecimalValue" earliest, so use these, but now no time to do it, so maybe here we change to double ,and annotation to use BigDecimalValue in the future

javeme · 2021-08-10T03:41:02Z

...ava/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentralityTestOutput.java

+ @Override
+ public void write(Vertex vertex) {
+ super.write(vertex);
+ isRun = true;


if use counter, can assert write times is expected.

...main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentralityTest.java

javeme · 2021-08-10T06:44:28Z

...src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentrality.java

+ vertex.value(new DoubleValue(vertex.numEdges()));
+ } else {
+ Edge edge = null;
+ BigDecimal totalWeight = BigDecimal.valueOf(0.0);


calling totalWeight.doubleValue() with BigDecimal may also overflow

javeme · 2021-08-11T03:27:10Z

ci blocked:

2021-08-11 03:26:20 1422628 [pool-59-thread-3] [INFO ] com.baidu.hugegraph.computer.core.bsp.EtcdClient [] - Wait for keys with prefix 'BSP_WORKER_OUTPUT_DONE' and timeout 86400000ms, expect 2 keys but actual got 1 keys 2021-08-11 03:26:30 1432628 [pool-59-thread-3] [INFO ] com.baidu.hugegraph.computer.core.bsp.EtcdClient [] - Wait for keys with prefix 'BSP_WORKER_OUTPUT_DONE' and timeout 86400000ms, expect 2 keys but actual got 1 keys 2021-08-11 03:26:40 1442629 [pool-59-thread-3] [INFO ] com.baidu.hugegraph.computer.core.bsp.EtcdClient [] - Wait for keys with prefix 'BSP_WORKER_OUTPUT_DONE' and timeout 86400000ms, expect 2 keys but actual got 1 keys

javeme · 2021-08-11T03:29:27Z

...src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentrality.java

+ (Value) edge.properties()
+ .get(this.weightProperty));


add edge.property(key) method

javeme · 2021-08-11T03:32:24Z

computer-test/src/main/java/com/baidu/hugegraph/computer/core/worker/MockWorkerService.java

 */
 public class MockWorkerService extends WorkerService {

+


remove unused empty line

javeme · 2021-08-11T03:34:05Z

computer-test/src/main/java/com/baidu/hugegraph/computer/algorithm/AlgorithmTestBase.java

+ params.put(RpcOptions.RPC_SERVER_HOST.name(), "localhost");
+ params.put(RpcOptions.RPC_SERVER_PORT.name(), "8090");
+ params.put(ComputerOptions.JOB_ID.name(), "local_002");
+ params.put(ComputerOptions.JOB_WORKERS_COUNT.name(), "1");


seems not effect in ci tests

…o test result

corgiboygsj requested changes Aug 3, 2021

View reviewed changes

zyxxoo force-pushed the degree_centrality branch 3 times, most recently from b67e173 to cf3cdc1 Compare August 3, 2021 11:49

javeme reviewed Aug 4, 2021

View reviewed changes

zyxxoo force-pushed the degree_centrality branch 2 times, most recently from 82344ff to 3b52c65 Compare August 6, 2021 09:34

javeme reviewed Aug 6, 2021

View reviewed changes

...src/main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentrality.java Show resolved Hide resolved

...main/java/com/baidu/hugegraph/computer/algorithm/centrality/degree/DegreeCentralityTest.java Outdated Show resolved Hide resolved

zyxxoo force-pushed the degree_centrality branch 6 times, most recently from 06de4da to ee3a3ee Compare August 6, 2021 12:17

javeme reviewed Aug 6, 2021

View reviewed changes

zyxxoo force-pushed the degree_centrality branch 4 times, most recently from bfff46a to 008c0d2 Compare August 7, 2021 05:23

javeme reviewed Aug 9, 2021

View reviewed changes

zyxxoo force-pushed the degree_centrality branch from 008c0d2 to 7d59cbb Compare August 10, 2021 03:20

javeme reviewed Aug 10, 2021

View reviewed changes

zyxxoo force-pushed the degree_centrality branch 3 times, most recently from 6cebe71 to 546966b Compare August 10, 2021 06:17

javeme reviewed Aug 10, 2021

View reviewed changes

zyxxoo force-pushed the degree_centrality branch from 246a39e to e8f1fe1 Compare August 10, 2021 08:15

javeme previously approved these changes Aug 10, 2021

View reviewed changes

javeme reviewed Aug 11, 2021

View reviewed changes

javeme mentioned this pull request Aug 11, 2021

add wcc algorithm #81

Merged

coderzc dismissed javeme’s stale review via 3a1745c August 11, 2021 06:09

zyxxoo and others added 10 commits August 11, 2021 16:55

feat: add degree centrality

b8bae24

feat: add degree centrality

de05c04

feat: cal weight degreen centrality

3779c22

fix: params bug

c0eef9d

chore: improve style

1ce3e84

chore: handle more hugeType for weight property and add output test t…

17fa1ac

…o test result

refactor: number value extends Number type

c0d175a

chore: improve code style

d6e738c

chore: add TODO

9e70546

modify job id

2fa2c01

coderzc force-pushed the degree_centrality branch from 3a1745c to b65be6c Compare August 11, 2021 09:02

fix test

9408263

coderzc force-pushed the degree_centrality branch from b2622d5 to 9408263 Compare August 11, 2021 09:21

javeme approved these changes Aug 11, 2021

View reviewed changes

coderzc approved these changes Aug 11, 2021

View reviewed changes

corgiboygsj approved these changes Aug 11, 2021

View reviewed changes

zyxxoo merged commit aa8daec into master Aug 11, 2021

javeme deleted the degree_centrality branch August 12, 2021 07:53

feat: add degree centrality #77

feat: add degree centrality #77

Uh oh!

Conversation

zyxxoo commented Aug 3, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Aug 3, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

zyxxoo Aug 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

javeme commented Aug 11, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Labels

4 participants

codecov bot commented Aug 3, 2021 •

edited

Loading

zyxxoo Aug 6, 2021 •

edited

Loading

javeme commented Aug 11, 2021 •

edited

Loading