- Timestamp:
- 03/05/09 13:01:47 (16 years ago)
- Location:
- branches/CEDMA-Refactoring-Ticket419
- Files:
-
- 6 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.Classification/StandardGP.cs
r1252 r1253 73 73 seq.AddSubOperator(validationAccuracy); 74 74 seq.AddSubOperator(testAccuracy); 75 seq.AddSubOperator(trainingConfusionMatrix); 76 seq.AddSubOperator(validationConfusionMatrix); 77 seq.AddSubOperator(testConfusionMatrix); 75 78 return seq; 76 79 } -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/HeuristicLab.GP.StructureIdentification.TimeSeries.csproj
r1252 r1253 54 54 <RequiredTargetFramework>3.5</RequiredTargetFramework> 55 55 </Reference> 56 <Reference Include="System.Drawing" /> 57 <Reference Include="System.Windows.Forms" /> 56 58 <Reference Include="System.Xml.Linq"> 57 59 <RequiredTargetFramework>3.5</RequiredTargetFramework> … … 70 72 <Compile Include="HeuristicLabGPTimeSeriesPlugin.cs" /> 71 73 <Compile Include="OffspringSelectionGP.cs" /> 74 <Compile Include="OffspringSelectionGpEditor.cs"> 75 <SubType>UserControl</SubType> 76 </Compile> 77 <Compile Include="OffspringSelectionGpEditor.Designer.cs"> 78 <DependentUpon>OffspringSelectionGpEditor.cs</DependentUpon> 79 </Compile> 72 80 <Compile Include="ProblemInjector.cs" /> 73 81 <Compile Include="ProfitEvaluator.cs" /> 74 82 <Compile Include="Properties\AssemblyInfo.cs" /> 75 83 <Compile Include="StandardGP.cs" /> 84 <Compile Include="StandardGpEditor.cs"> 85 <SubType>UserControl</SubType> 86 </Compile> 87 <Compile Include="StandardGpEditor.Designer.cs"> 88 <DependentUpon>StandardGpEditor.cs</DependentUpon> 89 </Compile> 76 90 <Compile Include="TheilInequalityCoefficientEvaluator.cs" /> 77 91 </ItemGroup> … … 118 132 <None Include="Properties\AssemblyInfo.frame" /> 119 133 </ItemGroup> 134 <ItemGroup> 135 <EmbeddedResource Include="OffspringSelectionGpEditor.resx"> 136 <DependentUpon>OffspringSelectionGpEditor.cs</DependentUpon> 137 </EmbeddedResource> 138 <EmbeddedResource Include="StandardGpEditor.resx"> 139 <DependentUpon>StandardGpEditor.cs</DependentUpon> 140 </EmbeddedResource> 141 </ItemGroup> 120 142 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 121 143 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/OffspringSelectionGP.cs
r1252 r1253 34 34 namespace HeuristicLab.GP.StructureIdentification.TimeSeries { 35 35 public class OffspringSelectionGP : HeuristicLab.GP.StructureIdentification.OffspringSelectionGP { 36 private BoolData autoregressive = new BoolData(); 37 public bool Autoregressive { 38 get { return autoregressive.Data; } 39 set { autoregressive.Data = value; } 40 } 41 36 42 protected override IOperator CreateFunctionLibraryInjector() { 37 43 return new FunctionLibraryInjector(); … … 44 50 protected override IOperator CreateGlobalInjector() { 45 51 VariableInjector injector = (VariableInjector)base.CreateGlobalInjector(); 46 injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", new BoolData(false)));52 injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", autoregressive)); 47 53 return injector; 48 54 } … … 116 122 return seq; 117 123 } 124 125 public override IEditor CreateEditor() { 126 return new OffspringSelectionGpEditor(this); 127 } 128 129 public override IView CreateView() { 130 return new OffspringSelectionGpEditor(this); 131 } 118 132 } 119 133 } -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification.TimeSeries/StandardGP.cs
r1252 r1253 34 34 namespace HeuristicLab.GP.StructureIdentification.TimeSeries { 35 35 public class StandardGP : HeuristicLab.GP.StructureIdentification.StandardGP { 36 private BoolData autoregressive = new BoolData(); 37 public bool Autoregressive { 38 get { return autoregressive.Data; } 39 set { autoregressive.Data = value; } 40 } 41 36 42 protected override IOperator CreateFunctionLibraryInjector() { 37 43 return new FunctionLibraryInjector(); … … 44 50 protected override IOperator CreateGlobalInjector() { 45 51 VariableInjector injector = (VariableInjector)base.CreateGlobalInjector(); 46 injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", new BoolData(false)));52 injector.AddVariable(new HeuristicLab.Core.Variable("Autoregressive", autoregressive)); 47 53 return injector; 48 54 } … … 92 98 trainingChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2; 93 99 trainingChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTraining"; 94 trainingChartInjector.GetVariableInfo("Line Chart").ActualName = "LineChartTrainingPredictedValues";100 trainingChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTrainingPredictedValues"; 95 101 96 102 LinechartInjector validationChartInjector = new LinechartInjector(); 97 103 validationChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2; 98 104 validationChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesValidation"; 99 validationChartInjector.GetVariableInfo("Line Chart").ActualName = "LineChartValidationPredictedValues";105 validationChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartValidationPredictedValues"; 100 106 101 107 LinechartInjector testChartInjector = new LinechartInjector(); 102 108 testChartInjector.GetVariableValue<IntData>("NumberOfLines", null, false).Data = 2; 103 109 testChartInjector.GetVariableInfo("Values").ActualName = "PredictedValuesTest"; 104 testChartInjector.GetVariableInfo("Line Chart").ActualName = "LineChartTestPredictedValues";110 testChartInjector.GetVariableInfo("Linechart").ActualName = "LinechartTestPredictedValues"; 105 111 106 112 seq.AddSubOperator(trainingTheil); … … 116 122 return seq; 117 123 } 124 125 public override IEditor CreateEditor() { 126 return new StandardGpEditor(this); 127 } 128 129 public override IView CreateView() { 130 return new StandardGpEditor(this); 131 } 118 132 } 119 133 } -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/OffSpringSelectionGpEditor.Designer.cs
r1201 r1253 375 375 376 376 private System.Windows.Forms.Button executeButton; 377 pr ivateSystem.Windows.Forms.TabControl tabControl;378 pr ivateSystem.Windows.Forms.TabPage parametersTabPage;377 protected System.Windows.Forms.TabControl tabControl; 378 protected System.Windows.Forms.TabPage parametersTabPage; 379 379 private System.Windows.Forms.Button abortButton; 380 380 private System.Windows.Forms.Button resetButton; -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/OffSpringSelectionGpEditor.cs
r1236 r1253 53 53 base.RemoveItemEvents(); 54 54 } 55 55 56 protected override void AddItemEvents() { 56 57 base.AddItemEvents(); … … 71 72 } 72 73 73 pr ivatevoid SetDataBinding() {74 protected virtual void SetDataBinding() { 74 75 setRandomSeedRandomlyCheckBox.DataBindings.Add("Checked", OffspringSelectionGP, "SetSeedRandomly"); 75 76 randomSeedTextBox.DataBindings.Add("Text", OffspringSelectionGP, "Seed"); -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/StandardGpEditor.Designer.cs
r1051 r1253 353 353 354 354 private System.Windows.Forms.Button executeButton; 355 pr ivateSystem.Windows.Forms.TabControl tabControl;356 pr ivateSystem.Windows.Forms.TabPage parametersTabPage;355 protected System.Windows.Forms.TabControl tabControl; 356 protected System.Windows.Forms.TabPage parametersTabPage; 357 357 private System.Windows.Forms.Button abortButton; 358 358 private System.Windows.Forms.Button resetButton; -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/StandardGpEditor.cs
r1231 r1253 71 71 } 72 72 73 pr ivatevoid SetDataBinding() {73 protected virtual void SetDataBinding() { 74 74 setRandomSeedRandomlyCheckBox.DataBindings.Add("Checked", StandardGP, "SetSeedRandomly"); 75 75 randomSeedTextBox.DataBindings.Add("Text", StandardGP, "Seed");
Note: See TracChangeset
for help on using the changeset viewer.