Changeset 362 for cpp/frams/model/similarity

Timestamp:

04/18/15 17:58:45 (10 years ago)

Author:

Maciej Komosinski

Message:

Restored object descriptions/docs that were lost

File:

• cpp/frams/model/similarity/simil_model.cpp (modified) (3 diffs)

cpp/frams/model/similarity/simil_model.cpp

@@ -30 +30 @@
 
 static ParamEntry MSparam_tab[] = {
-    {"Genetics: Similarity", 1, 5,"ModelSimilarity"},
-    {"simil_parts", 0, 0, "Weight of parts count", "f 0 100 0", FIELD(m_adFactors[0]), "",},
+    {"Creature: Similarity", 1, 5, "ModelSimilarity", "Evaluates morphological dissimilarity. More information:\nhttp://www.framsticks.com/node/795\nhttp://www.framsticks.com/node/890", },
+    {"simil_parts", 0, 0, "Weight of parts count", "f 0 100 0", FIELD(m_adFactors[0]), "Differing number of parts is also handled by the 'part degree' similarity component.",},
     {"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.1", FIELD(m_adFactors[2]), "",},
@@ -49 +49 @@
 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] = 0;
-    m_adFactors[1] = 1;
-    m_adFactors[2] = 0.1;
-    m_adFactors[3] = 0;
+    localpar.setDefault();
 
     m_Gen[0] = NULL;
@@ -69 +65 @@
     m_pMatching = NULL;
 
-    //determines wheter "fuzzy vertex degree" should be used
-    //currently "fuzzy vertex degree" is inactive
+    //Determines whether "fuzzy vertex degree" should be used.
+    //Currently "fuzzy vertex degree" is inactive.
     isFuzzy = 0;
     fuzzyDepth = 10;