Changeset 935 for cpp/frams/genetics/f4

Timestamp:

05/29/20 15:20:29 (5 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/f4/f4_oper.cpp (modified) (4 diffs)

cpp/frams/genetics/f4/f4_oper.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -164 +164 @@
                         {
                                 // make neuron
-                                NeuroClass *rndclass = GenoOperators::getRandomNeuroClass();
+                                NeuroClass *rndclass = GenoOperators::getRandomNeuroClass(Model::SHAPE_BALL_AND_STICK);
                                 if (rndclass == NULL)
                                 {
@@ -434 +434 @@
         {
                 // '*', 'G', 'T', or 'S', 1/4 chance each
-                nc = GenoOperators::getRandomNeuroClassWithOutputAndNoInputs();
+                nc = GenoOperators::getRandomNeuroClassWithOutputAndNoInputs(Model::SHAPE_BALL_AND_STICK);
         }
         if (nc != NULL)
@@ -470 +470 @@
                 if (rndDouble(1) < 0.2f)
                 {
-                        cl = GenoOperators::getRandomNeuroClassWithOutputAndNoInputs();
+                        cl = GenoOperators::getRandomNeuroClassWithOutputAndNoInputs(Model::SHAPE_BALL_AND_STICK);
                         if (cl != NULL)
                         {