Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.CEDMA.Charting/HeuristicLab.CEDMA.Charting.csproj

    r582 r656  
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    55    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    6     <ProductVersion>9.0.30729</ProductVersion>
     6    <ProductVersion>9.0.21022</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    88    <ProjectGuid>{1BF17271-5350-476A-8F6D-FC74FA3E82CA}</ProjectGuid>
     
    122122      <Name>HeuristicLab.Data</Name>
    123123    </ProjectReference>
    124     <ProjectReference Include="..\HeuristicLab.Functions\HeuristicLab.Functions.csproj">
    125       <Project>{B95CA6E2-34BC-4430-994D-BD6E99375319}</Project>
    126       <Name>HeuristicLab.Functions</Name>
     124    <ProjectReference Include="..\HeuristicLab.GP.StructureIdentification\HeuristicLab.GP.StructureIdentification.csproj">
     125      <Project>{74223A32-C726-4978-BE78-37113A18373C}</Project>
     126      <Name>HeuristicLab.GP.StructureIdentification</Name>
     127    </ProjectReference>
     128    <ProjectReference Include="..\HeuristicLab.GP\HeuristicLab.GP.csproj">
     129      <Project>{1F1CF3ED-374C-4288-995B-93F6B872F571}</Project>
     130      <Name>HeuristicLab.GP</Name>
    127131    </ProjectReference>
    128132    <ProjectReference Include="..\HeuristicLab.Logging\HeuristicLab.Logging.csproj">
  • trunk/sources/HeuristicLab.CEDMA.Charting/ModelView.cs

    r577 r656  
    99using HeuristicLab.Core;
    1010using HeuristicLab.Charting;
    11 using HeuristicLab.Functions;
    1211using HeuristicLab.Logging;
    1312using HeuristicLab.DataAnalysis;
    1413using HeuristicLab.Charting.Data;
     14using HeuristicLab.GP;
     15using HeuristicLab.GP.StructureIdentification;
    1516
    1617namespace HeuristicLab.CEDMA.Charting {
     
    4546      Pen pen = new Pen(Color.FromArgb(80, Color.Blue));
    4647      chart.AddDataRow(DataRowType.Points, pen, pen.Brush);
    47       IEvaluator eval = model.CreateEvaluator();
    48       eval.ResetEvaluator(model, dataset);
     48      BakedTreeEvaluator eval = new BakedTreeEvaluator();
     49      eval.ResetEvaluator((BakedFunctionTree)model, dataset);
    4950      for(int i = 0; i < dataset.Rows; i += 10) {
    5051        double predicted = eval.Evaluate(i);
     
    8384      chart.AddDataRow(DataRowType.Lines, bluePen, bluePen.Brush);
    8485      chart.AddDataRow(DataRowType.Lines, redPen, redPen.Brush);
    85       IEvaluator eval = model.CreateEvaluator();
    86       eval.ResetEvaluator(model, dataset);
     86      BakedTreeEvaluator eval = new BakedTreeEvaluator();
     87      eval.ResetEvaluator((BakedFunctionTree)model, dataset);
    8788      int n = 0;
    8889      for(int i = 0; i < dataset.Rows; i ++) {
  • trunk/sources/HeuristicLab.CEDMA.Charting/ResultList.cs

    r576 r656  
    3434using HeuristicLab.Data;
    3535using HeuristicLab.DataAnalysis;
    36 using HeuristicLab.Functions;
    3736using HeuristicLab.Charting.Data;
    3837using System.Drawing;
     38using HeuristicLab.GP;
    3939
    4040namespace HeuristicLab.CEDMA.Charting {
Note: See TracChangeset for help on using the changeset viewer.