Skip to content

Commit c17b9b3

Browse files
committed
Properly instantiate models
1 parent e2d16cf commit c17b9b3

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

src/main/scala/edu/ie3/simbench/actor/Converter.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ object Converter {
4545
targetDirectory,
4646
csvColumnSeparator,
4747
compress,
48+
amountOfMutatorWorkers,
4849
converter
4950
)
5051
) =>
@@ -57,6 +58,7 @@ object Converter {
5758
targetDirectory,
5859
csvColumnSeparator,
5960
compress,
61+
amountOfMutatorWorkers,
6062
ctx
6163
)
6264
initializing(
@@ -429,6 +431,7 @@ object Converter {
429431
targetDirectory: String,
430432
csvColumnSeparator: String,
431433
compress: Boolean,
434+
amountOfWorkers: Int,
432435
ctx: ActorContext[ConverterMessage]
433436
): Unit = {
434437
val mutator = ctx.spawn(Mutator(), s"mutator_$simBenchCode")
@@ -438,6 +441,7 @@ object Converter {
438441
targetDirectory,
439442
csvColumnSeparator,
440443
compress,
444+
amountOfWorkers,
441445
ctx.self
442446
)
443447
ctx.watchWith(mutator, MutatorTerminated)
@@ -680,6 +684,7 @@ object Converter {
680684
targetDirectory: String,
681685
csvColumnSeparator: String,
682686
compressConverted: Boolean,
687+
amountOfMutatorWorkers: Int,
683688
replyTo: ActorRef[Coordinator.CoordinatorMessage]
684689
) extends ConverterMessage
685690

src/main/scala/edu/ie3/simbench/actor/Coordinator.scala

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ object Coordinator {
3030
config.io.output.csv.directoryHierarchy,
3131
config.io.output.targetFolder,
3232
config.io.output.csv.separator,
33-
config.io.output.compress
33+
config.io.output.compress,
34+
config.io.output.workers
3435
)
3536
val initializingConverters = List(firstSimBenchCode)
3637

@@ -49,7 +50,8 @@ object Coordinator {
4950
config.io.output.csv.directoryHierarchy,
5051
config.io.output.targetFolder,
5152
config.io.output.csv.separator,
52-
config.io.output.compress
53+
config.io.output.compress,
54+
config.io.output.workers
5355
)
5456

5557
idle(stateData)
@@ -101,7 +103,8 @@ object Coordinator {
101103
stateData.useDirectoryHierarchy,
102104
stateData.targetDirectory,
103105
stateData.csvColumnSeparator,
104-
stateData.compressConverted
106+
stateData.compressConverted,
107+
stateData.amountOfMutatorWorkers
105108
)
106109
val yetInitializingConverters = stateData.initializingConverters :+ nextSimBenchCode
107110
idle(
@@ -135,7 +138,8 @@ object Coordinator {
135138
useDirectoryHierarchy: Boolean,
136139
targetDirectory: String,
137140
csvColumnSeparator: String,
138-
compressConverted: Boolean
141+
compressConverted: Boolean,
142+
amountOfMutatorWorkers: Int
139143
): Unit = {
140144
val converter = ctx.spawn(Converter(), s"converter_$simBenchCode")
141145
converter ! Converter.Init(
@@ -152,6 +156,7 @@ object Coordinator {
152156
targetDirectory,
153157
csvColumnSeparator,
154158
compressConverted,
159+
amountOfMutatorWorkers,
155160
ctx.self
156161
)
157162
}
@@ -171,7 +176,8 @@ object Coordinator {
171176
useDirectoryHierarchy: Boolean,
172177
targetDirectory: String,
173178
csvColumnSeparator: String,
174-
compressConverted: Boolean
179+
compressConverted: Boolean,
180+
amountOfMutatorWorkers: Int
175181
)
176182

177183
/** Messages, a coordinator will understand */

src/test/scala/edu/ie3/test/common/ConfigTestData.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ trait ConfigTestData {
1717
val validIoOutputConfig = new SimbenchConfig.Io.Output(
1818
false,
1919
new config.SimbenchConfig.CsvConfig(false, "UTF-8", ".csv", ";"),
20-
"convertedData"
20+
"convertedData",
21+
20
2122
)
2223

2324
val validIo = new SimbenchConfig.Io(

0 commit comments

Comments
 (0)