Changeset 743 for cpp/frams/genetics


Ignore:
Timestamp:
02/26/18 19:57:44 (2 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:
2 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/genetics/f1/conv_f1.cpp

    r732 r743  
    454454        else if ((i = last_f1_neuro->extraProperties().findIdn(begin, colon - begin)) >= 0)
    455455        {
    456                 last_f1_neuro->extraProperties().set(i, colon + 1);
     456                last_f1_neuro->extraProperties().setFromString(i, colon + 1);
    457457        }
    458458        else if (isupper(begin[0]) || strchr("*|@", begin[0]))
  • cpp/frams/genetics/oper_fx.cpp

    r673 r743  
    5050        {
    5151                double _mn = 0, _mx = 1, _def = 0.5;
    52                 defined = p->getMinMax(i, _mn, _mx, _def);
     52                defined = p->getMinMaxDouble(i, _mn, _mx, _def);
    5353                if (defined == 1) _mx = _mn + 1.0;
    5454                if (_mx < _mn && defined == 3) _mn = _mx = _def; //only default was defined, let's assume min=max=default
     
    5959        {
    6060                paInt _mn = 0, _mx = 1, _def = 0;
    61                 defined = p->getMinMax(i, _mn, _mx, _def);
     61                defined = p->getMinMaxInt(i, _mn, _mx, _def);
    6262                if (defined == 1) _mx = _mn + 1;
    6363                if (_mx < _mn && defined == 3) _mn = _mx = _def; //only default was defined, let's assume min=max=default
Note: See TracChangeset for help on using the changeset viewer.