1 files changed, 12 insertions, 2 deletions

diff --git a/gen/generator.py b/gen/generator.py
index 7b254b5..7a994e9 100644
--- a/gen/generator.py
+++ b/gen/generator.py
@@ -389,8 +389,9 @@ class Generator(object):
             p = storage()
             p.partitioning = part
             p.clustering = clust
-            p.polluting = pol
-            p.splitting = splt
+            # convert from string to bool
+            p.polluting = True if pol == 'True' else False
+            p.splitting = True if splt == 'True' else False
             shared_params.append(p)
 
         for _dp in PgmDesignPointGenerator(exp):
@@ -419,6 +420,9 @@ class Generator(object):
                     created_dirs = []
                     tries += 1
 
+                    if tries > 1:
+                        print('Retrying...')
+
                     # Generate a task set
                     ts, graphs, subts = self._create_tasks(dp)
                     dp.tasks = len(ts)
@@ -435,6 +439,9 @@ class Generator(object):
                             dp.job_splitting = shp.splitting
 
                             # Create directory name from relevant parameters
+                            temp = dp.wss
+                            # slam the wss parameter to get a text-based name
+                            dp.wss = _dp.wss
                             dir_parts = []
                             dir_parts.append("sched=%s" % self.scheduler)
                             dir_parts.append("cluster=%s" % shp.clustering)
@@ -450,6 +457,8 @@ class Generator(object):
 
                             print("Generating %s" % dir_leaf)
 
+                            dp.wss = temp
+
                             if os.path.exists(dir_path):
                                 if force:
                                     sh.rmtree(dir_path)
@@ -482,6 +491,7 @@ class Generator(object):
                                 del _dp[PARAMS['trial']]
                         success = True
                     except Exception, e:
+                        print e
                         for d in created_dirs:
                             sh.rmtree(d)
                     if not success: