Changeset 356 for cpp/frams/model/similarity

Timestamp:

04/18/15 16:29:10 (10 years ago)

Author:

Maciej Komosinski

Message:

Changed default values for weights

File:

• cpp/frams/model/similarity/simil_model.cpp (modified) (2 diffs, 1 prop)

cpp/frams/model/similarity/simil_model.cpp

@@ -30 +30 @@
 
 static ParamEntry MSparam_tab[] = {
-    {"Genetics: Similarity", 1, 5,},
-    {"simil_parts", 0, 0, "Weight of parts count", "f 0 100 5", FIELD(m_adFactors[0]), "",},
+    {"Genetics: Similarity", 1, 5,"ModelSimilarity"},
+    {"simil_parts", 0, 0, "Weight of parts count", "f 0 100 0", FIELD(m_adFactors[0]), "",},
     {"simil_partdeg", 0, 0, "Weight of parts' degree", "f 0 100 1", FIELD(m_adFactors[1]), "",},
-    {"simil_neuro", 0, 0, "Weight of neurons count", "f 0 100 0.5", FIELD(m_adFactors[2]), "",},
-    {"simil_partgeo", 0, 0, "Weight of parts' geometric distances", "f 0 100 0", FIELD(m_adFactors[3]), "",},
+    {"simil_neuro", 0, 0, "Weight of neurons count", "f 0 100 0.1", FIELD(m_adFactors[2]), "",},
+    {"simil_partgeom", 0, 0, "Weight of parts' geometric distances", "f 0 100 0", FIELD(m_adFactors[3]), "",},
     {"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.",},
     {0,},
@@ -47 +47 @@
 /** Constructor. Sets default weights. Initializes other fields with zeros.
  */
-ModelSimil::ModelSimil() : localpar(MSparam_tab, this), m_iDV(0), m_iDD(0), m_iDN(0),
-m_dDG(0.0)
+ModelSimil::ModelSimil() : localpar(MSparam_tab, this), m_iDV(0), m_iDD(0), m_iDN(0), m_dDG(0.0)
 {
     // weights for the similarty formula
-    m_adFactors[0] = 5;
+    m_adFactors[0] = 0;
     m_adFactors[1] = 1;
-    m_adFactors[2] = 0.5;
-    m_adFactors[3] = 0.0;
+    m_adFactors[2] = 0.1;
+    m_adFactors[3] = 0;
 
     m_Gen[0] = NULL;