Changeset 1048 for cpp/frams/model/similarity/measure-greedy.cpp

Timestamp:

12/11/20 21:36:41 (4 years ago)

Author:

Maciej Komosinski

Message:

SimilMeasure? -> SimilMeasureBase?; introduced a new class (SimilMeasure?) that allows scripts to access all similarity measures; a number of minor fixes and improvements

File:

• cpp/frams/model/similarity/measure-greedy.cpp (modified) (2 diffs)

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

@@ -4 +4 @@
 
 #include "measure-greedy.h"
+#include <assert.h>
 
 #define DB(x)  //define as x if you want to print debug information
 
 const int SimilMeasureGreedy::iNOFactors = 4;
-int fuzzDepth = 0; //TODO make local, but "fuzzy vertex degree" is not activated by default
+int fuzzDepth = 0; //TODO make local, but not crucial because currently "fuzzy vertex degree" is not activated by default
 
 #define FIELDSTRUCT SimilMeasureGreedy
@@ -20 +21 @@
                 { "simil_fixedZaxis", 0, 0, "Fix 'z' (vertical) axis?", "d 0 1 0", FIELD(fixedZaxis), "", },
                 { "simil_weightedMDS", 0, 0, "Should weighted MDS be used?", "d 0 1 0", FIELD(wMDS), "If activated, weighted MDS with vertex (i.e., Part) degrees as weights is used for 3D alignment of body structure.", },
-                { "evaluateDistance", 0, PARAM_DONTSAVE | PARAM_USERHIDDEN, "evaluate model dissimilarity", "p f(oGeno,oGeno)", PROCEDURE(p_evaldistance), "Calculates dissimilarity between two models created from Geno objects.", },
+                { "evaluateDistance", 0, PARAM_DONTSAVE | PARAM_USERHIDDEN, "Evaluate model dissimilarity", "p f(oGeno,oGeno)", PROCEDURE(p_evaldistance), "Calculates dissimilarity between two models created from Geno objects.", },
                 { 0, },
 };