Changeset 872 for cpp/frams/model/similarity/simil_model.h

Timestamp:

05/04/19 23:39:39 (4 years ago)

Author:

Maciej Komosinski

Message:

Fixed error messages, changed int to paInt (for 32/64-bit safety), changed two int variables to bool as they should be

File:

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

cpp/frams/model/similarity/simil_model.h

@@ -77 +77 @@
         /// Currently selected matching algorithm. Allowed values: 0 (more exact, slower), 1 (more greedy, faster). Details in https://doi.org/10.1007/978-3-030-16692-2_8
         /// @sa EvaluateDistance
-        int matching_method;
+        paInt matching_method;
 
         /// Table of weights for weighted distance function.
@@ -89 +89 @@
 
         //for Zfixed = 1, the "z" (vertical) coordinates are not taken into account during PCA alignment
-        int fixedZaxis;
+        paInt fixedZaxis;
 
         //Controls the depth of fuzzy neighbourhood 
         int fuzzyDepth;
-        int isFuzzy;
+        bool isFuzzy;
 
         //For wMDS = 1 weighted MDS with vertex degrees as weights is used for the alignment.
-        int wMDS;
+        paInt wMDS;
 
         //For saveMatching = 1 the best matching found will be saved.
-        int saveMatching;
+        bool saveMatching;
 
         /// Interface to local parameters