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

Timestamp:

02/26/14 20:21:22 (11 years ago)

Author:

sz

Message:

Genetics reorganization (affects ALL applications!):

• Converters/Validators? are now configured/initialized in a more verbose but also less confusing way
• At the same time, the PreconfiguredGenetics? object will help you avoid the increased complexity by creating the ready-to-use environment that is sufficient in 99% of cases (see the demos)
• Format F genetics updated (work in progress)

File:

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

cpp/frams/genetics/genman.h

@@ -7 +7 @@
 
 #include <common/nonstd.h>
+#include <common/nonstd_stl.h>
 #include <frams/param/mutableparam.h>
 #include <frams/param/mutparamlist.h>
@@ -12 +13 @@
 #include "geno.h"
 #include "oper_fx.h"
-#include <string>
-#include <vector>
 
 #define GENSTYLE_COMMENT GENSTYLE_RGBS(0,150,0,GENSTYLE_BOLD)
@@ -20 +19 @@
 {
         int count;
-        std::string g1, g2;
+        string g1, g2;
         float chg;
         float fit;
@@ -53 +52 @@
         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:
-        std::vector<GenoOperators*> geno_fx_list;
-        void saveLink(std::string prz, std::string pot, float& chg);
-        GenoOperators* getGeno_f(char format);
+        vector<GenoOperators*> oper_fx_list;
+        void saveLink(string prz, string pot, float& chg);
+        GenoOperators* getOper_f(char format);
         SString HTMLize(const char *g, bool shorten);
 public:
-        std::vector<GenoLink> GenoLinkList;
+        vector<GenoLink> GenoLinkList;
         int history; //remember history?
         int hilite; //syntax highlighting (Style)
@@ -66 +66 @@
         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 order same as in seloperpar
+        SListTempl<char> operformats; //the list of supported_format, in the same order as in seloperpar
         int* seloper; //fields for seloperpar
         Param localpar, localstats;