Ignore:
Timestamp:
07/09/20 00:13:20 (4 years ago)
Author:
Maciej Komosinski
Message:

Building a Model from Geno now fails when Model.shape is incompatible with Geno.format; renamed enum constants for genetic formats: xxx_FORMAT => FORMAT_xxx

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/vm/classes/genoobj.cpp

    r972 r988  
    111111                return v.getString();
    112112        }
    113         return Geno::INVALID_FORMAT;
     113        return Geno::FORMAT_INVALID;
    114114}
    115115
     
    198198                SString n = vec->get(1) ? vec->get(1)->getString() : SString::empty();
    199199                SString c = vec->get(2) ? vec->get(2)->getString() : SString::empty();
    200                 *ret = makeDynamicObjectAndDecRef(new Geno(g, Geno::UNKNOWN_FORMAT, n, c));
     200                *ret = makeDynamicObjectAndDecRef(new Geno(g, Geno::FORMAT_UNKNOWN, n, c));
    201201        }
    202202        else
Note: See TracChangeset for help on using the changeset viewer.