Skip to content

Commit 28b8734

Browse files
jjaderbergvnickolov
andcommitted
Remove test-only factories with defaults
Co-Authored-By: Veselin Nikolov <[email protected]>
1 parent 9cb8785 commit 28b8734

File tree

2 files changed

+27
-38
lines changed

2 files changed

+27
-38
lines changed

algo/src/main/java/org/neo4j/gds/embeddings/node2vec/Node2Vec.java

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -62,36 +62,6 @@ public static MemoryEstimation memoryEstimation(int walksPerNode, int walkLength
6262
.build();
6363
}
6464

65-
static Node2Vec create(
66-
Graph graph,
67-
int concurrency,
68-
WalkParameters walkParameters,
69-
TrainParameters trainParameters,
70-
ProgressTracker progressTracker
71-
) {
72-
return create(graph, concurrency, Optional.empty(), walkParameters, trainParameters, progressTracker);
73-
}
74-
75-
static Node2Vec create(
76-
Graph graph,
77-
int concurrency,
78-
Optional<Long> maybeRandomSeed,
79-
WalkParameters walkParameters,
80-
TrainParameters trainParameters,
81-
ProgressTracker progressTracker
82-
) {
83-
return new Node2Vec(
84-
graph,
85-
concurrency,
86-
List.of(),
87-
maybeRandomSeed,
88-
1000,
89-
walkParameters,
90-
trainParameters,
91-
progressTracker
92-
);
93-
}
94-
9565
public Node2Vec(
9666
Graph graph,
9767
int concurrency,

algo/src/test/java/org/neo4j/gds/embeddings/node2vec/Node2VecTest.java

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
@ExtendWith(SoftAssertionsExtension.class)
7272
class Node2VecTest extends BaseTest {
7373

74+
private static final List<Long> NO_SOURCE_NODES = List.of();
75+
private static final Optional<Long> NO_RANDOM_SEED = Optional.empty();
76+
7477
private static final String DB_CYPHER =
7578
"CREATE" +
7679
" (a:Node1)" +
@@ -109,9 +112,12 @@ void embeddingsShouldHaveTheConfiguredDimension(String msg, Iterable<String> nod
109112
embeddingDimension,
110113
EmbeddingInitializer.NORMALIZED
111114
);
112-
HugeObjectArray<FloatVector> node2Vec = Node2Vec.create(
115+
HugeObjectArray<FloatVector> node2Vec = new Node2Vec(
113116
graph,
114117
4,
118+
NO_SOURCE_NODES,
119+
NO_RANDOM_SEED,
120+
1000,
115121
new WalkParameters(10, 80, 1.0, 1.0, 0.001, 0.75),
116122
trainParameters,
117123
ProgressTracker.NULL_TRACKER
@@ -156,10 +162,12 @@ void shouldLogProgress(boolean relationshipWeights, int expectedProgresses) {
156162
);
157163
var log = Neo4jProxy.testLog();
158164
var progressTracker = new TestProgressTracker(progressTask, log, 4, EmptyTaskRegistryFactory.INSTANCE);
159-
Node2Vec.create(
165+
new Node2Vec(
160166
graph,
161167
4,
162-
Optional.empty(),
168+
NO_SOURCE_NODES,
169+
NO_RANDOM_SEED,
170+
1000,
163171
walkParameters,
164172
trainParameters,
165173
progressTracker
@@ -223,9 +231,12 @@ void failOnNegativeWeights() {
223231
var walkParameters = new WalkParameters(10, 80, 1.0, 1.0, 0.001, 0.75);
224232
var trainParameters = new TrainParameters(0.025, 0.0001, 1, 1, 1, 128, EmbeddingInitializer.NORMALIZED);
225233

226-
var node2Vec = Node2Vec.create(
234+
var node2Vec = new Node2Vec(
227235
graph,
228236
4,
237+
NO_SOURCE_NODES,
238+
NO_RANDOM_SEED,
239+
1000,
229240
walkParameters,
230241
trainParameters,
231242
ProgressTracker.NULL_TRACKER
@@ -248,19 +259,23 @@ void randomSeed(SoftAssertions softly) {
248259
var walkParameters = new WalkParameters(1, 20, 1.0, 1.0, 0.001, 0.75);
249260
var trainParameters = new TrainParameters(0.025, 0.0001, 1, 1, 1, embeddingDimension, EmbeddingInitializer.NORMALIZED);
250261

251-
var embeddings = Node2Vec.create(
262+
var embeddings = new Node2Vec(
252263
graph,
253264
4,
265+
NO_SOURCE_NODES,
254266
Optional.of(1337L),
267+
1000,
255268
walkParameters,
256269
trainParameters,
257270
ProgressTracker.NULL_TRACKER
258271
).compute().embeddings();
259272

260-
var otherEmbeddings = Node2Vec.create(
273+
var otherEmbeddings = new Node2Vec(
261274
graph,
262275
4,
276+
NO_SOURCE_NODES,
263277
Optional.of(1337L),
278+
1000,
264279
walkParameters,
265280
trainParameters,
266281
ProgressTracker.NULL_TRACKER
@@ -348,19 +363,23 @@ void shouldBeFairlyConsistentUnderOriginalIds(EmbeddingInitializer embeddingInit
348363
var walkParameters = new WalkParameters(10, 80, 1.0, 1.0, 0.01, 0.75);
349364
var trainParameters = new TrainParameters(0.025, 0.0001, 1, 10, 5, embeddingDimension, embeddingInitializer);
350365

351-
var firstEmbeddings = Node2Vec.create(
366+
var firstEmbeddings = new Node2Vec(
352367
firstGraph,
353368
4,
369+
NO_SOURCE_NODES,
354370
Optional.of(1337L),
371+
1000,
355372
walkParameters,
356373
trainParameters,
357374
ProgressTracker.NULL_TRACKER
358375
).compute().embeddings();
359376

360-
var secondEmbeddings = Node2Vec.create(
377+
var secondEmbeddings = new Node2Vec(
361378
secondGraph,
362379
4,
380+
NO_SOURCE_NODES,
363381
Optional.of(1337L),
382+
1000,
364383
walkParameters,
365384
trainParameters,
366385
ProgressTracker.NULL_TRACKER

0 commit comments

Comments
 (0)