Changeset 1226 for cpp/frams

Timestamp:

04/27/23 03:55:33 (20 months ago)

Author:

Maciej Komosinski

Message:

• Added ShapeType? constraint to GenoOperators::parseNeuroClass()
• Introduced GenoOperators::getRandomNeuroClassWithOutputAndWantingNoOrAnyInputs()

Location:

cpp/frams/genetics

Files:

• genooperators.cpp (modified) (5 diffs)
• genooperators.h (modified) (2 diffs)

cpp/frams/genetics/genooperators.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -313 +313 @@
 }
 
-NeuroClass *GenoOperators::getRandomNeuroClassWithOutputAndNoInputs(Model::ShapeType for_shape_type)
+NeuroClass *GenoOperators::getRandomNeuroClassWithOutputAndWantingNoInputs(Model::ShapeType for_shape_type)
 {
         vector<NeuroClass *> active;
@@ -320 +320 @@
                 NeuroClass *nc = Neuro::getClass(i);
                 if (nc->isShapeTypeSupported(for_shape_type) && nc->genactive && nc->getPreferredOutput() != 0 && nc->getPreferredInputs() == 0)
+                        active.push_back(nc);
+        }
+        if (active.size() == 0) return NULL; else return active[rndUint(active.size())];
+}
+
+NeuroClass *GenoOperators::getRandomNeuroClassWithOutputAndWantingNoOrAnyInputs(Model::ShapeType for_shape_type)
+{
+        vector<NeuroClass *> active;
+        for (int i = 0; i < Neuro::getClassCount(); i++)
+        {
+                NeuroClass *nc = Neuro::getClass(i);
+                if (nc->isShapeTypeSupported(for_shape_type) && nc->genactive && nc->getPreferredOutput() != 0 && nc->getPreferredInputs() <= 0) // getPreferredInputs() should be 0 or -1 (any)
                         active.push_back(nc);
         }
@@ -353 +365 @@
         {
                 if (!strchrn0(excluded, choices[i])) allowed_count++;
-                if (allowed_count == rnd_index) return i;
+                if (allowed_count == rnd_index) return int(i);
         }
         return -1; //never happens
 }
 
-NeuroClass *GenoOperators::parseNeuroClass(char *&s)
+NeuroClass *GenoOperators::parseNeuroClass(char *&s, ModelEnum::ShapeType supported_shapetype)
 {
         int maxlen = (int)strlen(s);
@@ -365 +377 @@
         for (int i = 0; i < Neuro::getClassCount(); i++)
         {
-                const char *ncname = Neuro::getClass(i)->name.c_str();
-                int ncnamelen = (int)strlen(ncname);
-                if (maxlen >= ncnamelen && ncnamelen > NClen && (strncmp(s, ncname, ncnamelen) == 0))
-                {
-                        NC = Neuro::getClass(i);
-                        NClen = ncnamelen;
+                NeuroClass *nci = Neuro::getClass(i);
+                if (!nci->isShapeTypeSupported(supported_shapetype))
+                        continue;
+                const char *nciname = nci->name.c_str();
+                int ncinamelen = (int)strlen(nciname);
+                if (maxlen >= ncinamelen && ncinamelen > NClen && (strncmp(s, nciname, ncinamelen) == 0))
+                {
+                        NC = nci;
+                        NClen = ncinamelen;
                 }
         }

cpp/frams/genetics/genooperators.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -202 +202 @@
         static NeuroClass* getRandomNeuroClassWithOutput(Model::ShapeType for_shape_type); ///<returns random neuroclass with output or NULL when no active classes.
         static NeuroClass* getRandomNeuroClassWithInput(Model::ShapeType for_shape_type); ///<returns random neuroclass with input or NULL when no active classes.
-        static NeuroClass* getRandomNeuroClassWithOutputAndNoInputs(Model::ShapeType for_shape_type); ///<returns random sensor or NULL when no active classes.
+        static NeuroClass* getRandomNeuroClassWithOutputAndWantingNoInputs(Model::ShapeType for_shape_type); ///<returns random sensor or NULL when no active classes. Note: only neuroclasses that prefer 0 inputs are considered, not those that prefer any number of inputs (thus including 0) - see getRandomNeuroClassWithOutputAndWantingNoOrAnyInputs().
+        static NeuroClass* getRandomNeuroClassWithOutputAndWantingNoOrAnyInputs(Model::ShapeType for_shape_type); ///<returns random neuron or NULL when no active classes. Note: both neuroclasses that prefer 0 inputs and those that prefer any number of inputs (thus including 0) are considered.
         static int getRandomNeuroClassWithOutput(const vector<NeuroClass*>& NClist); ///<returns index of random NeuroClass from the NClist or -1 when no neurons in the list provide output \e NClist list of available neuron classes
         static int getRandomNeuroClassWithInput(const vector<NeuroClass*>& NClist); ///<returns index of random NeuroClass from the NClist or -1 when no neurons in the list want input(s) \e NClist list of available neuron classes
-        static int getRandomChar(const char *choices, const char *excluded); ///<returns index of a random character from 'choices' excluding 'excluded', or -1 when everything is excluded or 'choices' is empty.
-        static NeuroClass* parseNeuroClass(char *&s); ///<returns longest matching neuroclass or NULL if the string does not begin with a valid neuroclass name. Advances \e s pointer.
+        static int getRandomChar(const char *choices, const char *excluded); ///<returns index of a random character from \e choices excluding \e excluded, or -1 when everything is excluded or \e choices is empty.
+        static NeuroClass* parseNeuroClass(char *&s, ModelEnum::ShapeType supported_shapetype); ///<returns the longest matching neuroclass that satisfies supported_shapetype (ModelEnum::SHAPETYPE_BALL_AND_STICK or ModelEnum::SHAPETYPE_SOLIDS) or NULL if the string does not begin with an appropriate neuroclass name. Advances the \e s pointer if the neuroclass is found.
         static Neuro* findNeuro(const Model *m, const NeuroClass *nc); ///<returns pointer to first Neuro of class \e nc, or NULL if there is no such Neuro.
-        static int neuroClassProp(char *&s, NeuroClass *nc, bool also_v1_N_props = false); ///<returns 0-based extraproperty of NeuroClass or NEUROCLASS_PROP_OFFSET-based standard property of NeuroClass, or -1 if the string does not begin with a valid property name. Advance \e s pointer if success.
+        static int neuroClassProp(char *&s, NeuroClass *nc, bool also_v1_N_props = false); ///<returns 0-based extraproperty of NeuroClass or NEUROCLASS_PROP_OFFSET-based standard property of NeuroClass, or -1 if the string does not begin with a valid property name. Advance the \e s pointer if success.
         static bool isWS(const char c); ///<is \e c a whitespace char?
         static void skipWS(char *&s); ///<advances pointer \e s skipping whitespaces.