Changeset 601

Timestamp:

08/28/16 15:19:57 (8 years ago)

Author:

oriona

Message:

Possibility of fixing z axis during the alignment added.

Location:

cpp/frams

Files:

• _demos/simil_test.cpp (modified) (3 diffs)
• model/similarity/simil_model.cpp (modified) (3 diffs)
• model/similarity/simil_model.h (modified) (1 diff)

cpp/frams/_demos/simil_test.cpp

@@ -47 +47 @@
     int nResult = 0; // a temporary result
 
-    if (argc < 6)
+    if (argc < 7)
     {
         // too few parameters
         printf("Too few parameters!\n");
-        printf("Command line: [-names] <genotypesFile> <w_dP> <w_dDEG> <w_dNEU> <w_dGEO> \n\n");
+        printf("Command line: [-names] <genotypesFile> <w_dP> <w_dDEG> <w_dNEU> <w_dGEO> <isZfixed>\n\n");
         printf("Parameters:\n");
         printf(" <genotypesFile> name of a file with genotypes\n");
@@ -58 +58 @@
         printf(" <w_dNEU> weight of the difference in neurons of matched parts\n");
         printf(" <w_dGEO> weight of the distance of matched parts\n\n");
+        printf(" <isZFixed> should z cooridante be fixed during the alignment\n");
         printf("Switches:\n");
         printf(" -names specifies that the number and names of genotypes are to be printed to output\n");
@@ -120 +121 @@
     }
 
+    iCurrParam++;
+    szCurrParam = argv[ iCurrParam ];
+    nResult = sscanf(szCurrParam, " %d", & M.zFixed);
+    if (nResult != 1)
+    {
+        // <isZFixed> is not a number -- error
+        printf("<isZFixed> should be a number\n");
+        return -1;
+    }
+    else if (M.zFixed != 0 && M.zFixed !=1)
+    {
+        printf("<isZFixed>=%d. <isZFixed> should be equal to 0 or 1\n", M.zFixed);
+        return -1;
+    }
+    
     // read the input file
     // prepare loading of genotypes from a .gen file

cpp/frams/model/similarity/simil_model.cpp

@@ -1997 +1997 @@
             // get the position of the Part
             P1Pos = P1->p;
+            if (zFixed == 1)
+            {
+                P1Pos.z = 0;    
+            }
             for (iP2 = 0; iP2 < pModel->getPartCount(); iP2++)
             {
@@ -2003 +2007 @@
                 // get the position of the Part
                 P2Pos = P2->p;
+                if (zFixed == 1)
+                {
+                        P2Pos.z = 0;    
+                }
                 // compute the geometric (Euclidean) distance between the Parts
                 dDistance = P1Pos.distanceTo(P2Pos);
@@ -2011 +2019 @@
 
         MatrixTools::SVD(vEigenvalues, nSize, pDistances, m_aPositions[ iMod ]);
+        if (zFixed == 1)
+        {
+                for (int coord = 0; coord < pModel->getPartCount(); coord++)
+                {
+                        m_aPositions[ iMod ][coord].z = pModel->getPart(coord)->p.z;
+                }
+        }
+        
         free(pDistances);
     }

cpp/frams/model/similarity/simil_model.h

@@ -85 +85 @@
     int fuzzyDepth;
     int isFuzzy;
+    //for Zfixed = 1 z coordinates are not taken into account during PCA alignment
+    int zFixed;
 
     /// Interface to local parameters