Changeset 170 for cpp

Timestamp:

03/13/14 00:36:07 (11 years ago)

Author:

sz

Message:

removed the confusing SList operator!()

Location:

cpp/frams

Files:

• genetics/f1/conv_f1.cpp (modified) (1 diff)
• genetics/oper_fx.cpp (modified) (1 diff)
• util/list.h (modified) (1 diff)

cpp/frams/genetics/f1/conv_f1.cpp

@@ -302 +302 @@
         g++;
         }
-return !out;
+return out.size();
 }
 

cpp/frams/genetics/oper_fx.cpp

@@ -182 +182 @@
         for (int i = 0; i < Neuro::getClassCount(); i++)
                 if (Neuro::getClass(i)->genactive) active += Neuro::getClass(i);
-        if (!active == 0) return NULL; else return active(randomN(!active));
+        if (active.size() == 0) return NULL; else return active(randomN(active.size()));
 }
 

cpp/frams/util/list.h

@@ -128 +128 @@
 void hardclear() {resize(0); used=0;} ///< remove all elements and free mem
 int size() const {return used;} ///< list size 
-int operator!() {return used;} ///< list size
 void operator=(const SListTempl<T>&src) ///duplicate
  {