Merge branch 'issue1333' into issue1243

Author: agarny

src/generator.cpp

@@ -874,7 +874,7 @@ std::string generateDoubleCode(const std::string &value)
         return value;
     }
 
-    auto ePos = value.find('e');
+    auto ePos = value.find_first_of("eE");
 
     if (ePos == std::string::npos) {
         return value + ".0";

tests/resources/coverage/generator/model.c

@@ -429,12 +429,12 @@ void findRoot0(double voi, double *states, double *rates, double *constants, dou
 void initialiseVariables(double *states, double *rates, double *constants, double *computedConstants, double *algebraic)
 {
     states[0] = 0.0;
-    constants[0] = 2.0;
-    constants[1] = 1.0;
-    constants[2] = 3.0;
-    constants[3] = 4.0;
-    constants[4] = 5.0;
-    constants[5] = 6.0;
+    constants[0] = 1.23;
+    constants[1] = 123.0;
+    constants[2] = 1.0e1;
+    constants[3] = 1.23e1;
+    constants[4] = 1.0E1;
+    constants[5] = 1.23E1;
     constants[6] = 7.0;
     computedConstants[176] = 123.0;
     computedConstants[177] = 123.456789;

tests/resources/coverage/generator/model.cellml

@@ -214,12 +214,12 @@
         <variable name="eqnNlaVariable2" initial_value="2" units="dimensionless"/>
         <variable name="eqnComputedConstant1" units="dimensionless"/>
         <variable name="eqnComputedConstant2" units="dimensionless"/>
-        <variable initial_value="1" name="m" units="dimensionless"/>
-        <variable initial_value="2" name="n" units="dimensionless"/>
-        <variable initial_value="3" name="o" units="dimensionless"/>
-        <variable initial_value="4" name="p" units="dimensionless"/>
-        <variable initial_value="5" name="q" units="dimensionless"/>
-        <variable initial_value="6" name="r" units="dimensionless"/>
+        <variable initial_value="123" name="m" units="dimensionless"/>
+        <variable initial_value="1.23" name="n" units="dimensionless"/>
+        <variable initial_value="1e1" name="o" units="dimensionless"/>
+        <variable initial_value="1.23e1" name="p" units="dimensionless"/>
+        <variable initial_value="1E1" name="q" units="dimensionless"/>
+        <variable initial_value="1.23E1" name="r" units="dimensionless"/>
         <variable initial_value="7" name="s" units="dimensionless"/>
         <math xmlns="http://www.w3.org/1998/Math/MathML">
             <apply>

tests/resources/coverage/generator/model.implementation.out

@@ -188,12 +188,12 @@ void findRoot0(double voi, double *states, double *rates, double *constants, dou
 void initialiseVariables(double *states, double *rates, double *constants, double *computedConstants, double *algebraic)
 {
     states[0] = 0.0;
-    constants[0] = 2.0;
-    constants[1] = 1.0;
-    constants[2] = 3.0;
-    constants[3] = 4.0;
-    constants[4] = 5.0;
-    constants[5] = 6.0;
+    constants[0] = 1.23;
+    constants[1] = 123.0;
+    constants[2] = 1.0e1;
+    constants[3] = 1.23e1;
+    constants[4] = 1.0E1;
+    constants[5] = 1.23E1;
     constants[6] = 7.0;
     computedConstants[176] = 123.0;
     computedConstants[177] = 123.456789;

tests/resources/coverage/generator/model.modified.profile.c

@@ -429,12 +429,12 @@ void findRoot0(double voi, double *states, double *rates, double *constants, dou
 void initialiseVariables(double *states, double *rates, double *constants, double *computedConstants, double *algebraic)
 {
     states[0] = 0.0;
-    constants[0] = 2.0;
-    constants[1] = 1.0;
-    constants[2] = 3.0;
-    constants[3] = 4.0;
-    constants[4] = 5.0;
-    constants[5] = 6.0;
+    constants[0] = 1.23;
+    constants[1] = 123.0;
+    constants[2] = 1.0e1;
+    constants[3] = 1.23e1;
+    constants[4] = 1.0E1;
+    constants[5] = 1.23E1;
     constants[6] = 7.0;
     computedConstants[176] = 123.0;
     computedConstants[177] = 123.456789;

tests/resources/coverage/generator/model.modified.profile.py

@@ -396,12 +396,12 @@ def find_root_0(voi, states, rates, constants, computed_constants, algebraic, ex
 
 def initialise_variables(states, rates, constants, computed_constants, algebraic):
     states[0] = 0.0
-    constants[0] = 2.0
-    constants[1] = 1.0
-    constants[2] = 3.0
-    constants[3] = 4.0
-    constants[4] = 5.0
-    constants[5] = 6.0
+    constants[0] = 1.23
+    constants[1] = 123.0
+    constants[2] = 1.0e1
+    constants[3] = 1.23e1
+    constants[4] = 1.0E1
+    constants[5] = 1.23E1
     constants[6] = 7.0
     computed_constants[176] = 123.0
     computed_constants[177] = 123.456789

tests/resources/coverage/generator/model.py

@@ -396,12 +396,12 @@ def find_root_0(voi, states, rates, constants, computed_constants, algebraic, ex
 
 def initialise_variables(states, rates, constants, computed_constants, algebraic):
     states[0] = 0.0
-    constants[0] = 2.0
-    constants[1] = 1.0
-    constants[2] = 3.0
-    constants[3] = 4.0
-    constants[4] = 5.0
-    constants[5] = 6.0
+    constants[0] = 1.23
+    constants[1] = 123.0
+    constants[2] = 1.0e1
+    constants[3] = 1.23e1
+    constants[4] = 1.0E1
+    constants[5] = 1.23E1
     constants[6] = 7.0
     computed_constants[176] = 123.0
     computed_constants[177] = 123.456789