Changeset 13950 for trunk/SimulationRuntime/c/simulation/results/simulation_result_mat.cpp

Timestamp:

2012-11-18T20:19:47+01:00 (11 years ago)

Author:

jfrenkel

Message:

• bugfix for alias a = time
• bugfix for msvc compile

File:

• trunk/SimulationRuntime/c/simulation/results/simulation_result_mat.cpp (modified) (4 diffs)

trunk/SimulationRuntime/c/simulation/results/simulation_result_mat.cpp

@@ -381 +381 @@
   size_t ccol = 0; /* current column - index offset */
   size_t indx = 1;
+  size_t aliascol = 0;
   INTMAP::iterator it;
   /* assign rows & cols */
@@ -425 +426 @@
         dataInfo[ccol] = table;
         /* row 2 - index of var in table (variable 'Time' have index 1) */
+        aliascol = table==2?1:it->second+1;
         if (mdl_data->realAlias[i].negate)
-          dataInfo[ccol+1] = -(it->second+1);
+          dataInfo[ccol+1] = -aliascol;
         else
-          dataInfo[ccol+1] = it->second+1;
+          dataInfo[ccol+1] = aliascol;
         /* row 3 - linear interpolation == 0 */
         dataInfo[ccol+2] = 0;
@@ -457 +459 @@
         /* row 1 - which table */
         dataInfo[ccol] = table;
-        /* row 2 - index of var in table (variable 'Time' have index 1) */
+        /* row 2 - index of var in table */
         if (mdl_data->integerAlias[i].negate)
           dataInfo[ccol+1] = -(it->second+1);
@@ -496 +498 @@
         /* row 1 - which table */
         dataInfo[ccol] = table;
-        /* row 2 - index of var in table (variable 'Time' have index 1) */
+        /* row 2 - index of var in table */
         if (mdl_data->booleanAlias[i].negate)
         {