Skip to content

Commit 73b220f

Browse files
vnickolovvnickolov
committed
Remove auxiliary methods from PageRank configs
1 parent c68167f commit 73b220f

File tree

11 files changed

+28
-73
lines changed

11 files changed

+28
-73
lines changed

‎algo/src/main/java/org/neo4j/gds/pagerank/PageRankMutateConfig.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,7 @@
2626
@Configuration
2727
public interface PageRankMutateConfig extends PageRankConfig, MutateNodePropertyConfig {
2828

29-
private static PageRankMutateConfig of(CypherMapWrapper userInput, boolean checkDampingFactor) {
30-
if (checkDampingFactor && userInput.containsKey("dampingFactor")) {
31-
throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
32-
}
33-
29+
static PageRankMutateConfig of(CypherMapWrapper userInput) {
3430
return new PageRankMutateConfigImpl(userInput);
3531
}
36-
37-
static PageRankMutateConfig configWithDampingFactor(CypherMapWrapper userInput) {
38-
return of(userInput, false);
39-
}
40-
41-
static PageRankMutateConfig configWithoutDampingFactor(CypherMapWrapper userInput) {
42-
return of(userInput, true);
43-
}
4432
}

‎algo/src/main/java/org/neo4j/gds/pagerank/PageRankStatsConfig.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,7 @@
2525
@Configuration
2626
public interface PageRankStatsConfig extends PageRankConfig {
2727

28-
private static PageRankStatsConfig of(CypherMapWrapper userInput, boolean checkDampingFactor) {
29-
if (checkDampingFactor && userInput.containsKey("dampingFactor")) {
30-
throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
31-
}
28+
public static PageRankStatsConfig of(CypherMapWrapper userInput) {
3229
return new PageRankStatsConfigImpl(userInput);
3330
}
34-
35-
static PageRankStatsConfig configWithDampingFactor(CypherMapWrapper userInput) {
36-
return of(userInput, false);
37-
}
38-
39-
static PageRankStatsConfig configWithoutDampingFactor(CypherMapWrapper userInput) {
40-
return of(userInput, true);
41-
}
42-
43-
4431
}

‎algo/src/main/java/org/neo4j/gds/pagerank/PageRankStreamConfig.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,8 @@
2525
@Configuration
2626
public interface PageRankStreamConfig extends PageRankConfig {
2727

28-
private static PageRankStreamConfig of(CypherMapWrapper userInput, boolean checkDampingFactor) {
29-
if (checkDampingFactor && userInput.containsKey("dampingFactor")) {
30-
throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
31-
}
32-
28+
static PageRankStreamConfig of(CypherMapWrapper userInput) {
3329
return new PageRankStreamConfigImpl(userInput);
3430
}
3531

36-
static PageRankStreamConfig configWithDampingFactor(CypherMapWrapper userInput) {
37-
return of(userInput, false);
38-
}
39-
40-
static PageRankStreamConfig configWithoutDampingFactor(CypherMapWrapper userInput) {
41-
return of(userInput, true);
42-
}
4332
}

‎algo/src/main/java/org/neo4j/gds/pagerank/PageRankWriteConfig.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,7 @@
2626
@Configuration
2727
public interface PageRankWriteConfig extends PageRankConfig, WritePropertyConfig {
2828

29-
private static PageRankWriteConfig of(CypherMapWrapper userInput, boolean checkDampingFactor) {
30-
if (checkDampingFactor && userInput.containsKey("dampingFactor")) {
31-
throw new IllegalArgumentException("Unexpected configuration key: dampingFactor");
32-
}
29+
public static PageRankWriteConfig of(CypherMapWrapper userInput) {
3330
return new PageRankWriteConfigImpl(userInput);
3431
}
35-
36-
static PageRankWriteConfig configWithDampingFactor(CypherMapWrapper userInput) {
37-
return of(userInput, false);
38-
}
39-
40-
static PageRankWriteConfig configWithoutDampingFactor(CypherMapWrapper userInput) {
41-
return of(userInput, true);
42-
}
4332
}

‎applications/algorithms/centrality/src/main/java/org/neo4j/gds/applications/algorithms/centrality/CentralityAlgorithmsEstimationModeBusinessFacade.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import org.neo4j.gds.influenceMaximization.CELFMemoryEstimateDefinition;
3636
import org.neo4j.gds.influenceMaximization.InfluenceMaximizationBaseConfig;
3737
import org.neo4j.gds.mem.MemoryEstimation;
38-
import org.neo4j.gds.pagerank.PageRankConfig;
3938
import org.neo4j.gds.pagerank.PageRankMemoryEstimateDefinition;
39+
import org.neo4j.gds.pagerank.RankConfig;
4040

4141
public class CentralityAlgorithmsEstimationModeBusinessFacade {
4242
private final AlgorithmEstimationTemplate algorithmEstimationTemplate;
@@ -136,7 +136,7 @@ public MemoryEstimation pageRank() {
136136
return new PageRankMemoryEstimateDefinition().memoryEstimation();
137137
}
138138

139-
public MemoryEstimateResult pageRank(PageRankConfig configuration, Object graphNameOrConfiguration) {
139+
public MemoryEstimateResult pageRank(RankConfig configuration, Object graphNameOrConfiguration) {
140140
var memoryEstimation = pageRank();
141141

142142
return algorithmEstimationTemplate.estimate(

‎pipeline/src/main/java/org/neo4j/gds/ml/pipeline/ConfigurationParsersForMutateMode.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
import org.neo4j.gds.louvain.LouvainMutateConfig;
4545
import org.neo4j.gds.ml.splitting.SplitRelationshipsMutateConfig;
4646
import org.neo4j.gds.modularityoptimization.ModularityOptimizationMutateConfig;
47+
import org.neo4j.gds.pagerank.ArticleRankMutateConfig;
48+
import org.neo4j.gds.pagerank.EigenvectorMutateConfig;
4749
import org.neo4j.gds.pagerank.PageRankMutateConfig;
4850
import org.neo4j.gds.paths.astar.config.ShortestPathAStarMutateConfig;
4951
import org.neo4j.gds.paths.bellmanford.AllShortestPathsBellmanFordMutateConfig;
@@ -80,7 +82,7 @@ public Function<CypherMapWrapper, AlgoBaseConfig> lookup(Algorithm algorithm) {
8082
return switch (algorithm) {
8183
case AllShortestPaths -> null;
8284
case ApproximateMaximumKCut -> ApproxMaxKCutMutateConfig::of;
83-
case ArticleRank -> PageRankMutateConfig::configWithDampingFactor;
85+
case ArticleRank -> ArticleRankMutateConfig::of;
8486
case ArticulationPoints -> ArticulationPointsMutateConfig::of;
8587
case AStar -> ShortestPathAStarMutateConfig::of;
8688
case BellmanFord -> AllShortestPathsBellmanFordMutateConfig::of;
@@ -96,7 +98,7 @@ public Function<CypherMapWrapper, AlgoBaseConfig> lookup(Algorithm algorithm) {
9698
case DeltaStepping -> AllShortestPathsDeltaMutateConfig::of;
9799
case DFS -> DfsMutateConfig::of;
98100
case Dijkstra -> ShortestPathDijkstraMutateConfig::of;
99-
case EigenVector -> PageRankMutateConfig::configWithoutDampingFactor;
101+
case EigenVector -> EigenvectorMutateConfig::of;
100102
case FastRP -> FastRPMutateConfig::of;
101103
case FilteredKNN -> FilteredKnnMutateConfig::of;
102104
case FilteredNodeSimilarity -> FilteredNodeSimilarityMutateConfig::of;
@@ -120,7 +122,7 @@ public Function<CypherMapWrapper, AlgoBaseConfig> lookup(Algorithm algorithm) {
120122
case ModularityOptimization -> ModularityOptimizationMutateConfig::of;
121123
case NodeSimilarity -> NodeSimilarityMutateConfig::of;
122124
case Node2Vec -> Node2VecMutateConfig::of;
123-
case PageRank -> PageRankMutateConfig::configWithDampingFactor;
125+
case PageRank -> PageRankMutateConfig::of;
124126
case RandomWalk -> null;
125127
case ScaleProperties -> ScalePropertiesMutateConfig::of;
126128
case SCC -> SccMutateConfig::of;

‎proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankMutateSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public PageRankAlgorithmFactory<PageRankMutateConfig> algorithmFactory(Execution
4747

4848
@Override
4949
public NewConfigFunction<PageRankMutateConfig> newConfigFunction() {
50-
return (___, config) -> PageRankMutateConfig.configWithDampingFactor(config);
50+
return (___, config) -> PageRankMutateConfig.of(config);
5151
}
5252

5353
@Override

‎proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankStatsSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public PageRankAlgorithmFactory<PageRankStatsConfig> algorithmFactory(ExecutionC
4747

4848
@Override
4949
public NewConfigFunction<PageRankStatsConfig> newConfigFunction() {
50-
return (___, config) -> PageRankStatsConfig.configWithDampingFactor(config);
50+
return (___, config) -> PageRankStatsConfig.of(config);
5151
}
5252

5353
@Override

‎proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankStreamSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public PageRankAlgorithmFactory<PageRankStreamConfig> algorithmFactory(Execution
4747

4848
@Override
4949
public NewConfigFunction<PageRankStreamConfig> newConfigFunction() {
50-
return (___,config) -> PageRankStreamConfig.configWithDampingFactor(config);
50+
return (___,config) -> PageRankStreamConfig.of(config);
5151
}
5252

5353
@Override

‎proc/centrality/src/main/java/org/neo4j/gds/pagerank/PageRankWriteSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public PageRankAlgorithmFactory<PageRankWriteConfig> algorithmFactory(ExecutionC
4747

4848
@Override
4949
public NewConfigFunction<PageRankWriteConfig> newConfigFunction() {
50-
return (___,config) -> PageRankWriteConfig.configWithDampingFactor(config);
50+
return (___,config) -> PageRankWriteConfig.of(config);
5151
}
5252

5353
@Override

‎procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/centrality/CentralityProcedureFacade.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public static CentralityProcedureFacade create(
204204
estimationModeBusinessFacade,
205205
procedureReturnColumns,
206206
mutateModeBusinessFacade::pageRank,
207-
PageRankMutateConfig::configWithDampingFactor
207+
PageRankMutateConfig::of
208208

209209
);
210210

@@ -297,7 +297,7 @@ public Stream<MemoryEstimateResult> articleRankStatsEstimate(
297297
) {
298298
var parsedConfiguration = configurationParser.parseConfiguration(
299299
algorithmConfiguration,
300-
PageRankStatsConfig::configWithDampingFactor
300+
ArticleRankStatsConfig::of
301301
);
302302

303303
return Stream.of(estimationModeBusinessFacade.pageRank(parsedConfiguration, graphNameOrConfiguration));
@@ -323,7 +323,7 @@ public Stream<MemoryEstimateResult> articleRankStreamEstimate(
323323
) {
324324
var parsedConfiguration = configurationParser.parseConfiguration(
325325
algorithmConfiguration,
326-
PageRankStreamConfig::configWithoutDampingFactor
326+
ArticleRankStreamConfig::of
327327
);
328328

329329
return Stream.of(estimationModeBusinessFacade.pageRank(parsedConfiguration, graphNameOrConfiguration));
@@ -354,7 +354,7 @@ public Stream<MemoryEstimateResult> articleRankWriteEstimate(
354354
) {
355355
var parsedConfiguration = configurationParser.parseConfiguration(
356356
algorithmConfiguration,
357-
PageRankWriteConfig::configWithoutDampingFactor
357+
ArticleRankWriteConfig::of
358358
);
359359

360360
return Stream.of(estimationModeBusinessFacade.pageRank(parsedConfiguration, graphNameOrConfiguration));
@@ -920,7 +920,7 @@ public Stream<MemoryEstimateResult> eigenvectorStatsEstimate(
920920
) {
921921
var parsedConfiguration = configurationParser.parseConfiguration(
922922
algorithmConfiguration,
923-
PageRankStatsConfig::configWithoutDampingFactor
923+
EigenvectorStatsConfig::of
924924
);
925925

926926
return Stream.of(estimationModeBusinessFacade.pageRank(parsedConfiguration, graphNameOrConfiguration));
@@ -947,7 +947,7 @@ public Stream<MemoryEstimateResult> eigenvectorStreamEstimate(
947947
) {
948948
var parsedConfiguration = configurationParser.parseConfiguration(
949949
algorithmConfiguration,
950-
PageRankStreamConfig::configWithoutDampingFactor
950+
EigenvectorStreamConfig::of
951951
);
952952

953953
return Stream.of(estimationModeBusinessFacade.pageRank(parsedConfiguration, graphNameOrConfiguration));
@@ -975,7 +975,7 @@ public Stream<MemoryEstimateResult> eigenvectorWriteEstimate(
975975
) {
976976
var parsedConfiguration = configurationParser.parseConfiguration(
977977
algorithmConfiguration,
978-
PageRankWriteConfig::configWithoutDampingFactor
978+
EigenvectorWriteConfig::of
979979
);
980980

981981
return Stream.of(estimationModeBusinessFacade.pageRank(parsedConfiguration, graphNameOrConfiguration));
@@ -1045,7 +1045,7 @@ public Stream<PageRankStatsResult> pageRankStats(String graphName, Map<String, O
10451045

10461046
var parsedConfiguration = configurationParser.parseConfiguration(
10471047
configuration,
1048-
PageRankStatsConfig::configWithDampingFactor
1048+
PageRankStatsConfig::of
10491049
);
10501050

10511051
return statsModeBusinessFacade.pageRank(
@@ -1061,7 +1061,7 @@ public Stream<MemoryEstimateResult> pageRankStatsEstimate(
10611061
) {
10621062
var parsedConfiguration = configurationParser.parseConfiguration(
10631063
algorithmConfiguration,
1064-
PageRankStatsConfig::configWithDampingFactor
1064+
PageRankStatsConfig::of
10651065
);
10661066

10671067
return Stream.of(estimationModeBusinessFacade.pageRank(parsedConfiguration, graphNameOrConfiguration));
@@ -1072,7 +1072,7 @@ public Stream<CentralityStreamResult> pageRankStream(String graphName, Map<Strin
10721072

10731073
var parsedConfiguration = configurationParser.parseConfiguration(
10741074
configuration,
1075-
PageRankStreamConfig::configWithDampingFactor
1075+
PageRankStreamConfig::of
10761076
);
10771077

10781078
return streamModeBusinessFacade.pageRank(
@@ -1088,7 +1088,7 @@ public Stream<MemoryEstimateResult> pageRankStreamEstimate(
10881088
) {
10891089
var parsedConfiguration = configurationParser.parseConfiguration(
10901090
algorithmConfiguration,
1091-
PageRankStreamConfig::configWithDampingFactor
1091+
PageRankStreamConfig::of
10921092
);
10931093

10941094
return Stream.of(estimationModeBusinessFacade.pageRank(parsedConfiguration, graphNameOrConfiguration));
@@ -1101,7 +1101,7 @@ public Stream<PageRankWriteResult> pageRankWrite(String graphName, Map<String, O
11011101

11021102
var parsedConfiguration = configurationParser.parseConfiguration(
11031103
configuration,
1104-
PageRankWriteConfig::configWithDampingFactor
1104+
PageRankWriteConfig::of
11051105
);
11061106

11071107
return writeModeBusinessFacade.pageRank(
@@ -1117,7 +1117,7 @@ public Stream<MemoryEstimateResult> pageRankWriteEstimate(
11171117
) {
11181118
var parsedConfiguration = configurationParser.parseConfiguration(
11191119
algorithmConfiguration,
1120-
PageRankWriteConfig::configWithDampingFactor
1120+
PageRankWriteConfig::of
11211121
);
11221122

11231123
return Stream.of(estimationModeBusinessFacade.pageRank(parsedConfiguration, graphNameOrConfiguration));

0 commit comments

Comments
 (0)