Changeset 532 for cpp/frams/genetics/genman.h

Timestamp:

07/19/16 18:11:24 (8 years ago)

Author:

Maciej Komosinski

Message:

A new set of getStyle/getFullStyle functions in GenMan? and cosmetic rename of other functions (first letter lowercase)

File:

• cpp/frams/genetics/genman.h (modified) (2 diffs)

cpp/frams/genetics/genman.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -42 +42 @@
         int testValidity(Geno &g, bool &canvalidate);
         int testGenoValidity(Geno& g); //class GenoValidator (geno.h)
-        Geno Validate(const Geno&); ///<returns validated (if possible) genotype
-        Geno Mutate(const Geno&); //returns mutated genotype or empty if errors
-        Geno CrossOver(const Geno&, const Geno&); //returns xover genotype ("child") or empty if errors
-        float Similarity(const Geno&, const Geno&); //returns GENOPER_NOOPER or normalized similarity (1: identical, 0: different)
-        uint32_t Style(const char* g, int pos); //returns Style (and validity) of a genotype char.
-        void GetFullStyle(const char *g, uint32_t *styletab); //optimized. Fills styletab with styles for all genotype chars. sizeof(*styletab) must be at least strlen(g).
+        Geno validate(const Geno&); ///<returns validated (if possible) genotype
+        Geno mutate(const Geno&); //returns mutated genotype or empty if errors
+        Geno crossOver(const Geno&, const Geno&); //returns xover genotype ("child") or empty if errors
+        float similarity(const Geno&, const Geno&); //returns GENOPER_NOOPER or normalized similarity (1: identical, 0: different)
+        uint32_t getStyle(const char* g, int pos); //returns style (and validity) of a genotype char.
+        uint32_t getStyle(const char *g, const Geno *G, int pos); //returns style (and validity) of a genotype char. Assumes G is created from g.
+        void getFullStyle(const char *g, uint32_t *styletab); //optimized. Fills styletab with styles for all genotype chars. sizeof(*styletab) must be at least strlen(g).
+        void getFullStyle(const char *g, const Geno *G, uint32_t *styletab); //optimized. Assumes G is created from g. Fills styletab with styles for all genotype chars. sizeof(*styletab) must be at least strlen(g).
         string HTMLize(const char *g); //returns colored genotype in HTML.
         string HTMLizeShort(const char *g); //returns colored genotype (abbreviated if needed) in HTML.
-        Geno GetSimplest(char format); ///<returns pointer to the simplest genotype of \e format or empty Geno()
-        const char *GetOpName(char format); ///<returns pointer to the active operator set for \e format
+        Geno getSimplest(char format); ///<returns pointer to the simplest genotype of \e format or empty Geno()
+        const char *getOpName(char format); ///<returns pointer to the active operator set for \e format
         const vector<GenoOperators*>& GetOperators() const { return oper_fx_list; } ///<returns the list of available genetic operators
 private: