Changeset 653
- Timestamp:
- 10/13/08 11:03:32 (16 years ago)
- Location:
- branches/GpPluginsRefactoringBranch/HeuristicLab.CEDMA.Charting
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GpPluginsRefactoringBranch/HeuristicLab.CEDMA.Charting/HeuristicLab.CEDMA.Charting.csproj
r582 r653 4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 5 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 6 <ProductVersion>9.0. 30729</ProductVersion>6 <ProductVersion>9.0.21022</ProductVersion> 7 7 <SchemaVersion>2.0</SchemaVersion> 8 8 <ProjectGuid>{1BF17271-5350-476A-8F6D-FC74FA3E82CA}</ProjectGuid> … … 122 122 <Name>HeuristicLab.Data</Name> 123 123 </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> 127 131 </ProjectReference> 128 132 <ProjectReference Include="..\HeuristicLab.Logging\HeuristicLab.Logging.csproj"> -
branches/GpPluginsRefactoringBranch/HeuristicLab.CEDMA.Charting/ModelView.cs
r577 r653 9 9 using HeuristicLab.Core; 10 10 using HeuristicLab.Charting; 11 using HeuristicLab.Functions;12 11 using HeuristicLab.Logging; 13 12 using HeuristicLab.DataAnalysis; 14 13 using HeuristicLab.Charting.Data; 14 using HeuristicLab.GP; 15 using HeuristicLab.GP.StructureIdentification; 15 16 16 17 namespace HeuristicLab.CEDMA.Charting { … … 45 46 Pen pen = new Pen(Color.FromArgb(80, Color.Blue)); 46 47 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); 49 50 for(int i = 0; i < dataset.Rows; i += 10) { 50 51 double predicted = eval.Evaluate(i); … … 83 84 chart.AddDataRow(DataRowType.Lines, bluePen, bluePen.Brush); 84 85 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); 87 88 int n = 0; 88 89 for(int i = 0; i < dataset.Rows; i ++) { -
branches/GpPluginsRefactoringBranch/HeuristicLab.CEDMA.Charting/ResultList.cs
r576 r653 34 34 using HeuristicLab.Data; 35 35 using HeuristicLab.DataAnalysis; 36 using HeuristicLab.Functions;37 36 using HeuristicLab.Charting.Data; 38 37 using System.Drawing; 38 using HeuristicLab.GP; 39 39 40 40 namespace HeuristicLab.CEDMA.Charting {
Note: See TracChangeset
for help on using the changeset viewer.