Context Navigation

Changeset 18199

Timestamp:

01/14/22 15:58:30 (3 years ago)

Author:

mkommend

Message:

#3136: Fixed parsing of variables in subfunctions.

Location:

branches/3136_Structural_GP

Files:

r18198	r18199
30	30	using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
31	31	using HeuristicLab.Optimization;
32		~~using HeuristicLab.Optimization.Operators;~~
33	32	using HeuristicLab.Parameters;
34	33	using HeuristicLab.Problems.Instances;

-                      r18195
+                      r18199
         if (value == template) return;
+        var parsedTree = Parser.Parse(value);
+        //assignment must be done after successfully parsing the tree
         template = value;
+        var parsedTree = Parser.Parse(template);
         if (applyLinearScaling)
           parsedTree = LinearScaling.AddLinearScalingTerms(parsedTree);
 …
       private set {
         containsNumericParameters = null;
-        tree = value;
         var newFunctions = CreateSubFunctions(tree);
+        var newFunctions = CreateSubFunctions(value);
         var oldFunctions = subFunctions?.Intersect(newFunctions)
                            ?? Enumerable.Empty<SubFunction>();
 …
         subFunctions = functionsToAdd.Concat(oldFunctions).ToList();
         RegisterSubFunctionEventHandlers(functionsToAdd);
+        tree = value;
+      }
+    }
 …
     protected InfixExpressionParser Parser { get; set; } = new InfixExpressionParser();
     #endregion
 …
       subFunctions = new List<SubFunction>();
       tree = null;
+      containsNumericParameters = null;
       Template = "f(_)";
+    }
 …
         sf.Changed += (o, e) => OnChanged();
+      }
+    }
+    }
+  }
+}

-                      r18194
+                      r18199
           varSym.VariableNames = allowedInputVariables;
         } else {
+          var vars = new List<string>();
+          var exceptions = new List<Exception>();
+          foreach (var arg in Arguments) {
+            if (allowedInputVariables.Contains(arg))
+              vars.Add(arg);
+            else
+              exceptions.Add(new ArgumentException($"The argument '{arg}' for sub-function '{Name}' is not a valid variable."));
+          }
+          if (exceptions.Any())
+            throw new AggregateException(exceptions);
+          varSym.VariableNames = vars;
+          varSym.VariableNames = Arguments.ToList();
+        }

Note: See TracChangeset for help on using the changeset viewer.