Changeset 319 for cpp/frams/genetics

Timestamp:

02/01/15 01:08:50 (9 years ago)

Author:

Maciej Komosinski

Message:

Fixed compilation warnings

Location:

cpp/frams/genetics

Files:

• f1/conv_f1.cpp (modified) (1 diff)
• f9/conv_f9.cpp (modified) (1 diff)
• f9/oper_f9.cpp (modified) (2 diffs)
• fF/conv_fF.cpp (modified) (3 diffs)
• fT/oper_fTest.cpp (modified) (2 diffs)
• genman.cpp (modified) (1 diff)

cpp/frams/genetics/f1/conv_f1.cpp

@@ -18 +18 @@
 {
 public:
-Builder(const char*g,int mapping=0):invalid(0),genbegin(g),usemapping(mapping),energ(0),energ_div(0),first_part_mapping(NULL) {}
+Builder(const char*g,int mapping=0):invalid(0),genbegin(g),usemapping(mapping),first_part_mapping(NULL),energ(0),energ_div(0) {}
 ~Builder() {SAFEDELETE(first_part_mapping);}
 char tmp[222];

cpp/frams/genetics/f9/conv_f9.cpp

@@ -91 +91 @@
 int GenoConv_f90::findVertexAt(vector<XYZ_LOC> &vertices, const XYZ_LOC &vertex)
 {
-        for (int i = 0; i < vertices.size(); i++)
+        for (size_t i = 0; i < vertices.size(); i++)
                 if (vertices[i].same_coordinates(vertex)) return i;
         return -1;

cpp/frams/genetics/f9/oper_f9.cpp

@@ -30 +30 @@
         if (!gene[0]) return 1; //empty is not valid
         bool ok = true;
-        int i;
+        size_t i;
         for (i = 0; i < strlen(gene); i++) if (!strchr(turtle_commands_f9, gene[i])) { ok = false; break; }
         return ok ? GENOPER_OK : i + 1;
@@ -39 +39 @@
 {
         SString validated; //new genotype (everything except turtle_commands_f9 is skipped)
-        for (int i = 0; i < strlen(gene); i++)
+        for (size_t i = 0; i < strlen(gene); i++)
                 if (strchr(turtle_commands_f9, gene[i])) validated += gene[i];  //validated contains only turtle_commands_f9
         free(gene);

cpp/frams/genetics/fF/conv_fF.cpp

@@ -104 +104 @@
                 double pcx = chambers[which - 1]->centerX;
                 double pcy = chambers[which - 1]->centerY;
-                double pcz = chambers[which - 1]->centerZ;
+                //double pcz = chambers[which - 1]->centerZ; //not used
 
                 /* aperture of the next to last chamber */
                 double ppx;
                 double ppy;
-                double ppz;
+                //double ppz; //not used
 
                 if (which == 1)
@@ -115 +115 @@
                         ppx = pcx;
                         ppy = pcy;
-                        ppz = pcz;
+                        //ppz = pcz;
                 }
                 else
@@ -121 +121 @@
                         ppx = chambers[which - 2]->holeX;
                         ppy = chambers[which - 2]->holeY;
-                        ppz = chambers[which - 2]->holeZ;
+                        //ppz = chambers[which - 2]->holeZ;
                 }
 

cpp/frams/genetics/fT/oper_fTest.cpp

@@ -65 +65 @@
         if (!gene[0]) return 1; //empty is not valid
         bool ok = true;
-        int i;
+        size_t i;
         for (i = 0; i < strlen(gene); i++) if (!strchr("ATGC", gene[i])) { ok = false; break; }
         return ok ? GENOPER_OK : i + 1;
@@ -74 +74 @@
 {
         SString validated; //new genotype (everything except ATGC is skipped)
-        for (int i = 0; i < strlen(gene); i++)
+        for (size_t i = 0; i < strlen(gene); i++)
                 if (strchr("ATGC", gene[i])) validated += gene[i];  //validated contains only ATGC
         free(gene);

cpp/frams/genetics/genman.cpp

@@ -101 +101 @@
 GenMan::GenMan() : localpar(GMparam_tab, this), localstats(GMstats_tab, this),
 seloperpar("GenOperators", "Genetics: Active operators"),
-par("GenMan", "Manages various genetic operations, using appropriate operators for the argument genotype format."),
-neuronsparam("Genetics: Neurons to add", "neuronsAdd", "neuadd_")
+neuronsparam("Genetics: Neurons to add", "neuronsAdd", "neuadd_"),
+par("GenMan", "Manages various genetic operations, using appropriate operators for the argument genotype format.")
 {
         history = 0;