Changeset 935 for cpp/frams/genetics/genooperators.cpp

Timestamp:

05/29/20 15:20:29 (4 years ago)

Author:

Maciej Komosinski

Message:

Utility functions that provide a set of all neuron classes fulfilling given criteria now also filter neuron classes by the desired Model shape type (BALL_AND_STICK or SOLIDS)

File:

• cpp/frams/genetics/genooperators.cpp (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-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -223 +223 @@
 }
 
-int GenoOperators::getActiveNeuroClassCount()
+int GenoOperators::getActiveNeuroClassCount(Model::ShapeType for_shape_type)
 {
         int count = 0;
         for (int i = 0; i < Neuro::getClassCount(); i++)
-                if (Neuro::getClass(i)->genactive)
+        {
+                NeuroClass *nc = Neuro::getClass(i);
+                if (nc->isShapeTypeSupported(for_shape_type) && nc->genactive)
                         count++;
+        }
         return count;
 }
 
-NeuroClass *GenoOperators::getRandomNeuroClass()
+NeuroClass *GenoOperators::getRandomNeuroClass(Model::ShapeType for_shape_type)
 {
         vector<NeuroClass *> active;
         for (int i = 0; i < Neuro::getClassCount(); i++)
-                if (Neuro::getClass(i)->genactive)
-                        active.push_back(Neuro::getClass(i));
+        {
+                NeuroClass *nc = Neuro::getClass(i);
+                if (nc->isShapeTypeSupported(for_shape_type) && nc->genactive)
+                        active.push_back(nc);
+        }
         if (active.size() == 0) return NULL; else return active[rndUint(active.size())];
 }
 
-NeuroClass *GenoOperators::getRandomNeuroClassWithOutput()
+NeuroClass *GenoOperators::getRandomNeuroClassWithOutput(Model::ShapeType for_shape_type)
 {
         vector<NeuroClass *> active;
         for (int i = 0; i < Neuro::getClassCount(); i++)
-                if (Neuro::getClass(i)->genactive && Neuro::getClass(i)->getPreferredOutput() != 0)
-                        active.push_back(Neuro::getClass(i));
+        {
+                NeuroClass *nc = Neuro::getClass(i);
+                if (nc->isShapeTypeSupported(for_shape_type) && nc->genactive && nc->getPreferredOutput() != 0)
+                        active.push_back(nc);
+        }
         if (active.size() == 0) return NULL; else return active[rndUint(active.size())];
 }
 
-NeuroClass *GenoOperators::getRandomNeuroClassWithInput()
+NeuroClass *GenoOperators::getRandomNeuroClassWithInput(Model::ShapeType for_shape_type)
 {
         vector<NeuroClass *> active;
         for (int i = 0; i < Neuro::getClassCount(); i++)
-                if (Neuro::getClass(i)->genactive && Neuro::getClass(i)->getPreferredInputs() != 0)
-                        active.push_back(Neuro::getClass(i));
+        {
+                NeuroClass *nc = Neuro::getClass(i);
+                if (nc->isShapeTypeSupported(for_shape_type) && nc->genactive && nc->getPreferredInputs() != 0)
+                        active.push_back(nc);
+        }
         if (active.size() == 0) return NULL; else return active[rndUint(active.size())];
 }
 
-NeuroClass *GenoOperators::getRandomNeuroClassWithOutputAndNoInputs()
+NeuroClass *GenoOperators::getRandomNeuroClassWithOutputAndNoInputs(Model::ShapeType for_shape_type)
 {
         vector<NeuroClass *> active;
         for (int i = 0; i < Neuro::getClassCount(); i++)
-                if (Neuro::getClass(i)->genactive && Neuro::getClass(i)->getPreferredOutput() != 0 && Neuro::getClass(i)->getPreferredInputs() == 0)
-                        active.push_back(Neuro::getClass(i));
+        {
+                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())];
 }