Changeset 1299 for cpp/frams

Timestamp:

03/29/24 23:34:00 (9 months ago)

Author:

Maciej Komosinski

Message:

More reasonable usage of size_t, int, and unsigned int, and their conversions

Location:

cpp/frams/genetics

Files:

• fH/fH_general.cpp (modified) (4 diffs)
• fH/fH_oper.cpp (modified) (3 diffs)
• fL/fL_matheval.cpp (modified) (3 diffs)

cpp/frams/genetics/fH/fH_general.cpp

@@ -352 +352 @@
         }
 
-        unsigned int stickscount = children->size() + 1;
+        size_t stickscount = children->size() + 1;
 
         MultiRange ranges;
@@ -469 +469 @@
         // next stick is selected by minimum distance between first vector of its handle
         // and second vector of any existing StickHandle in body
-        int remaining = sticks.size() - 2;
+        int remaining = int(sticks.size()) - 2;
         while (remaining > 0)
         {
@@ -880 +880 @@
 int fH_Builder::removeNeuronsWithInvalidClasses()
 {
-        int count = neurons.size();
+        int count = (int)neurons.size();
         if (count == 0)
         {
@@ -913 +913 @@
 
         }
-        return count - neurons.size();
+        return count - (int)neurons.size();
 }
 

cpp/frams/genetics/fH/fH_oper.cpp

@@ -237 +237 @@
 
         // used for computing chg
-        unsigned int sumgenes = creature->sticks.size() + creature->neurons.size() + creature->connections.size();
+        size_t sumgenes = creature->sticks.size() + creature->neurons.size() + creature->connections.size();
 
         // if there is only one element in genotype (stick), then deletion would end
@@ -401 +401 @@
 unsigned int Geno_fH::getRandomHandle(fH_Builder *creature, fH_Handle *&handle, ParamEntry *&tab, bool skipalonestick)
 {
-        unsigned int allhandlescount = creature->connections.size() + creature->neurons.size();
+        size_t allhandlescount = creature->connections.size() + creature->neurons.size();
         if (!skipalonestick || creature->sticks.size() > 1)
         {
                 allhandlescount += creature->sticks.size();
         }
-        unsigned int toselect = rndUint(allhandlescount);
-        if (toselect < creature->connections.size())
+        int toselect = rndUint(allhandlescount);
+        if ((size_t)toselect < creature->connections.size())
         {
                 handle = creature->connections[toselect];
@@ -413 +413 @@
                 return toselect;
         }
-        else if (toselect - creature->connections.size() < creature->neurons.size())
-        {
-                toselect -= creature->connections.size();
+        else if (toselect - (int)creature->connections.size() < (int)creature->neurons.size())
+        {
+                toselect -= (int)creature->connections.size();
                 handle = creature->neurons[toselect];
                 tab = creature->neuronparamtab;
+                if (toselect < 0)
+                        logMessage("Geno_fH", "getRandomHandle", LOG_CRITICAL, "toselect<0");
                 return toselect;
         }
-        toselect -= creature->connections.size() + creature->neurons.size();
+        toselect -= int(creature->connections.size() + creature->neurons.size());
         handle = creature->sticks[toselect];
         tab = creature->stickparamtab;
+        if (toselect < 0)
+                logMessage("Geno_fH", "getRandomHandle", LOG_CRITICAL, "toselect<0");
         return toselect;
 }

cpp/frams/genetics/fL/fL_matheval.cpp

@@ -648 +648 @@
         if (type == 0)
         {
-                count = operatorstrings.size();
+                count = int(operatorstrings.size());
         }
         else if (type == 2)
         {
-                count = operatorstrings.size() - arithmeticoperatorscount;
+                count = int(operatorstrings.size()) - arithmeticoperatorscount;
         }
         randop += rndUint(count);
@@ -662 +662 @@
         if (varcount > 0)
         {
-                int currsize = postfixlist.size();
+                size_t currsize = postfixlist.size();
                 int varid = rndUint(varcount);
                 postfixlist.push_back(vars[varid]);
@@ -704 +704 @@
                 std::list<Token *>::iterator it = postfixlist.begin();
                 // insertion can be applied from 1st occurrence
-                int insertlocation = 1 + rndUint(postfixlist.size() - 1);
+                int insertlocation = 1 + rndUint((int)postfixlist.size() - 1);
                 std::advance(it, insertlocation);
                 Operator *rndop;