Skip to content

Commit 561faa4

Browse files
Mats-SXMats-SX
authored
Merge pull request #6639 from chris1011011/fix-windows-path-issues
Fix operating system dependencies
2 parents 4d044e4 + d91c07e commit 561faa4

File tree

2 files changed

+65
-70
lines changed

2 files changed

+65
-70
lines changed

‎algo/src/test/java/org/neo4j/gds/leiden/LeidenAlgorithmFactoryTest.java‎

Lines changed: 50 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -66,51 +66,51 @@ void shouldEstimateMemory() {
6666
4
6767
);
6868
var expected =
69-
"Leiden: [3127 KiB ... 5256 KiB]\n" +
70-
"|-- this.instance: 96 Bytes\n" +
71-
"|-- local move communities: 78 KiB\n" +
72-
"|-- local move node volumes: 78 KiB\n" +
73-
"|-- local move community volumes: 78 KiB\n" +
74-
"|-- current communities: 78 KiB\n" +
75-
"|-- local move phase: 1173 KiB\n" +
76-
" |-- this.instance: 48 Bytes\n" +
77-
" |-- community weights: 78 KiB\n" +
78-
" |-- community volumes: 78 KiB\n" +
79-
" |-- global queue: 78 KiB\n" +
80-
" |-- global queue bitset: 1328 Bytes\n" +
81-
" |-- local move task: 938 KiB\n" +
82-
" |-- neighbor communities: 78 KiB\n" +
83-
" |-- neighbor weights: 78 KiB\n" +
84-
" |-- local queue: 78 KiB\n" +
85-
" |-- this.instance: 40 Bytes\n" +
86-
" |-- array: 78 KiB\n" +
87-
"|-- modularity computation: 78 KiB\n" +
88-
" |-- this.instance: 16 Bytes\n" +
89-
" |-- relationships outside community: 78 KiB\n" +
90-
" |-- relationship calculator: 128 Bytes\n" +
91-
" |-- this.instance: 32 Bytes\n" +
92-
"|-- dendogram manager: 78 KiB\n" +
93-
" |-- this.instance: 40 Bytes\n" +
94-
" |-- dendograms: 78 KiB\n" +
95-
"|-- refinement phase: 470 KiB\n" +
96-
" |-- this.instance: 96 Bytes\n" +
97-
" |-- encountered communities: 78 KiB\n" +
98-
" |-- encountered community weights: 78 KiB\n" +
99-
" |-- next community probabilities: 78 KiB\n" +
100-
" |-- merged community volumes: 78 KiB\n" +
101-
" |-- relationships between communities: 78 KiB\n" +
102-
" |-- refined communities: 78 KiB\n" +
103-
" |-- merge tracking bitset: 1296 Bytes\n" +
104-
"|-- aggregation phase: [700 KiB ... 2830 KiB]\n" +
105-
" |-- this.instance: 48 Bytes\n" +
106-
" |-- aggregated graph: [544 KiB ... 2674 KiB]\n" +
107-
" |-- sorted communities: 78 KiB\n" +
108-
" |-- atomic coordination array: 78 KiB\n" +
109-
"|-- post-aggregation phase: 312 KiB\n" +
110-
" |-- next local move communities: 78 KiB\n" +
111-
" |-- next local move node volumes: 78 KiB\n" +
112-
" |-- next local move community volumes: 78 KiB\n" +
113-
" |-- community to node map: 78 KiB\n";
69+
"Leiden: [3127 KiB ... 5256 KiB]" + System.lineSeparator() +
70+
"|-- this.instance: 96 Bytes" + System.lineSeparator() +
71+
"|-- local move communities: 78 KiB" + System.lineSeparator() +
72+
"|-- local move node volumes: 78 KiB" + System.lineSeparator() +
73+
"|-- local move community volumes: 78 KiB" + System.lineSeparator() +
74+
"|-- current communities: 78 KiB" + System.lineSeparator() +
75+
"|-- local move phase: 1173 KiB" + System.lineSeparator() +
76+
" |-- this.instance: 48 Bytes" + System.lineSeparator() +
77+
" |-- community weights: 78 KiB" + System.lineSeparator() +
78+
" |-- community volumes: 78 KiB" + System.lineSeparator() +
79+
" |-- global queue: 78 KiB" + System.lineSeparator() +
80+
" |-- global queue bitset: 1328 Bytes" + System.lineSeparator() +
81+
" |-- local move task: 938 KiB" + System.lineSeparator() +
82+
" |-- neighbor communities: 78 KiB" + System.lineSeparator() +
83+
" |-- neighbor weights: 78 KiB" + System.lineSeparator() +
84+
" |-- local queue: 78 KiB" + System.lineSeparator() +
85+
" |-- this.instance: 40 Bytes" + System.lineSeparator() +
86+
" |-- array: 78 KiB" + System.lineSeparator() +
87+
"|-- modularity computation: 78 KiB" + System.lineSeparator() +
88+
" |-- this.instance: 16 Bytes" + System.lineSeparator() +
89+
" |-- relationships outside community: 78 KiB" + System.lineSeparator() +
90+
" |-- relationship calculator: 128 Bytes" + System.lineSeparator() +
91+
" |-- this.instance: 32 Bytes" + System.lineSeparator() +
92+
"|-- dendogram manager: 78 KiB" + System.lineSeparator() +
93+
" |-- this.instance: 40 Bytes" + System.lineSeparator() +
94+
" |-- dendograms: 78 KiB" + System.lineSeparator() +
95+
"|-- refinement phase: 470 KiB" + System.lineSeparator() +
96+
" |-- this.instance: 96 Bytes" + System.lineSeparator() +
97+
" |-- encountered communities: 78 KiB" + System.lineSeparator() +
98+
" |-- encountered community weights: 78 KiB" + System.lineSeparator() +
99+
" |-- next community probabilities: 78 KiB" + System.lineSeparator() +
100+
" |-- merged community volumes: 78 KiB" + System.lineSeparator() +
101+
" |-- relationships between communities: 78 KiB" + System.lineSeparator() +
102+
" |-- refined communities: 78 KiB" + System.lineSeparator() +
103+
" |-- merge tracking bitset: 1296 Bytes" + System.lineSeparator() +
104+
"|-- aggregation phase: [700 KiB ... 2830 KiB]" + System.lineSeparator() +
105+
" |-- this.instance: 48 Bytes" + System.lineSeparator() +
106+
" |-- aggregated graph: [544 KiB ... 2674 KiB]" + System.lineSeparator() +
107+
" |-- sorted communities: 78 KiB" + System.lineSeparator() +
108+
" |-- atomic coordination array: 78 KiB" + System.lineSeparator() +
109+
"|-- post-aggregation phase: 312 KiB" + System.lineSeparator() +
110+
" |-- next local move communities: 78 KiB" + System.lineSeparator() +
111+
" |-- next local move node volumes: 78 KiB" + System.lineSeparator() +
112+
" |-- next local move community volumes: 78 KiB" + System.lineSeparator() +
113+
" |-- community to node map: 78 KiB" + System.lineSeparator();
114114
assertThat(estimate.render()).isEqualTo(expected);
115115
}
116116

@@ -119,13 +119,11 @@ void shouldThrowIfNotUndirected() {
119119
var graph = GdlFactory.of("(a)-->(b)").build().getUnion();
120120
var config = LeidenStatsConfigImpl.builder().maxLevels(3).build();
121121
var leidenFactory = new LeidenAlgorithmFactory<>();
122-
assertThatThrownBy(() -> {
123-
leidenFactory.build(
124-
graph,
125-
config,
126-
ProgressTracker.NULL_TRACKER
127-
);
128-
}).hasMessageContaining(
122+
assertThatThrownBy(() -> leidenFactory.build(
123+
graph,
124+
config,
125+
ProgressTracker.NULL_TRACKER
126+
)).hasMessageContaining(
129127
"undirected");
130128
}
131129
}

‎algo/src/test/java/org/neo4j/gds/spanningtree/SpanningTreeAlgorithmFactoryTest.java‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,11 @@ void shouldThrowIfNotUndirected() {
3333
var graph = GdlFactory.of("(a)-[:foo{cost:1.0}]->(b)").build().getUnion();
3434
var config = SpanningTreeStatsConfigImpl.builder().sourceNode(0).relationshipWeightProperty("cost").build();
3535
var spanningTreeAlgorithmFactory = new SpanningTreeAlgorithmFactory<>();
36-
assertThatThrownBy(() -> {
37-
spanningTreeAlgorithmFactory.build(
38-
graph,
39-
config,
40-
ProgressTracker.NULL_TRACKER
41-
);
42-
}).hasMessageContaining(
43-
"undirected");
36+
assertThatThrownBy(() -> spanningTreeAlgorithmFactory.build(
37+
graph,
38+
config,
39+
ProgressTracker.NULL_TRACKER
40+
)).hasMessageContaining("undirected");
4441
}
4542

4643

@@ -53,16 +50,16 @@ void shouldEstimateMemory() {
5350
4
5451
);
5552
var expected =
56-
"Prim: 392 KiB\n" +
57-
"|-- this.instance: 48 Bytes\n" +
58-
"|-- Parent array: 78 KiB\n" +
59-
"|-- Parent cost array: 78 KiB\n" +
60-
"|-- Priority queue: 234 KiB\n" +
61-
" |-- this.instance: 40 Bytes\n" +
62-
" |-- heap: 78 KiB\n" +
63-
" |-- costs: 78 KiB\n" +
64-
" |-- inverted index: 78 KiB\n" +
65-
"|-- visited: 1296 Bytes\n";
53+
"Prim: 392 KiB" + System.lineSeparator() +
54+
"|-- this.instance: 48 Bytes" + System.lineSeparator() +
55+
"|-- Parent array: 78 KiB" + System.lineSeparator() +
56+
"|-- Parent cost array: 78 KiB" + System.lineSeparator() +
57+
"|-- Priority queue: 234 KiB" + System.lineSeparator() +
58+
" |-- this.instance: 40 Bytes" + System.lineSeparator() +
59+
" |-- heap: 78 KiB" + System.lineSeparator() +
60+
" |-- costs: 78 KiB" + System.lineSeparator() +
61+
" |-- inverted index: 78 KiB" + System.lineSeparator() +
62+
"|-- visited: 1296 Bytes" + System.lineSeparator();
6663
assertThat(estimate.render()).isEqualTo(expected);
6764
}
6865
}

0 commit comments

Comments
 (0)