Changeset 1100 for cpp

Timestamp:

03/05/21 19:34:20 (4 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic / minor fixes

Location:

cpp

Files:

• common/loggers/loggers.h (modified) (1 diff)
• frams/model/similarity/simil-measure.cpp (modified) (1 diff)

cpp/common/loggers/loggers.h

@@ -100 +100 @@
         string getMessages() const  { return msgs; }
         string getCountSummary() const; ///< return the standard "... error(s), ... warning(s), ... message(s)" text (or empty string if count==0)
-        void setStoreOptions(int opts) {options=options&(~(StoreFirstMessage|StoreAllMessages))|(opts&(StoreFirstMessage|StoreAllMessages));}
+        void setStoreOptions(int opts) {options=(options & (~(StoreFirstMessage|StoreAllMessages))) | (opts&(StoreFirstMessage|StoreAllMessages));}
         
         LoggerToMemory(int opts = 0, int minimal_level_to_store = LOG_ERROR) :LoggerBase(opts), minleveltostore(minimal_level_to_store)

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

@@ -12 +12 @@
 static ParamEntry simil_measure_paramtab[] = {
         { "Creature: Similarity", 1, 2, "SimilMeasure", "Evaluates morphological dissimilarity. More information:\nhttp://www.framsticks.com/bib/Komosinski-et-al-2001\nhttp://www.framsticks.com/bib/Komosinski-and-Kubiak-2011\nhttp://www.framsticks.com/bib/Komosinski-2016\nhttps://doi.org/10.1007/978-3-030-16692-2_8", },
-        { "type", 0, 0, "Type of similarity measure", "d 0 2 1 ~Graph greedy (vertex degree order and greedy matching)~Graph optimal (flexible criteria order and optimal matching)~Descriptor distribution (EMD on a histogram of descriptor values)", FIELD(type), "", },
+        { "simil_type", 0, 0, "Type of similarity measure", "d 0 2 1 ~Graph greedy (vertex degree order and greedy matching)~Graph optimal (flexible criteria order and optimal matching)~Descriptor distribution (EMD on a histogram of descriptor values)", FIELD(type), "", },
         { "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, },