Changeset 817 for cpp/frams/model/similarity/simil_model.cpp

Timestamp:

10/07/18 13:23:11 (6 years ago)

Author:

oriona

Message:

MDS procedure replaced with weighted MDS procedure.

File:

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

cpp/frams/model/similarity/simil_model.cpp

@@ -35 +35 @@
 
 static ParamEntry MSparam_tab[] = {
-                { "Creature: Similarity", 1, 6, "ModelSimilarity", "Evaluates morphological dissimilarity. More information:\nhttp://www.framsticks.com/bib/Komosinski-et-al-2001\nhttp://www.framsticks.com/bib/Komosinski-and-Kubiak-2011\nhttp://www.framsticks.com/bib/Komosinski-2016", },
+                { "Creature: Similarity", 1, 7, "ModelSimilarity", "Evaluates morphological dissimilarity. More information:\nhttp://www.framsticks.com/bib/Komosinski-et-al-2001\nhttp://www.framsticks.com/bib/Komosinski-and-Kubiak-2011\nhttp://www.framsticks.com/bib/Komosinski-2016", },
                 { "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]), "", },
@@ -41 +41 @@
                 { "simil_partgeom", 0, 0, "Weight of parts' geometric distances", "f 0 100 0", FIELD(m_adFactors[3]), "", },
                 { "simil_fixedZaxis", 0, 0, "Fix 'z' (vertical) axis?", "d 0 1 0", FIELD(fixedZaxis), "", },
+                { "simil_weightedMDS", 0, 0, "Should weighted MDS be used?", "d 0 1 0", FIELD(wMDS), "", },
                 { "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, },
@@ -75 +76 @@
         isFuzzy = 0;
         fuzzyDepth = 10;
+        
+        //Determines whether weighted MDS should be used.
+        wMDS = 0;
 }
 
@@ -1981 +1985 @@
                 int nSize = m_Mod[iMod]->getPartCount();
 
-                double *pDistances = (double *)malloc(nSize * nSize * sizeof(double));
+                double *pDistances =  new double[nSize * nSize];
 
                 for (int i = 0; i < nSize; i++)
@@ -1993 +1997 @@
                 Pt3D P1Pos, P2Pos; // positions of parts 
                 double dDistance; // the distance between Parts
+                
+                double *weights = new double[nSize];
+                for (int i = 0; i < nSize; i++)
+                {
+                        if (wMDS==1)
+                                weights[i] = 0;
+                        else
+                                weights[i] = 1;
+                }
+                                
+                if (wMDS==1)
+                        for (int i = 0; i < pModel->getJointCount(); i++)
+                        {
+                                weights[pModel->getJoint(i)->p1_refno]++;
+                                weights[pModel->getJoint(i)->p2_refno]++; 
+                        }
+                
                 for (iP1 = 0; iP1 < pModel->getPartCount(); iP1++)
                 {
@@ -2020 +2041 @@
                 } // for (iP1)
 
-                MatrixTools::SVD(vEigenvalues, nSize, pDistances, m_aPositions[iMod]);
+                MatrixTools::weightedMDS(vEigenvalues, nSize, pDistances, m_aPositions[iMod], weights);
                 if (fixedZaxis == 1) //restore the original vertical coordinate of each Part
                 {
@@ -2029 +2050 @@
                 }
 
-                free(pDistances);
+                delete[] pDistances;
+                delete[] weights;
         }