Changeset 783 for cpp/frams

Timestamp:

05/16/18 21:20:31 (7 years ago)

Author:

Maciej Komosinski

Message:

Removed the unused "info" field and fixed a bug with incorrect pointers to content stored in a vector

Location:

cpp/frams/genetics

Files:

• f4/f4_conv.cpp (modified) (1 diff)
• genoconv.cpp (modified) (2 diffs)
• genoconv.h (modified) (3 diffs)

cpp/frams/genetics/f4/f4_conv.cpp

@@ -42 +42 @@
 GenoConv_F41_TestOnly::GenoConv_F41_TestOnly()
 {
-        name = "test-only approximate f4 -> f1 converter";
+        name = "Only for testing, approximate f4->f1 converter"; //Do not use in production! (adam)
         in_format = '4';
         out_format = '1';
         mapsupport = 0;
-        info = "This is for testing.  Do not use in production! (adam)";
 }
 

cpp/frams/genetics/genoconv.cpp

@@ -50 +50 @@
         tab[0].name = "gkparam:";
         gcnames.clear();
+        gcnames.reserve(gcm->converters.size()); //avoid reallocations in the loop below, since we externally store pointers to objects saved in this vector
         for (i = 0, pe = tab + 1; gk = (GenoConverter *)gcm->converters(i); pe++, i++)
         {
@@ -57 +58 @@
                 std::string descr = "f";
                 descr += gk->in_format;
-                descr += " -> f";
+                descr += " --> f";
                 descr += gk->out_format;
-                descr += " : ";
+                descr += "  :  ";
                 descr += gk->name;
                 gcnames.push_back(descr);
-                pe->name = descr.c_str();
+                pe->name = gcnames.back().c_str(); //externally store a pointer to the object just saved in the vector
                 pe->type = "d 0 1";
-                pe->help = gk->info;
         }
         pe->id = 0;

cpp/frams/genetics/genoconv.h

@@ -20 +20 @@
 {
         GenoConvManager *gcm;
-        std::vector<std::string> gcnames;
+        std::vector<std::string> gcnames; //stores names of converters so that these names persist and pointers to these names can be safely used externally
         char tmp_id[20];
         void freetab();
@@ -45 +45 @@
         char in_format,         //< input format, eg. '1'
                 out_format;     //< output format, eg. '0'
-        const char *info;       //< detailed info about converter, format or copyright
         paInt enabled;  //< don't touch this! (used by configuration module)
         paInt mapsupport; //< set to 1 if your converter supports genotype mapping
@@ -57 +56 @@
         virtual ~GenoConverter() {}
         /// Don't forget to set public fields in your constructor
-        GenoConverter() :name(""), in_format(-1), out_format('0'), info(""), enabled(1), mapsupport(0) {}
+        GenoConverter() :name(""), in_format(-1), out_format('0'), enabled(1), mapsupport(0) {}
 };