- Timestamp:
- 03/05/09 11:03:42 (15 years ago)
- Location:
- branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification
- Files:
-
- 2 edited
- 4 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/HeuristicLab.GP.StructureIdentification.csproj
r1246 r1252 80 80 <Compile Include="OffSpringSelectionGpEditor.Designer.cs"> 81 81 <DependentUpon>OffSpringSelectionGpEditor.cs</DependentUpon> 82 </Compile> 83 <Compile Include="ProblemInjector.cs" /> 84 <Compile Include="ProblemInjectorView.cs"> 85 <SubType>UserControl</SubType> 86 </Compile> 87 <Compile Include="ProblemInjectorView.Designer.cs"> 88 <DependentUpon>ProblemInjectorView.cs</DependentUpon> 82 89 </Compile> 83 90 <Compile Include="StandardGpEditor.cs"> … … 115 122 <Compile Include="Sinus.cs" /> 116 123 <Compile Include="Sqrt.cs" /> 117 <Compile Include="StructIdProblemInjector.cs" />118 <Compile Include="StructIdProblemInjectorView.cs">119 <SubType>UserControl</SubType>120 </Compile>121 <Compile Include="StructIdProblemInjectorView.Designer.cs">122 <DependentUpon>StructIdProblemInjectorView.cs</DependentUpon>123 </Compile>124 124 <Compile Include="Subtraction.cs" /> 125 125 <Compile Include="SymbolicExpressionExporter.cs" /> … … 187 187 <DependentUpon>OffSpringSelectionGpEditor.cs</DependentUpon> 188 188 </EmbeddedResource> 189 <EmbeddedResource Include="ProblemInjectorView.resx"> 190 <DependentUpon>ProblemInjectorView.cs</DependentUpon> 191 </EmbeddedResource> 189 192 <EmbeddedResource Include="StandardGpEditor.resx"> 190 193 <DependentUpon>StandardGpEditor.cs</DependentUpon> 191 <SubType>Designer</SubType>192 </EmbeddedResource>193 <EmbeddedResource Include="StructIdProblemInjectorView.resx">194 <DependentUpon>StructIdProblemInjectorView.cs</DependentUpon>195 194 <SubType>Designer</SubType> 196 195 </EmbeddedResource> -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/ProblemInjector.cs
r1249 r1252 30 30 31 31 namespace HeuristicLab.GP.StructureIdentification { 32 public class StructIdProblemInjector : Core.OperatorBase {32 public class ProblemInjector : Core.OperatorBase { 33 33 public override string Description { 34 34 get { return @"Injects the necessary variables for a structure identification problem."; } 35 35 } 36 36 37 public StructIdProblemInjector()37 public ProblemInjector() 38 38 : base() { 39 39 AddVariableInfo(new Core.VariableInfo("Dataset", "Dataset", typeof(Dataset), Core.VariableKind.New)); … … 75 75 76 76 public override Core.IView CreateView() { 77 return new StructIdProblemInjectorView(this);77 return new ProblemInjectorView(this); 78 78 } 79 79 -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/ProblemInjectorView.Designer.cs
r1249 r1252 21 21 22 22 namespace HeuristicLab.GP.StructureIdentification { 23 partial class StructIdProblemInjectorView {23 partial class ProblemInjectorView { 24 24 /// <summary> 25 25 /// Required designer variable. -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/ProblemInjectorView.cs
r1249 r1252 33 33 34 34 namespace HeuristicLab.GP.StructureIdentification { 35 public partial class StructIdProblemInjectorView : ViewBase {36 public StructIdProblemInjector StructIdProblemInjector {37 get { return ( StructIdProblemInjector)Item; }35 public partial class ProblemInjectorView : ViewBase { 36 public ProblemInjector ProblemInjector { 37 get { return (ProblemInjector)Item; } 38 38 set { base.Item = value; } 39 39 } 40 40 41 public StructIdProblemInjectorView()41 public ProblemInjectorView() 42 42 : base() { 43 43 InitializeComponent(); 44 44 } 45 public StructIdProblemInjectorView(StructIdProblemInjector structIdProblemInjector)45 public ProblemInjectorView(ProblemInjector problemInjector) 46 46 : this() { 47 StructIdProblemInjector = structIdProblemInjector;48 variablesView.Operator = structIdProblemInjector;47 ProblemInjector = problemInjector; 48 variablesView.Operator = problemInjector; 49 49 variablesView.Update(); 50 50 } … … 57 57 protected override void AddItemEvents() { 58 58 base.AddItemEvents(); 59 operatorBaseVariableInfosView.Operator = StructIdProblemInjector;60 operatorBaseDescriptionView.Operator = StructIdProblemInjector;59 operatorBaseVariableInfosView.Operator = ProblemInjector; 60 operatorBaseDescriptionView.Operator = ProblemInjector; 61 61 } 62 62 63 63 protected override void UpdateControls() { 64 64 base.UpdateControls(); 65 if ( StructIdProblemInjector == null) {65 if (ProblemInjector == null) { 66 66 importInstanceButton.Enabled = false; 67 67 } else { 68 Dataset dataset = (Dataset) StructIdProblemInjector.GetVariable("Dataset").Value;68 Dataset dataset = (Dataset)ProblemInjector.GetVariable("Dataset").Value; 69 69 datasetView.Dataset = dataset; 70 70 importInstanceButton.Enabled = true; … … 94 94 } 95 95 if (success) { 96 Dataset dataset = (Dataset) StructIdProblemInjector.GetVariable("Dataset").Value;96 Dataset dataset = (Dataset)ProblemInjector.GetVariable("Dataset").Value; 97 97 dataset.Rows = parser.Rows; 98 98 dataset.Columns = parser.Columns; … … 112 112 TrySetVariable("TargetVariable", parser.TargetVariable); 113 113 114 IVariable var = StructIdProblemInjector.GetVariable("AllowedFeatures");114 IVariable var = ProblemInjector.GetVariable("AllowedFeatures"); 115 115 if (var != null) { 116 116 ItemList<IntData> allowedFeatures = (ItemList<IntData>)var.Value; … … 127 127 128 128 private void TrySetVariable(string name, int value) { 129 IVariable var = StructIdProblemInjector.GetVariable(name);129 IVariable var = ProblemInjector.GetVariable(name); 130 130 if (var != null) { 131 131 ((IntData)var.Value).Data = value; -
branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/StandardGP.cs
r1251 r1252 90 90 91 91 protected internal override IOperator CreateProblemInjector() { 92 return new StructIdProblemInjector();92 return new ProblemInjector(); 93 93 } 94 94
Note: See TracChangeset
for help on using the changeset viewer.