merge sparse_grid_work

UCL-CCS · May 25, 2020 · 201574d · 201574d
2 parents 2b0c776 + 603bd9b
commit 201574d
Show file tree

Hide file tree

Showing 12 changed files with 973 additions and 130 deletions.
diff --git a/easyvvuq/analysis/sc_analysis.py b/easyvvuq/analysis/sc_analysis.py
diff --git a/easyvvuq/collate/aggregate_samples.py b/easyvvuq/collate/aggregate_samples.py
@@ -75,6 +75,7 @@ def collate(self, campaign, app_id):
 
             # Use decoder to check if run has completed (in general application-specific)
             if decoder.sim_complete(run_info=run_info):
+
                 run_data = decoder.parse_sim_output(run_info=run_info)
 
                 if self.average:

diff --git a/easyvvuq/decoders/simple_csv.py b/easyvvuq/decoders/simple_csv.py
@@ -32,7 +32,8 @@
 
 class SimpleCSV(BaseDecoder, decoder_name="csv"):
 
-    def __init__(self, target_filename=None, output_columns=None, header=0):
+    def __init__(self, target_filename=None, output_columns=None, header=0,
+                 delimiter=","):
 
         if target_filename is None:
             msg = (
@@ -59,6 +60,7 @@ def __init__(self, target_filename=None, output_columns=None, header=0):
         self.target_filename = target_filename
         self.output_columns = output_columns
         self.header = header
+        self.delimiter = delimiter
 
         self.output_type = OutputType('sample')
 
@@ -88,14 +90,16 @@ def parse_sim_output(self, run_info={}):
         data = pd.read_csv(
             out_path,
             usecols=self.output_columns,
+            sep=self.delimiter,
             header=self.header)
 
         return data
 
     def get_restart_dict(self):
         return {"target_filename": self.target_filename,
                 "output_columns": self.output_columns,
-                "header": self.header}
+                "header": self.header,
+                "delimiter": self.delimiter}
 
     def element_version(self):
         return "0.1"