Changeset 2633 for trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/NetworkToFunctionTransformer.cs

Timestamp:

01/18/10 09:28:53 (14 years ago)

Author:

gkronber

Message:

Fixed test-cases for constant expressions and expressions of one argument and fixed a bug in the network transformation operator. #833

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/NetworkToFunctionTransformer.cs (modified) (2 diffs)

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

@@ -58 +58 @@
         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)));
+        Debug.Assert(!(transformedTree is VariableFunctionTree) || ((VariableFunctionTree)transformedTree).VariableName != targetVariableEnumerator.Current);
       }
 
@@ -214 +215 @@
     /// <returns></returns>
     private static IFunctionTree TransformExpression(IFunctionTree tree, string targetVariable, IEnumerable<string> parameters) {
-      if (tree.Function is Variable || tree.Function is Constant || tree.Function is Differential) return tree;
+      if (tree.Function is Constant) return tree;
+      if (tree.Function is Variable || tree.Function is Differential) {
+        VariableFunctionTree varTree = (VariableFunctionTree)tree;
+        varTree.Weight = 1.0;
+        if (varTree.VariableName == targetVariable) varTree.VariableName = parameters.First();
+        return varTree;
+      }
       if (tree.Function is Addition || tree.Function is Subtraction ||
           tree.Function is Multiplication || tree.Function is Division ||