Changeset 2222 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/AlgorithmBase.cs

Timestamp:

08/03/09 12:26:42 (15 years ago)

Author:

gkronber

Message:

Merged changes from GP-refactoring branch back into the trunk #713.

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/AlgorithmBase.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/AlgorithmBase.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Xml;
 using HeuristicLab.Core;
-using System.Xml;
-using System.Diagnostics;
+using HeuristicLab.Data;
 using HeuristicLab.DataAnalysis;
+using HeuristicLab.Evolutionary;
+using HeuristicLab.GP.Interfaces;
+using HeuristicLab.Logging;
+using HeuristicLab.Modeling;
 using HeuristicLab.Operators;
 using HeuristicLab.Random;
 using HeuristicLab.Selection;
-using HeuristicLab.Logging;
-using HeuristicLab.Data;
-using HeuristicLab.Operators.Programmable;
-using HeuristicLab.Evolutionary;
-using HeuristicLab.Modeling;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -419 +416 @@
       Model model = new Model();
       Dataset ds = bestModelScope.GetVariableValue<Dataset>("Dataset", true);
-      model.Data = bestModelScope.GetVariableValue<IFunctionTree>("FunctionTree", false);
+      model.Data = bestModelScope.GetVariableValue<IGeneticProgrammingModel>("FunctionTree", false);
       model.Dataset = ds;
       model.TargetVariable = ds.GetVariableName(bestModelScope.GetVariableValue<IntData>("TargetVariable", true).Data);