Changeset 2631 for trunk/sources/HeuristicLab.GP.StructureIdentification.Networks

Timestamp:

01/15/10 18:42:21 (15 years ago)

Author:

gkronber

Message:

Fixed another problem in the operator for transformation of networks to closed-form function trees. #833 (Genetic Programming based search for equations (modeling with multiple target variables))

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/NetworkToFunctionTransformer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/NetworkToFunctionTransformer.cs

@@ -50 +50 @@
       while (scope.SubScopes.Count > 0) scope.RemoveSubScope(scope.SubScopes[0]);
 
+      var targetVariableEnumerator = targetVariables.Select(x => x.Data).GetEnumerator();
       // create a new sub-scope for each target variable with the transformed expression
       foreach (IFunctionTree transformedTree in Transform(model.FunctionTree, targetVariables.Select(x => x.Data))) {
+        targetVariableEnumerator.MoveNext();
         Scope exprScope = new Scope();
         scope.AddSubScope(exprScope);
         exprScope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("FunctionTree"), new GeneticProgrammingModel(transformedTree)));
+        exprScope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("TargetVariable"), new StringData(targetVariableEnumerator.Current)));
       }