From 367625918c1a209b77d2de75064efea5b53cb6e4 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Fri, 21 Apr 2017 18:11:19 +0200
Subject: [PATCH] Bugfix in ParameterStudy class
---
runhelper/db.py | 3 ++-
runhelper/parameterstudy.py | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/runhelper/db.py b/runhelper/db.py
index 4ffea6f22..8db4d769a 100644
--- a/runhelper/db.py
+++ b/runhelper/db.py
@@ -29,12 +29,13 @@ class Database(object):
'cpuCompilerConfig': getCompilerConfig(),
}
- def save(self, params, result, env=None):
+ def save(self, params, result, env=None, **kwargs):
documentDict = {
'params': params,
'result': result,
'env': env if env else self.getEnv(),
}
+ documentDict.update(kwargs)
document = Database.SimulationResult(documentDict, backend=self.backend)
document.save()
self.backend.commit()
diff --git a/runhelper/parameterstudy.py b/runhelper/parameterstudy.py
index ace291663..828a0ad00 100644
--- a/runhelper/parameterstudy.py
+++ b/runhelper/parameterstudy.py
@@ -68,10 +68,11 @@ class ParameterStudy(object):
def result(self, receivedJsonData):
clientName = receivedJsonData['clientName']
- self.finishedRuns.append(self.currentlyRunning[clientName])
+ run = self.currentlyRunning[clientName]
+ self.finishedRuns.append(run)
del self.currentlyRunning[clientName]
d = receivedJsonData
- self.parameterStudy.db.save(d['params'], d['result'], d['env'])
+ self.parameterStudy.db.save(run.parameterDict, d['result'], d['env'], changedParams=d['changedParams'])
return {}
def do_POST(self):
@@ -115,6 +116,7 @@ class ParameterStudy(object):
result = self.runFunction(**scenario['params'])
answer = {'params': scenario['params'],
+ 'changedParams': parameterUpdate,
'result': result,
'env': Database.getEnv(),
'clientName': clientName}
--
GitLab