Changeset 743 for cpp/frams/genetics

Timestamp:

02/26/18 19:57:44 (6 years ago)

Author:

Maciej Komosinski

Message:

Introduced different function names in C++ instead of overloading (with the same number of arguments) so that javascript is able to discriminate them

Location:

cpp/frams/genetics

Files:

• f1/conv_f1.cpp (modified) (1 diff)
• oper_fx.cpp (modified) (2 diffs)

cpp/frams/genetics/f1/conv_f1.cpp

@@ -454 +454 @@
         else if ((i = last_f1_neuro->extraProperties().findIdn(begin, colon - begin)) >= 0)
         {
-                last_f1_neuro->extraProperties().set(i, colon + 1);
+                last_f1_neuro->extraProperties().setFromString(i, colon + 1);
         }
         else if (isupper(begin[0]) || strchr("*|@", begin[0]))

cpp/frams/genetics/oper_fx.cpp

@@ -50 +50 @@
         {
                 double _mn = 0, _mx = 1, _def = 0.5;
-                defined = p->getMinMax(i, _mn, _mx, _def);
+                defined = p->getMinMaxDouble(i, _mn, _mx, _def);
                 if (defined == 1) _mx = _mn + 1.0;
                 if (_mx < _mn && defined == 3) _mn = _mx = _def; //only default was defined, let's assume min=max=default
@@ -59 +59 @@
         {
                 paInt _mn = 0, _mx = 1, _def = 0;
-                defined = p->getMinMax(i, _mn, _mx, _def);
+                defined = p->getMinMaxInt(i, _mn, _mx, _def);
                 if (defined == 1) _mx = _mn + 1;
                 if (_mx < _mn && defined == 3) _mn = _mx = _def; //only default was defined, let's assume min=max=default