Skip to content

Commit f69eafe

Browse files
committed
Fix: add chunkSize to resultPath
1 parent ee435b7 commit f69eafe

2 files changed

Lines changed: 15 additions & 14 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
group = "vadyushkins"
88

9-
version = "1.1.0"
9+
version = "1.1.1"
1010

1111
repositories { mavenCentral() }
1212

src/main/kotlin/org/kotgll/benchmarks/Benchmarks.kt

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ fun getResultPath(
1717
grammarMode: String = "cfg",
1818
grammarName: String,
1919
sppfMode: String,
20+
chunkSize: Int,
2021
): String {
2122
return pathToOutput +
2223
(if (pathToOutput.endsWith("/")) "" else "/") +
23-
"${graph}_${grammarMode}_${grammarName}_${sppfMode}.csv"
24+
"${graph}_${grammarMode}_${grammarName}_${sppfMode}_${chunkSize}.csv"
2425
}
2526

2627
enum class GrammarMode {
@@ -127,12 +128,12 @@ fun runCFGWithoutSPPF(
127128
val graph = readGraphFromCSV(graphPath.path)
128129
val startNodes = readStartNodesFromCSV("$pathToStartNodes/$graphName.csv")
129130

131+
val resultPath = getResultPath(pathToOutput, graphName, "cfg", cfgName, "without_sppf", chunkSize)
132+
File(resultPath).writeText("")
133+
130134
for (chunkStart in 0..<startNodes.size step chunkSize) {
131135
val chunkEnd = kotlin.math.min(chunkStart + chunkSize, startNodes.size)
132136

133-
val resultPath = getResultPath(pathToOutput, graphName, "cfg", cfgName, "without_sppf")
134-
File(resultPath).writeText("")
135-
136137
for (warmUp in 1..warmUpRounds) {
137138
var result: HashMap<Int, HashSet<Int>>
138139
val elapsed = measureNanoTime {
@@ -189,12 +190,12 @@ fun runCFGWithSPPF(
189190
val graph = readGraphFromCSV(graphPath.path)
190191
val startNodes = readStartNodesFromCSV("$pathToStartNodes/$graphName.csv")
191192

193+
val resultPath = getResultPath(pathToOutput, graphName, "cfg", cfgName, "with_sppf", chunkSize)
194+
File(resultPath).writeText("")
195+
192196
for (chunkStart in 0..<startNodes.size step chunkSize) {
193197
val chunkEnd = kotlin.math.min(chunkStart + chunkSize, startNodes.size)
194198

195-
val resultPath = getResultPath(pathToOutput, graphName, "cfg", cfgName, "with_sppf")
196-
File(resultPath).writeText("")
197-
198199
for (warmUp in 1..warmUpRounds) {
199200
var result: HashMap<Int, HashMap<Int, org.kotgll.cfg.graphinput.withsppf.sppf.SPPFNode>>
200201
val elapsed = measureNanoTime {
@@ -245,12 +246,12 @@ fun runRSMWithoutSPPF(
245246
val graph = readGraphFromCSV(graphPath.path)
246247
val startNodes = readStartNodesFromCSV("$pathToStartNodes/$graphName.csv")
247248

249+
val resultPath = getResultPath(pathToOutput, graphName, "rsm", rsmName, "without_sppf", chunkSize)
250+
File(resultPath).writeText("")
251+
248252
for (chunkStart in 0..<startNodes.size step chunkSize) {
249253
val chunkEnd = kotlin.math.min(chunkStart + chunkSize, startNodes.size)
250254

251-
val resultPath = getResultPath(pathToOutput, graphName, "rsm", rsmName, "without_sppf")
252-
File(resultPath).writeText("")
253-
254255
for (warmUp in 1..warmUpRounds) {
255256
var result: HashMap<Int, HashSet<Int>>
256257
val elapsed = measureNanoTime {
@@ -301,12 +302,12 @@ fun runRSMWithSPPF(
301302
val graph = readGraphFromCSV(graphPath.path)
302303
val startNodes = readStartNodesFromCSV("$pathToStartNodes/$graphName.csv")
303304

305+
val resultPath = getResultPath(pathToOutput, graphName, "rsm", rsmName, "with_sppf", chunkSize)
306+
File(resultPath).writeText("")
307+
304308
for (chunkStart in 0..<startNodes.size step chunkSize) {
305309
val chunkEnd = kotlin.math.min(chunkStart + chunkSize, startNodes.size)
306310

307-
val resultPath = getResultPath(pathToOutput, graphName, "rsm", rsmName, "with_sppf")
308-
File(resultPath).writeText("")
309-
310311
for (warmUp in 1..warmUpRounds) {
311312
var result: HashMap<Int, HashMap<Int, org.kotgll.rsm.graphinput.withsppf.sppf.SPPFNode>>
312313
val elapsed = measureNanoTime {

0 commit comments

Comments
 (0)