Changeset 1032 for cpp/frams/genetics/fS/fS_general.h

Timestamp:

11/27/20 20:54:50 (3 years ago)

Author:

Maciej Komosinski

Message:

• fS: comma as an intuitive separator in genotype instead of weird symbols ^;'
• other minor refactorizations

File:

• cpp/frams/genetics/fS/fS_general.h (modified) (2 diffs)

cpp/frams/genetics/fS/fS_general.h

@@ -19 +19 @@
 #define BRANCH_START '('
 #define BRANCH_END ')'
-#define BRANCH_SEPARATOR '^'
+#define BRANCH_SEPARATOR ','
 #define PARAM_START '{'
 #define PARAM_END '}'
-const char PARAM_SEPARATOR = ';';
+const char PARAM_SEPARATOR = ',';
 const char PARAM_KEY_VALUE_SEPARATOR = '=';
 #define NEURON_START '['
 const char NEURON_END = ']';
 const char NEURON_SEPARATOR = ';';
-const SString NEURON_INTERNAL_SEPARATOR("'");
+const SString NEURON_INTERNAL_SEPARATOR(",");
 #define NEURON_I_W_SEPARATOR ':'
 //@}
@@ -274 +274 @@
         Part *part;     /// A part object built from node. Used in building the Model
         int partCodeLen; /// The length of substring that directly describes the corresponding part
+
         static std::map<string, double> minValues;      /// Min parameter values
         static std::map<string, double> defaultValues;  /// Default parameter values