Changeset 45d12db in OpenModelica

Timestamp:

2017-09-01T11:39:13+02:00 (7 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

60fecddd

Parents:

8befe8aa

git-author:

Lennart Ochel <lennart.ochel@…> (09/01/17 11:39:13)

git-committer:

hudson <openmodelica@…> (09/01/17 11:39:13)

Message:

Removed the eol comma separator

File:

• SimulationRuntime/c/simulation/results/simulation_result_csv.cpp (modified) (5 diffs)

SimulationRuntime/c/simulation/results/simulation_result_csv.cpp

@@ -53 +53 @@
 {
   FILE *fout = (FILE*) self->storage;
-  const char* format = "%.16g,";
-  const char* formatint = "%i,";
-  const char* formatbool = "%i,";
-  const char* formatstring = "\"%s\",";
+  const char* format = ",%.16g";
+  const char* formatint = ",%i";
+  const char* formatbool = ",%i";
+  const char* formatstring = ",\"%s\"";
   int i;
   modelica_real value = 0;
@@ -66 +66 @@
   rt_tick(SIM_TIMER_TOTAL);
 
-  fprintf(fout, format, data->localData[0]->timeValue);
+  fprintf(fout, "%.16g", data->localData[0]->timeValue);
   if(self->cpuTime)
     fprintf(fout, format, cpuTimeValue);
@@ -108 +108 @@
   //  fprintf(fout, formatstring, MMC_STRINGDATA((data->localData[0])->stringVars[data->modelData->stringAlias[i].nameID]));
   //}
-  fseek(fout, -1, SEEK_CUR); // removes the eol comma separator
   fprintf(fout, "\n");
   rt_accumulate(SIM_TIMER_OUTPUT);
@@ -118 +117 @@
   const MODEL_DATA *mData = data->modelData;
 
-  const char* format = "\"%s\",";
+  const char* format = ",\"%s\"";
   FILE *fout = fopen(self->filename, "w");
 
   assertStreamPrint(threadData, 0!=fout, "Error, couldn't create output file: [%s] because of %s", self->filename, strerror(errno));
 
-  fprintf(fout, format, "time");
+  fprintf(fout, "\"time\"");
   if(self->cpuTime)
     fprintf(fout, format, "$cpuTime");
@@ -143 +142 @@
   //for(i = 0; i < mData->nAliasString; i++) if(!mData->stringAlias[i].filterOutput && data->modelData->stringAlias[i].aliasType != 1)
   //  fprintf(fout, format, mData->stringAlias[i].info.name);
-  fseek(fout, -1, SEEK_CUR); // removes the eol comma separator
-  fprintf(fout,"\n");
+  fprintf(fout, "\n");
   self->storage = fout;
 }