Changeset 265602c in OpenModelica

Timestamp:

2013-12-13T14:22:58+01:00 (10 years ago)

Author:

Martin Sjölund <martin.sjolund@…>

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:

1f2c13d

Parents:

55f44362

Message:

For csv output, don't output aliases of parameters since we don't output parameters

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@18480 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

File:

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

SimulationRuntime/c/simulation/results/simulation_result_csv.cpp

@@ -78 +78 @@
     fprintf(fout, formatstring, (data->localData[0])->stringVars[i]);
 
-  for(i = 0; i < data->modelData.nAliasReal; i++) if(!data->modelData.realAlias[i].filterOutput) {
-    if(data->modelData.realAlias[i].aliasType == 2)
+  for(i = 0; i < data->modelData.nAliasReal; i++) if(!data->modelData.realAlias[i].filterOutput && data->modelData.realAlias[i].aliasType != 1) {
+    if (data->modelData.realAlias[i].aliasType == 2) {
       value = (data->localData[0])->timeValue;
-    else
+    } else {
       value = (data->localData[0])->realVars[data->modelData.realAlias[i].nameID];
-    if(data->modelData.realAlias[i].negate)
+    }
+    if (data->modelData.realAlias[i].negate) {
       fprintf(fout, format, -value);
-    else
+    } else {
       fprintf(fout, format, value);
+    }
   }
-  for(i = 0; i < data->modelData.nAliasInteger; i++) if(!data->modelData.integerAlias[i].filterOutput) {
-    if(data->modelData.integerAlias[i].negate)
+  for(i = 0; i < data->modelData.nAliasInteger; i++) if(!data->modelData.integerAlias[i].filterOutput && data->modelData.integerAlias[i].aliasType != 1) {
+    if (data->modelData.integerAlias[i].negate) {
       fprintf(fout, formatint, -(data->localData[0])->integerVars[data->modelData.integerAlias[i].nameID]);
-    else
+    } else {
       fprintf(fout, formatint, (data->localData[0])->integerVars[data->modelData.integerAlias[i].nameID]);
+    }
   }
-  for(i = 0; i < data->modelData.nAliasBoolean; i++) if(!data->modelData.booleanAlias[i].filterOutput) {
-    if(data->modelData.booleanAlias[i].negate)
+  for(i = 0; i < data->modelData.nAliasBoolean; i++) if(!data->modelData.booleanAlias[i].filterOutput && data->modelData.booleanAlias[i].aliasType != 1) {
+    if (data->modelData.booleanAlias[i].negate) {
       fprintf(fout, formatbool, (data->localData[0])->booleanVars[data->modelData.booleanAlias[i].nameID]==1?0:1);
-    else
+    } else {
       fprintf(fout, formatbool, (data->localData[0])->booleanVars[data->modelData.booleanAlias[i].nameID]);
+    }
   }
-  for(i = 0; i < data->modelData.nAliasString; i++) if(!data->modelData.stringAlias[i].filterOutput) {
+  for(i = 0; i < data->modelData.nAliasString; i++) if(!data->modelData.stringAlias[i].filterOutput && data->modelData.stringAlias[i].aliasType != 1) {
     /* there would no negation of a string happen */
     fprintf(fout, formatstring, (data->localData[0])->stringVars[data->modelData.stringAlias[i].nameID]);
@@ -130 +134 @@
     fprintf(fout, format, mData->stringVarsData[i].info.name);
 
-  for(i = 0; i < mData->nAliasReal; i++) if(!mData->realAlias[i].filterOutput)
+  for(i = 0; i < mData->nAliasReal; i++) if(!mData->realAlias[i].filterOutput && data->modelData.realAlias[i].aliasType != 1)
     fprintf(fout, format, mData->realAlias[i].info.name);
-  for(i = 0; i < mData->nAliasInteger; i++) if(!mData->integerAlias[i].filterOutput)
+  for(i = 0; i < mData->nAliasInteger; i++) if(!mData->integerAlias[i].filterOutput && data->modelData.integerAlias[i].aliasType != 1)
     fprintf(fout, format, mData->integerAlias[i].info.name);
-  for(i = 0; i < mData->nAliasBoolean; i++) if(!mData->booleanAlias[i].filterOutput)
+  for(i = 0; i < mData->nAliasBoolean; i++) if(!mData->booleanAlias[i].filterOutput && data->modelData.booleanAlias[i].aliasType != 1)
     fprintf(fout, format, mData->booleanAlias[i].info.name);
-  for(i = 0; i < mData->nAliasString; i++) if(!mData->stringAlias[i].filterOutput)
+  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);
   fprintf(fout,"\n");