Changeset 1241 for cpp/frams/genetics/f4/f4_general.cpp

Timestamp:

05/18/23 03:43:42 (11 months ago)

Author:

Maciej Komosinski

Message:

No longer sort modifiers and cancel out antagonistic modifiers in f1 and f4; simplifying modifier sequences is now much less intrusive to allow for 2^{N distinct values of properties instead of only 2*N that resulted from earlier forced ordering (N is the number of same-letter upper- and lower-case characters in a modifier sequence)}

File:

• cpp/frams/genetics/f4/f4_general.cpp (modified) (3 diffs)

cpp/frams/genetics/f4/f4_general.cpp

@@ -1363 +1363 @@
                         // in the future this could be generalized to all neuron properties, for example N:|:power:0.6:range:1.4, or can even use '=' or ',' instead of ':' if no ambiguity
                         char prop_dir, prop_symbol, prop_end[2]; // prop_end is only to ensure that neuron parameter definition is completed
-                        if (sscanf(genot + pos_inout, ":%c%c%1[:]", &prop_dir, &prop_symbol, &prop_end) != 3)
+                        if (sscanf(genot + pos_inout, ":%c%c%1[:]", &prop_dir, &prop_symbol, prop_end) != 3)
                                 // error: incorrect format
                                 return pos_inout + 1 + 1;
@@ -1402 +1402 @@
 #ifdef F4_SIMPLIFY_MODIFIERS
                         char *ptr = (char*)(genot + pos_inout);
-
-#ifdef __BORLANDC__ // "[bcc32c Error] cannot compile this non-trivial TLS destruction yet" (C++B 10.4u2)
-                        static
-#else
-                        thread_local
-#endif
-                                vector<int> modifs_counts(strlen(all_modifiers_no_comma)); ///<an array with a known constant size storing counters of each modifier symbol from all_modifiers_no_comma, created once to avoid reallocation every time when modifier genes are simplified during parsing. Initialization of required size; it will never be resized.
-                        std::fill(modifs_counts.begin(), modifs_counts.end(), 0); //zeroing only needed if we encountered a char from all_modifiers_no_comma and enter the 'while' loop below
-
-                        while (char *m = GenoOperators::strchrn0(all_modifiers_no_comma, *ptr)) //only processes a section of chars known in all_modifiers_no_comma, other characters will exit the loop
-                        {
-                                modifs_counts[m - all_modifiers_no_comma]++;
+                        string original = "";
+                        while (GenoOperators::strchrn0(all_modifiers_no_comma, *ptr)) //only processes a section of chars known in all_modifiers_no_comma, other characters will exit the loop
+                        {
+                                original += *ptr;
                                 GenoOperators::skipWS(++ptr); //advance and ignore whitespace
                         }
@@ -1419 +1411 @@
                         if (advanced > 0) //found modifiers
                         {
-                                string simplified = GenoOperators::simplifiedModifiers(all_modifiers_no_comma, modifs_counts);
+                                string simplified = GenoOperators::simplifiedModifiers(original);
                                 // add a node for each char in "simplified"
                                 for (size_t i = 0; i < simplified.length(); i++)