Changeset 1298 for cpp/frams

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

Location:

cpp/frams/genetics

Files:

• f4/f4_oper.cpp (modified) (1 diff)
• fB/fB_oper.cpp (modified) (5 diffs)
• fF/fF_oper.cpp (modified) (1 diff)
• fL/fL_oper.cpp (modified) (10 diffs)

cpp/frams/genetics/f4/f4_oper.cpp

@@ -253 +253 @@
                                 return GENOPER_OPFAIL;
 
-                        node_mutated = candidate_nodes[rndUint((unsigned int)candidate_nodes.size())];
+                        node_mutated = candidate_nodes[rndUint(candidate_nodes.size())];
                         f4_Node *node_mutated_parent = node_mutated->parent;
 

cpp/frams/genetics/fB/fB_oper.cpp

@@ -252 +252 @@
         {
                 std::list<SString> tokenized = tokenizeSequence(line);
-                int rndid = rndUint((int)tokenized.size()); // select random letter from genotype
+                int rndid = rndUint(tokenized.size()); // select random letter from genotype
                 // increment/decrement character - when overflow happens, this method
                 // uses the "reflect" approach
@@ -291 +291 @@
                 std::list<SString> tokenized = tokenizeSequence(line);
                 std::list<SString>::iterator it = tokenized.begin();
-                int rndid = rndUint((int)tokenized.size()); // select random insertion point
+                int rndid = rndUint(tokenized.size()); // select random insertion point
                 std::advance(it, rndid);
                 NeuroClass *cls = getRandomNeuroClass(Model::SHAPETYPE_BALL_AND_STICK);
@@ -312 +312 @@
                 chg = 1.0 / line.length();
                 std::list<SString> tokenized = tokenizeSequence(line);
-                int rndid = rndUint((int)tokenized.size()); // select random insertion point
+                int rndid = rndUint(tokenized.size()); // select random insertion point
                 std::list<SString>::iterator it = tokenized.begin();
                 std::advance(it, rndid);
@@ -326 +326 @@
                 std::list<SString> tokenized = tokenizeSequence(line);
                 std::list<SString>::iterator it = tokenized.begin();
-                int rndid = rndUint((int)tokenized.size()); // select random deletion point
+                int rndid = rndUint(tokenized.size()); // select random deletion point
                 std::advance(it, rndid);
                 tokenized.erase(it);
@@ -348 +348 @@
                 for (int i = 0; i < 4; i++)
                 {
-                        cuts[i] = rndUint((int)tokenized.size());
+                        cuts[i] = rndUint(tokenized.size());
                 }
                 std::sort(cuts.begin(), cuts.end());

cpp/frams/genetics/fF/fF_oper.cpp

@@ -49 +49 @@
         par.load(gene);
         static const int propsToMutate[] = fF_PROPS_TO_MUTATE;
-        int which = rndUint((unsigned int)std::size(propsToMutate));
+        int which = rndUint(std::size(propsToMutate));
         bool mutated_ok = GenoOperators::mutatePropertyNaive(par.param, propsToMutate[which]);
         if (mutated_ok)

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);