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

Timestamp:

06/25/20 00:34:29 (4 years ago)

Author:

Maciej Komosinski

Message:

Genetic format ID becomes a string (no longer limited to a single character)

File:

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

cpp/frams/genetics/genman.h

@@ -52 +52 @@
         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(const SString& format); ///<returns pointer to the simplest genotype of \e format or empty Geno()
+        const char *getOpName(const SString& 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:
         vector<GenoOperators*> oper_fx_list;
         void saveLink(const string parent1, const string parent2, const string child, const float chg);
-        GenoOperators* getOper_f(char format);
+        GenoOperators* getOper_f(const SString& format);
         string HTMLize(const char *g, bool shorten);
+        int findOperFormatIndex(const SString& format);
 public:
         vector<GenoLink> GenoLinkList;
@@ -68 +69 @@
         int valid_m, valid_xo, validated_m, validated_xo, invalid_m, invalid_xo, failed_m, failed_xo;
         double mutchg, xochg;
-        SListTempl<char> operformats; //the list of supported_format, in the same order as in seloperpar
+        SListTempl<SString*> operformats; //the list of supported_format, in the same order as in seloperpar (raw SString* taken from oper_fx_list, not owned by operformats)
         int* seloper; //fields for seloperpar
         Param localpar, localstats;