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

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)

Location:

trunk/sources/HeuristicLab.CEDMA.Charting

Files:

• HeuristicLab.CEDMA.Charting.csproj (modified) (2 diffs)
• ModelView.cs (modified) (3 diffs)
• ResultList.cs (modified) (1 diff)

trunk/sources/HeuristicLab.CEDMA.Charting/HeuristicLab.CEDMA.Charting.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1BF17271-5350-476A-8F6D-FC74FA3E82CA}</ProjectGuid>
@@ -122 +122 @@
       <Name>HeuristicLab.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\HeuristicLab.Functions\HeuristicLab.Functions.csproj">
-      <Project>{B95CA6E2-34BC-4430-994D-BD6E99375319}</Project>
-      <Name>HeuristicLab.Functions</Name>
+    <ProjectReference Include="..\HeuristicLab.GP.StructureIdentification\HeuristicLab.GP.StructureIdentification.csproj">
+      <Project>{74223A32-C726-4978-BE78-37113A18373C}</Project>
+      <Name>HeuristicLab.GP.StructureIdentification</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.GP\HeuristicLab.GP.csproj">
+      <Project>{1F1CF3ED-374C-4288-995B-93F6B872F571}</Project>
+      <Name>HeuristicLab.GP</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Logging\HeuristicLab.Logging.csproj">

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 ++) {

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

@@ -34 +34 @@
 using HeuristicLab.Data;
 using HeuristicLab.DataAnalysis;
-using HeuristicLab.Functions;
 using HeuristicLab.Charting.Data;
 using System.Drawing;
+using HeuristicLab.GP;
 
 namespace HeuristicLab.CEDMA.Charting {