Merge pull request #252 from neherlab/fix/export

add cumulative fields to export, fix time

src/algorithms/model.ts

@@ -486,7 +486,12 @@ export function exportSimulation(result: UserResult) {
   // TODO: Make the down sampling interval a parameter
 
   const header = keys(result.trajectory[0].current)
-  const tsv = [header.join('\t')]
+  const tsv_header : String[] = header.map(x => ( x == 'critical' ? 'ICU' : x))
+
+  const header_cumulative = keys(result.trajectory[0].cumulative)
+  const tsv_header_cumulative = header_cumulative.map(x => "cumulative_"+x)
+
+  const tsv = ['time\t' + tsv_header.concat(tsv_header_cumulative).join('\t')]
 
   const pop: Record<string, boolean> = {}
   result.trajectory.forEach((d) => {
@@ -495,10 +500,13 @@ export function exportSimulation(result: UserResult) {
       return
     } // skip if date is already in table
     pop[t] = true
-    let buf = '${d.time}'
+    let buf = t
     header.forEach((k) => {
       buf += `\t${Math.round(d.current[k].total)}`
     })
+    header_cumulative.forEach(k => {
+      buf += `\t${Math.round(d.cumulative[k].total)}`
+    })
     tsv.push(buf)
   })
 

src/algorithms/utils/exportResult.ts

@@ -39,7 +39,7 @@ export async function exportAll(result: AlgorithmResult) {
   if (!deterministic) {
     console.error('Error: the results of the simulation cannot be exported because they are nondeterministic')
   } else {
-    zip.file('covid.results.deterministic.csv', exportSimulation(deterministic))
+    zip.file('covid.results.deterministic.tsv', exportSimulation(deterministic))
   }
 
   const zipFile = await zip.generateAsync({ type: 'blob' })
@@ -64,7 +64,7 @@ export function exportResult(result: AlgorithmResult) {
     return
   }
 
-  saveFile(exportSimulation(deterministic), 'covid.results.deterministic.csv')
+  saveFile(exportSimulation(deterministic), 'covid.results.deterministic.tsv')
 }
 
 export function exportParams(result: AlgorithmResult) {

src/components/Main/Results/ExportSimulationDialog.tsx

@@ -44,9 +44,9 @@ export default function ExportSimulationDialog({ showModal, toggleShowModal, res
               </td>
             </tr>
             <tr>
-              <td>covid.results.deterministic.csv</td>
+              <td>covid.results.deterministic.tsv</td>
               <td>{t('The deterministic results of the simulation')}</td>
-              <td>CSV</td>
+              <td>TSV</td>
               <td>
                 <Button
                   disabled={!(result?.deterministic ?? null)}