Changeset 1072 for cpp/frams/model/similarity

Timestamp:

02/08/21 20:49:50 (4 years ago)

Author:

oriona

Message:

Switching off the alignment moved.

Location:

cpp/frams/model/similarity

Files:

• measure-greedy.cpp (modified) (5 diffs)
• measure-hungarian.cpp (modified) (3 diffs)

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

@@ -320 +320 @@
                                                         // now compute the geometrical distance of these Parts (use coordinates
                                                         // which should be computed by SVD)
-                                                        dGeo = 0;
+                                                        
                                                         if (m_adFactors[3] > 0)
                                                         {
@@ -326 +326 @@
                                                                 Pt3D Part1Pos(coordinates[1][iPartIndex[1]]);
                                                                 dGeo = Part0Pos.distanceTo(Part1Pos);
-                                                        } 
+                                                        }
+                                                        else
+                                                            dGeo = 0; //no need to compute distance when m_dDG weight is 0
 
                                                         // tutaj prawdopodobnie należy jeszcze dodać sprawdzanie
@@ -848 +850 @@
         DB(_PrintDegrees(0);)
         DB(_PrintDegrees(1);)
+
+        if (m_adFactors[3] == 0)
+            with_alignment = false;
 }
 
@@ -875 +880 @@
         SAFEDELETE(m_pMatching);
         
+        with_alignment = true;
 }
 
@@ -1491 +1497 @@
                 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

@@ -68 +68 @@
                 for (int i = 0; i < nBigger; i++)
                         min_assignment.push_back(0);
+        
+        if (m_adFactors[3] == 0)
+            with_alignment = false;
 }
 
@@ -126 +129 @@
         if (save_matching)
                 min_assignment.clear();
+        
+        with_alignment = true;
 }
 
@@ -225 +230 @@
                 m_adFactors[i] = params.at(i);
         fixedZaxis = params.at(i);
-        if (m_adFactors[3] == 0)
-            with_alignment = false;
         return 0;
 }