Changeset 356 for cpp/frams/model


Ignore:
Timestamp:
04/18/15 16:29:10 (5 years ago)
Author:
Maciej Komosinski
Message:

Changed default values for weights

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/model/similarity/simil_model.cpp

    • Property svn:eol-style set to native
    r352 r356  
    3030
    3131static ParamEntry MSparam_tab[] = {
    32     {"Genetics: Similarity", 1, 5,},
    33     {"simil_parts", 0, 0, "Weight of parts count", "f 0 100 5", FIELD(m_adFactors[0]), "",},
     32    {"Genetics: Similarity", 1, 5,"ModelSimilarity"},
     33    {"simil_parts", 0, 0, "Weight of parts count", "f 0 100 0", FIELD(m_adFactors[0]), "",},
    3434    {"simil_partdeg", 0, 0, "Weight of parts' degree", "f 0 100 1", FIELD(m_adFactors[1]), "",},
    35     {"simil_neuro", 0, 0, "Weight of neurons count", "f 0 100 0.5", FIELD(m_adFactors[2]), "",},
    36     {"simil_partgeo", 0, 0, "Weight of parts' geometric distances", "f 0 100 0", FIELD(m_adFactors[3]), "",},
     35    {"simil_neuro", 0, 0, "Weight of neurons count", "f 0 100 0.1", FIELD(m_adFactors[2]), "",},
     36    {"simil_partgeom", 0, 0, "Weight of parts' geometric distances", "f 0 100 0", FIELD(m_adFactors[3]), "",},
    3737    {"evaluateDistance", 0, PARAM_DONTSAVE | PARAM_USERHIDDEN, "evaluate model dissimilarity", "p f(oGeno,oGeno)", PROCEDURE(p_evaldistance), "Calculates dissimilarity between two models created from Geno objects.",},
    3838    {0,},
     
    4747/** Constructor. Sets default weights. Initializes other fields with zeros.
    4848 */
    49 ModelSimil::ModelSimil() : localpar(MSparam_tab, this), m_iDV(0), m_iDD(0), m_iDN(0),
    50 m_dDG(0.0)
     49ModelSimil::ModelSimil() : localpar(MSparam_tab, this), m_iDV(0), m_iDD(0), m_iDN(0), m_dDG(0.0)
    5150{
    5251    // weights for the similarty formula
    53     m_adFactors[0] = 5;
     52    m_adFactors[0] = 0;
    5453    m_adFactors[1] = 1;
    55     m_adFactors[2] = 0.5;
    56     m_adFactors[3] = 0.0;
     54    m_adFactors[2] = 0.1;
     55    m_adFactors[3] = 0;
    5756
    5857    m_Gen[0] = NULL;
Note: See TracChangeset for help on using the changeset viewer.