Changeset 200 for cpp/frams/genetics

Timestamp:

03/29/14 00:04:01 (11 years ago)

Author:

Maciej Komosinski

Message:

More stl string, less SString

File:

• cpp/frams/genetics/genman.cpp (modified) (6 diffs)

cpp/frams/genetics/genman.cpp

@@ -8 +8 @@
 #include "common/framsg.h"
 #include "common/nonstd_math.h"
+#include "common/stl-util.h"
 #include <frams/errmgr/errmanager.h>
 
@@ -152 +153 @@
         {
                 if (operformats.find(oper_fx_list[i]->supported_format) != -1) continue;
-                char tmp[10];
-                SString id, name, type = "~";
-                type += oper_fx_list[i]->name;
+                string type = string("~") + oper_fx_list[i]->name;
                 int dup = 0;
                 for (unsigned int j = i + 1; j < oper_fx_list.size(); j++)
                         if (oper_fx_list[i]->supported_format == oper_fx_list[j]->supported_format)
                         {
-                                type += "~"; type += oper_fx_list[j]->name; dup++;
+                                type += "~";
+                                type += oper_fx_list[j]->name;
+                                dup++;
                         }
-                sprintf(tmp, "d 0 %d ", dup);
-                type = SString(tmp) + type;
-                sprintf(tmp, "%c", oper_fx_list[i]->supported_format);
-                id = "genoper_f"; id += tmp;
-                name = "Operators for f"; name += tmp;
+                type = ssprintf("d 0 %d ", dup) + type;
+                string id = ssprintf("genoper_f%c", oper_fx_list[i]->supported_format);
+                string name = ssprintf("Operators for f%c", oper_fx_list[i]->supported_format);
                 seloper[selopercount] = 0;
                 operformats += oper_fx_list[i]->supported_format;
                 //printf("%x %s %s %s\n",&seloper[selopercount],(const char*)id,(const char*)type,(const char*)name);
-                seloperpar.addProperty(&seloper[selopercount++], id, type, name, "", PARAM_READONLY*(dup == 0));
+                seloperpar.addProperty(&seloper[selopercount++], id.c_str(), type.c_str(), name.c_str(), "", PARAM_READONLY*(dup == 0));
         }
 
@@ -460 +459 @@
         GenoOperators *gf = getOper_f(format);
         if (!gf) return Geno();
-        SString info = "The simplest genotype of format f"; info += format;
+        string info = "The simplest genotype of format f"; info += format;
         info += " for operators '"; info += gf->name; info += "'.";
-        return Geno(gf->getSimplest(), format, "Root", (const char*)info);
+        return Geno(gf->getSimplest(), format, "Root", info.c_str());
 }
 
@@ -477 +476 @@
 {
         GenoOperators *gf = getOper_f(format);
-        if (!gf) return "n/a"; else return gf->name;
+        if (!gf) return "n/a"; else return gf->name.c_str();
 }
 
@@ -534 +533 @@
         for (unsigned int i = 0; i < oper_fx_list.size(); i++)
         {
-                SString l;
+                string l;
                 if (oper_fx_list[i]->checkValidity("") != GENOPER_NOOPER) l += " checkValidity";
                 if (oper_fx_list[i]->getSimplest())
@@ -548 +547 @@
                 //      if (oper_fx_list[i]->similarity("","")!=GENOPER_NOOPER) l+=" similarity";
                 FMprintf("GenMan", "Report", 0, "format f%c (%s):%s",
-                        oper_fx_list[i]->supported_format, (const char*)oper_fx_list[i]->name, (const char*)l);
+                        oper_fx_list[i]->supported_format, oper_fx_list[i]->name.c_str(), l.c_str());
         }
 }