Changeset 656 for trunk/sources/HeuristicLab.CEDMA.Charting/ModelView.cs

Timestamp:

10/14/08 22:55:57 (16 years ago)

Author:

gkronber

Message:

merged changesets r644:647 and r651:655 from the GpPluginsRefactoringBranch back into the trunk (#177)

File:

• trunk/sources/HeuristicLab.CEDMA.Charting/ModelView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.CEDMA.Charting/ModelView.cs

@@ -9 +9 @@
 using HeuristicLab.Core;
 using HeuristicLab.Charting;
-using HeuristicLab.Functions;
 using HeuristicLab.Logging;
 using HeuristicLab.DataAnalysis;
 using HeuristicLab.Charting.Data;
+using HeuristicLab.GP;
+using HeuristicLab.GP.StructureIdentification;
 
 namespace HeuristicLab.CEDMA.Charting {
@@ -45 +46 @@
       Pen pen = new Pen(Color.FromArgb(80, Color.Blue));
       chart.AddDataRow(DataRowType.Points, pen, pen.Brush);
-      IEvaluator eval = model.CreateEvaluator();
-      eval.ResetEvaluator(model, dataset);
+      BakedTreeEvaluator eval = new BakedTreeEvaluator();
+      eval.ResetEvaluator((BakedFunctionTree)model, dataset);
       for(int i = 0; i < dataset.Rows; i += 10) {
         double predicted = eval.Evaluate(i);
@@ -83 +84 @@
       chart.AddDataRow(DataRowType.Lines, bluePen, bluePen.Brush);
       chart.AddDataRow(DataRowType.Lines, redPen, redPen.Brush);
-      IEvaluator eval = model.CreateEvaluator();
-      eval.ResetEvaluator(model, dataset);
+      BakedTreeEvaluator eval = new BakedTreeEvaluator();
+      eval.ResetEvaluator((BakedFunctionTree)model, dataset);
       int n = 0;
       for(int i = 0; i < dataset.Rows; i ++) {