Changeset 1298 for cpp/frams/genetics/fL/fL_oper.cpp

Timestamp:

03/29/24 23:30:34 (6 weeks ago)

Author:

Maciej Komosinski

Message:

Introduced overloads for rndUint() with size_t and int arguments to avoid numerous type casts in sources

File:

• cpp/frams/genetics/fL/fL_oper.cpp (modified) (10 diffs)

cpp/frams/genetics/fL/fL_oper.cpp

@@ -181 +181 @@
         else
         {
-                int rid = rndUint((unsigned int)creature->rules.size());
+                int rid = rndUint(creature->rules.size());
                 list = &creature->rules[rid]->objsucc;
                 numparams = creature->rules[rid]->objpred->npar;
@@ -313 +313 @@
                 if (creature->rules.size() > 0)
                 {
-                        int ruleid = rndUint((unsigned int)creature->rules.size());
+                        int ruleid = rndUint(creature->rules.size());
                         if (!creature->rules[ruleid]->condeval)
                         {
@@ -350 +350 @@
                 if (wordswithnorules.size() > 0)
                 {
-                        int predid = rndUint((unsigned int)wordswithnorules.size());
+                        int predid = rndUint(wordswithnorules.size());
                         fL_Rule *newrule = new fL_Rule(0, 0);
                         fL_Word *pred = new fL_Word();
@@ -362 +362 @@
                 else if (creature->rules.size() > 0)
                 {
-                        int ruleid = rndUint((unsigned int)creature->rules.size());
+                        int ruleid = rndUint(creature->rules.size());
                         fL_Rule *newrule = new fL_Rule(0, 0);
                         fL_Word *pred = new fL_Word();
@@ -465 +465 @@
                 else
                 {
-                        int rndid = rndUint((unsigned int)list->size());
+                        int rndid = rndUint(list->size());
                         std::list<fL_Word *>::iterator it = list->begin();
                         std::advance(it, rndid);
@@ -492 +492 @@
                 int tmp = 0;
                 std::list<fL_Word *> *list = selectRandomSequence(creature, numpars, tmp);
-                int rndid = rndUint((unsigned int)list->size());
+                int rndid = rndUint(list->size());
                 std::list<fL_Word *>::iterator it = list->begin();
                 std::advance(it, rndid);
@@ -541 +541 @@
                 int tmp = 0;
                 std::list<fL_Word *> *list = selectRandomSequence(creature, numpars, tmp);
-                int rndid = rndUint((unsigned int)list->size());
+                int rndid = rndUint(list->size());
                 std::list<fL_Word *>::iterator selectedword = list->begin();
                 std::advance(selectedword, rndid);
@@ -555 +555 @@
                         int numpars = 0;
                         std::list<fL_Word *> *list = selectRandomSequence(creature, numpars, tmp);
-                        int rndid = rndUint((unsigned int)list->size());
+                        int rndid = rndUint(list->size());
                         std::list<fL_Word *>::iterator it = list->begin();
                         std::advance(it, rndid);
@@ -587 +587 @@
                                 if (available.size() > 0)
                                 {
-                                        int newnameid = rndUint((unsigned int)available.size());
+                                        int newnameid = rndUint(available.size());
                                         (*selectedword)->name = available[newnameid]->name;
                                 }
@@ -762 +762 @@
                 for (int i = 0; i < numselrules; i++)
                 {
-                        int rulid = rndUint((unsigned int)from->rules.size());
+                        int rulid = rndUint(from->rules.size());
                         fL_Rule *rul = from->rules[rulid];
                         fL_Rule *newrule = new fL_Rule(0, 0);