Changeset 893 for cpp/frams

Timestamp:

09/06/19 11:40:57 (5 years ago)

Author:

oriona

Message:

Similarity modified and expanded to include both old (greedy) and new (hungarian) measures.

File:

• cpp/frams/_demos/simil_test.cpp (modified) (2 diffs)

cpp/frams/_demos/simil_test.cpp

@@ -28 +28 @@
         int nResult = 0; // a temporary result
 
-        if (argc < 7)
+        if (argc < 8)
         {
                 printf("Too few parameters!\n");
-                printf("Command line: [-names] <genotypesFile> <w_dP> <w_dDEG> <w_dNEU> <w_dGEO> <fixZaxis?>\n\n");
+                printf("Command line: [-names] <genotypesFile> <measure> <w_dP> <w_dDEG> <w_dNEU> <w_dGEO> <fixZaxis?>\n\n");
 
                 printf("Parameters:\n");
                 printf("  <genotypesFile> name of a file with genotypes\n");
+                printf("  <measure> similarity measure\n");
                 printf("  <w_dP> weight of the difference in the number of parts\n");
                 printf("  <w_dDEG> weight of the difference in degrees of matched parts\n");
@@ -77 +78 @@
                 M.m_adFactors[i] = -1.0;
         }
+        
+        iCurrParam++;
+        szCurrParam = argv[iCurrParam];
+        int measure_type = -1; 
+        nResult = sscanf(szCurrParam, " %d ", &measure_type);
+        if (nResult != 1)
+        {
+                printf("Measure type should be a number!\n");
+                return -1;
+        }
+        
+        if (measure_type != 0 && measure_type != 1)
+        {
+                printf("Measure type should be 0 (flexible criteria order and optimal matching) or 1 (vertex degree order and greedy matching)!\n");
+                return -1;              
+        }
+        
+        M.matching_method = measure_type;
 
         const char *params[] = { "<w_dP>", "<w_dDEG>", "<w_dNEU>", "<w_dGEO>" };