Changeset 5623 for branches/DataAnalysis Refactoring
- Timestamp:
- 03/07/11 18:07:25 (13 years ago)
- Location:
- branches/DataAnalysis Refactoring
- Files:
-
- 2 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs
r5618 r5623 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using HeuristicLab.Data; 24 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 25 using HeuristicLab.Data;26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification { … … 39 39 public SymbolicClassificationMultiObjectiveProblem() 40 40 : base(new ClassificationProblemData(), new SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator(), new SymbolicDataAnalysisExpressionTreeCreator()) { 41 41 Maximization = new BoolArray(new bool[] { false, false }); 42 42 MaximumSymbolicExpressionTreeDepth.Value = 8; 43 43 MaximumSymbolicExpressionTreeLength.Value = 25; … … 53 53 } 54 54 } 55 56 public override void ImportProblemDataFromFile(string fileName) { 57 ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName); 58 ProblemData = problemData; 59 } 55 60 } 56 61 } -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs
r5618 r5623 51 51 } 52 52 } 53 54 public override void ImportProblemDataFromFile(string fileName) { 55 ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName); 56 ProblemData = problemData; 57 } 53 58 } 54 59 } -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs
r5618 r5623 54 54 } 55 55 } 56 57 public override void ImportProblemDataFromFile(string fileName) { 58 RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName); 59 ProblemData = problemData; 60 } 56 61 } 57 62 } -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs
r5618 r5623 53 53 } 54 54 } 55 56 public override void ImportProblemDataFromFile(string fileName) { 57 RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName); 58 ProblemData = problemData; 59 } 55 60 } 56 61 } -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs
r5618 r5623 270 270 } 271 271 } 272 273 public abstract void ImportProblemDataFromFile(string fileName); 272 274 } 273 275 } -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj
r5600 r5623 113 113 <None Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame" /> 114 114 <None Include="Properties\AssemblyInfo.frame" /> 115 <Compile Include="DataAnalysisProblemView.cs"> 116 <SubType>UserControl</SubType> 117 </Compile> 118 <Compile Include="DataAnalysisProblemView.Designer.cs"> 119 <DependentUpon>DataAnalysisProblemView.cs</DependentUpon> 120 </Compile> 115 121 <Compile Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs" /> 116 122 <Compile Include="Properties\AssemblyInfo.cs" /> … … 156 162 <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project> 157 163 <Name>HeuristicLab.MainForm-3.3</Name> 164 </ProjectReference> 165 <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj"> 166 <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project> 167 <Name>HeuristicLab.Optimization.Views-3.3</Name> 168 </ProjectReference> 169 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> 170 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project> 171 <Name>HeuristicLab.Optimization-3.3</Name> 158 172 </ProjectReference> 159 173 <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj"> -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame
r5600 r5623 37 37 [PluginDependency("HeuristicLab.MainForm", "3.3.3.0")] 38 38 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3.3.0")] 39 [PluginDependency("HeuristicLab.Optimization","3.3.3.0")] 40 [PluginDependency("HeuristicLab.Optimization.Views","3.3.3.0")] 39 41 [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4.0.0")] 40 42 [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")] -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/ClassificationProblem.cs
r5579 r5623 38 38 ProblemData = new ClassificationProblemData(); 39 39 } 40 41 public override void ImportProblemDataFromFile(string fileName) { 42 ClassificationProblemData problemData = ClassificationProblemData.ImportFromFile(fileName); 43 ProblemData = problemData; 44 } 40 45 } 41 46 } -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/DataAnalysisProblem.cs
r5601 r5623 74 74 if (handler != null) handler(this, EventArgs.Empty); 75 75 } 76 77 public abstract void ImportProblemDataFromFile(string fileName); 76 78 } 77 79 } -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblem.cs
r5618 r5623 27 27 IParameter ProblemDataParameter { get; } 28 28 IDataAnalysisProblemData ProblemData { get; } 29 30 void ImportProblemDataFromFile(string fileName); 29 31 } 30 32 -
branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/RegressionProblem.cs
r5579 r5623 38 38 ProblemData = new RegressionProblemData(); 39 39 } 40 41 public override void ImportProblemDataFromFile(string fileName) { 42 RegressionProblemData problemData = RegressionProblemData.ImportFromFile(fileName); 43 ProblemData = problemData; 44 } 40 45 } 41 46 }
Note: See TracChangeset
for help on using the changeset viewer.