MDEOptimiser tuning for CPS

1 files changed, 14 insertions, 0 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/generator/CpsGenerator.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/generator/CpsGenerator.xtend
index 390d13d3..e8d29949 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/generator/CpsGenerator.xtend
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/generator/CpsGenerator.xtend
@@ -22,11 +22,17 @@ class CpsGenerator {
         val Random random
         val int applicationTypeCount
         val int demandFactor
+        val boolean populateAppInstances
 
         new(long randomSeed, int applicationTypeCount, int demandFactor) {
+                this(randomSeed, applicationTypeCount, demandFactor, false)
+        }
+
+        new(long randomSeed, int applicationTypeCount, int demandFactor, boolean populateAppInstances) {
                 this.random = new Random(randomSeed)
                 this.applicationTypeCount = applicationTypeCount
                 this.demandFactor = demandFactor
+                this.populateAppInstances = populateAppInstances
         }
 
         def generateCpsProblem() {
@@ -50,6 +56,14 @@ class CpsGenerator {
                                                 requirements += createRequirement => [
                                                         count = nextInt(CpsGenerator.MIN_REPLICAS, CpsGenerator.MAX_REPLICAS)
                                                         type = appType
+                                                        if (populateAppInstances) {
+                                                                for (j : 0 ..< count) {
+                                                                        val app = createApplicationInstance
+                                                                        app.type = appType
+                                                                        appType.instances += app
+                                                                        instances += app
+                                                                }
+                                                        }
                                                 ]
                                         }
                                 ]