Changeset 1299 for cpp/frams/genetics/fL/fL_matheval.cpp

Timestamp:

03/29/24 23:34:00 (5 weeks ago)

Author:

Maciej Komosinski

Message:

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

File:

• cpp/frams/genetics/fL/fL_matheval.cpp (modified) (3 diffs)

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;