Merge remote-tracking branch 'origin/newgen-keznikl' into newgen-kit

Conflicts: jdeeco-simulation-demo/evaluate.py
d3scomp · Feb 19, 2014 · 2f893bd · 2f893bd
2 parents 3f47fd7 + 290a1e9
commit 2f893bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/jdeeco-simulation-demo/evaluate.py b/jdeeco-simulation-demo/evaluate.py
@@ -589,6 +589,8 @@ def backupResults():
         analyze()
     except Exception:
         print 'Step error'     
+
+    plot()
 
 
     scenarios = []

diff --git a/jdeeco-simulation-demo/generator/simple.py b/jdeeco-simulation-demo/generator/simple.py
@@ -72,7 +72,7 @@ def generateSimpleConfig(writeMode, areaId, posX, posY, areaSize, extSize, scale
     others = []
     others.extend(HQExtended.generateOthersEdgy(numOthers,exDiff*scale))
 
-    for cmp in random.sample(leaders + members + others, ipCount):
+    for cmp in random.sample(leaders + members, ipCount):
         cmp.ip = True
 
     for cmp in leaders:
@@ -132,4 +132,4 @@ def generateSimpleConfig(writeMode, areaId, posX, posY, areaSize, extSize, scale
         ip = int(options.ip)
     if options.prefix is not None:
         prefix = options.prefix
-    generateConfig(numLeaders, numMembers, numOthers, prefix, ip)
+    generateConfig(numLeaders, numMembers, numOthers, prefix, ip)