Changeset 158 for cpp/frams

Timestamp:

03/01/14 22:40:49 (11 years ago)

Author:

sz

Message:

genetics: warn if properties cannot be mixed because of incompatible types

File:

• cpp/frams/genetics/oper_fx.cpp (modified) (3 diffs)

cpp/frams/genetics/oper_fx.cpp

@@ -155 +155 @@
 void GenoOperators::linearMix(ParamInterface &p1, int i1, ParamInterface &p2, int i2, double proportion)
 {
-        if (p1.type(i1)[0] == 'f' && p2.type(i2)[0] == 'f')
+        char type1 = p1.type(i1)[0];
+        char type2 = p2.type(i2)[0];
+        if (type1 == 'f' && type2 == 'f')
         {
                 double v1 = p1.getDouble(i1);
@@ -162 +164 @@
                 p2.setDouble(i2, v2*proportion + v1*(1 - proportion));
         }
-        if (p1.type(i1)[0] == 'd' && p2.type(i2)[0] == 'd')
-        {
-                int v1 = p1.getInt(i1);
-                int v2 = p2.getInt(i2);
-                setIntFromDoubleWithProbabilisticDithering(p1, i1, v1*proportion + v2*(1 - proportion));
-                setIntFromDoubleWithProbabilisticDithering(p2, i2, v2*proportion + v1*(1 - proportion));
-        }
+        else
+                if (type1 == 'd' && type2 == 'd')
+                {
+                        int v1 = p1.getInt(i1);
+                        int v2 = p2.getInt(i2);
+                        setIntFromDoubleWithProbabilisticDithering(p1, i1, v1*proportion + v2*(1 - proportion));
+                        setIntFromDoubleWithProbabilisticDithering(p2, i2, v2*proportion + v1*(1 - proportion));
+                }
+                else
+                        FMprintf("GenoOperators", "linearMix", FMLV_WARN, "Cannot mix values of types '%c' and '%c'", type1, type2);
 }
 
@@ -241 +246 @@
 
 void GenoOperators::skipWS(char *&s)
-{ if (!s) FramMessage("GenoOperators","skipWS","NULL reference!",1); else
-     while (isWS(*s)) s++;
+{
+        if (s==NULL)
+                FramMessage("GenoOperators", "skipWS", "NULL reference!", FMLV_WARN);
+        else
+        while (isWS(*s)) s++;
 }