Changeset 1071 for cpp

Timestamp:

02/08/21 17:07:11 (4 years ago)

Author:

oriona

Message:

Weighted MDS and switching off the alignment fixed.

Location:

cpp/frams/model/similarity

Files:

• measure-greedy.cpp (modified) (3 diffs)
• measure-hungarian.cpp (modified) (1 diff)
• measure-mds-based.cpp (modified) (1 diff)

cpp/frams/model/similarity/measure-greedy.cpp

@@ -147 +147 @@
                         m_iDN += abs(temp);
                         // pobierz polozenie dopasowanego Part
-                        Pt3D MatchedPartPos(coordinates[m_iSmaller][iOrgMatchedPart]);
-                        // dodaj euklidesowa odleglosc Parts do sumy odleglosci
-                        //no need to compute distane when m_dDG weight is 0
-                        m_dDG += m_adFactors[3] == 0 ? 0 : coordinates[1 - m_iSmaller][iOrgPart].distanceTo(MatchedPartPos);
+                        if (m_adFactors[3] > 0)
+                        {
+                            Pt3D MatchedPartPos(coordinates[m_iSmaller][iOrgMatchedPart]);
+                            // dodaj euklidesowa odleglosc Parts do sumy odleglosci
+                            m_dDG += coordinates[1 - m_iSmaller][iOrgPart].distanceTo(MatchedPartPos);
+                        }
                 }
         }
@@ -318 +320 @@
                                                         // now compute the geometrical distance of these Parts (use coordinates
                                                         // which should be computed by SVD)
-                                                        Pt3D Part0Pos(coordinates[0][iPartIndex[0]]);
-                                                        Pt3D Part1Pos(coordinates[1][iPartIndex[1]]);
-                                                        dGeo = m_adFactors[3] == 0 ? 0 : Part0Pos.distanceTo(Part1Pos); //no need to compute distane when m_dDG weight is 0
+                                                        dGeo = 0;
+                                                        if (m_adFactors[3] > 0)
+                                                        {
+                                                                Pt3D Part0Pos(coordinates[0][iPartIndex[0]]);
+                                                                Pt3D Part1Pos(coordinates[1][iPartIndex[1]]);
+                                                                dGeo = Part0Pos.distanceTo(Part1Pos);
+                                                        } 
 
                                                         // tutaj prawdopodobnie należy jeszcze dodać sprawdzanie
@@ -1485 +1491 @@
                 m_adFactors[i] = params.at(i);
         fixedZaxis = params.at(i);
+        if (m_adFactors[3] == 0)
+            with_alignment = false;
         return 0;
 }

cpp/frams/model/similarity/measure-hungarian.cpp

@@ -225 +225 @@
                 m_adFactors[i] = params.at(i);
         fixedZaxis = params.at(i);
+        if (m_adFactors[3] == 0)
+            with_alignment = false;
         return 0;
 }

cpp/frams/model/similarity/measure-mds-based.cpp

@@ -156 +156 @@
                 for (int i = 0; i < nSize; i++)
                 {
-                        if (wMDS == 1)
+                        if (wMDS == 1 && models[iMod]->getPartCount()>1)
                                 weights[i] = 0;
                         else