Skip to content

Commit 232ef82

Browse files
Improve wording and use static imports
Co-authored-by: Jacob Sznajdman <breakanalysis@gmail.com>
1 parent 7094bf4 commit 232ef82

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

doc/asciidoc/machine-learning/node-property-prediction/noderegression-pipeline/config.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
= Configuring the pipeline
33
:max-trials: 10
44

5-
This page explains how to create and configure a node classification pipeline.
5+
This page explains how to create and configure a node regression pipeline.
66
It consists of the following sections:
77

8-
* <<nodregression-creating-a-pipeline, Creating the pipeline>>
8+
* <<noderegression-creating-a-pipeline, Creating the pipeline>>
99

1010

11-
[[nodregression-creating-a-pipeline]]
11+
[[noderegression-creating-a-pipeline]]
1212
== Creating a pipeline
1313

1414
The first step of building a new pipeline is to create one using `gds.alpha.pipeline.nodeRegression.create`.
1515
This stores a trainable pipeline object in the pipeline catalog of type `Node regression training pipeline`.
1616
This represents a configurable pipeline that can later be invoked for training, which in turn creates a regression model.
17-
The latter is also a model which is stored in the catalog with type `NodeRegression`.
17+
The latter is a model which is stored in the catalog with type `NodeRegression`.
1818

1919

2020
=== Syntax

proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineMutateProc.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@
4747

4848
import static org.neo4j.gds.executor.ExecutionMode.MUTATE_NODE_PROPERTY;
4949
import static org.neo4j.gds.ml.PipelineCompanion.prepareTrainConfig;
50+
import static org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.ESTIMATE_PREDICT_DESCRIPTION;
51+
import static org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION;
5052

51-
@GdsCallable(name = "gds.beta.pipeline.nodeClassification.predict.mutate", description = org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION, executionMode = MUTATE_NODE_PROPERTY)
53+
@GdsCallable(name = "gds.beta.pipeline.nodeClassification.predict.mutate", description = PREDICT_DESCRIPTION, executionMode = MUTATE_NODE_PROPERTY)
5254
public class NodeClassificationPipelineMutateProc
5355
extends MutatePropertyProc<
5456
NodeClassificationPredictPipelineExecutor,
@@ -57,7 +59,7 @@ public class NodeClassificationPipelineMutateProc
5759
NodeClassificationPredictPipelineMutateConfig>
5860
{
5961
@Procedure(name = "gds.beta.pipeline.nodeClassification.predict.mutate", mode = Mode.READ)
60-
@Description(org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION)
62+
@Description(PREDICT_DESCRIPTION)
6163
public Stream<MutateResult> mutate(
6264
@Name(value = "graphName") String graphName,
6365
@Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
@@ -67,7 +69,7 @@ public Stream<MutateResult> mutate(
6769
}
6870

6971
@Procedure(name = "gds.beta.pipeline.nodeClassification.predict.mutate.estimate", mode = Mode.READ)
70-
@Description(org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.ESTIMATE_PREDICT_DESCRIPTION)
72+
@Description(ESTIMATE_PREDICT_DESCRIPTION)
7173
public Stream<MemoryEstimateResult> estimate(
7274
@Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
7375
@Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
@@ -98,7 +100,7 @@ protected List<NodeProperty> nodePropertyList(ComputationResult<NodeClassificati
98100
var nodeProperties = new ArrayList<NodeProperty>();
99101
nodeProperties.add(NodeProperty.of(mutateProperty, classProperties));
100102

101-
result.predictedProbabilities().ifPresent((probabilityProperties) -> {
103+
result.predictedProbabilities().ifPresent(probabilityProperties -> {
102104
var properties = new DoubleArrayNodePropertyValues() {
103105
@Override
104106
public long size() {

proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPipelineStreamProc.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,14 @@
4949
import static org.neo4j.gds.ml.PipelineCompanion.prepareTrainConfig;
5050
import static org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.ESTIMATE_PREDICT_DESCRIPTION;
5151
import static org.neo4j.gds.ml.pipeline.node.classification.NodeClassificationPipelineCompanion.PREDICT_DESCRIPTION;
52+
import static org.neo4j.gds.ml.pipeline.node.classification.predict.NodeClassificationPipelineStreamProc.NodeClassificationStreamResult;
5253

5354
@GdsCallable(name = "gds.beta.pipeline.nodeClassification.predict.stream", description = PREDICT_DESCRIPTION, executionMode = STREAM)
5455
public class NodeClassificationPipelineStreamProc
5556
extends StreamProc<
5657
NodeClassificationPredictPipelineExecutor,
5758
NodeClassificationPredict.NodeClassificationResult,
58-
NodeClassificationPipelineStreamProc.NodeClassificationStreamResult,
59+
NodeClassificationStreamResult,
5960
NodeClassificationPredictPipelineStreamConfig>
6061
{
6162

@@ -96,7 +97,7 @@ protected Stream<NodeClassificationStreamResult> stream(
9697
return LongStream
9798
.range(0, graph.nodeCount())
9899
.boxed()
99-
.map((nodeId) ->
100+
.map(nodeId ->
100101
new NodeClassificationStreamResult(
101102
graph.toOriginalNodeId(nodeId),
102103
predictedClasses.get(nodeId),
@@ -106,7 +107,7 @@ protected Stream<NodeClassificationStreamResult> stream(
106107
});
107108
}
108109

109-
private List<Double> nodePropertiesAsList(Optional<HugeObjectArray<double[]>> predictedProbabilities, long nodeId) {
110+
private static List<Double> nodePropertiesAsList(Optional<HugeObjectArray<double[]>> predictedProbabilities, long nodeId) {
110111
return predictedProbabilities.map(p -> {
111112
var values = p.get(nodeId);
112113
return Arrays.stream(values).boxed().collect(Collectors.toList());

0 commit comments

Comments
 (0)