Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7603 for branches


Ignore:
Timestamp:
03/13/12 10:49:31 (13 years ago)
Author:
sforsten
Message:

#1784:

  • first implementation of regression problem instances with one instance to test
Location:
branches/ProblemInstancesRegressionAndClassification
Files:
29 added
12 edited

Legend:

Unmodified
Added
Removed

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab 3.3.sln

    r7572 r7603  
    1313EndProject
    1414Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances-3.3", "HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj", "{3540E29E-4793-49E7-8EE2-FEA7F61C3994}"
     15EndProject
     16Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Regression-3.4", "HeuristicLab.Problems.Instances.Regression\3.4\HeuristicLab.Problems.Instances.Regression-3.4.csproj", "{26BF13E1-C8B2-4ACE-862D-EBFD360116B3}"
     17EndProject
     18Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Regression.Views-3.4", "HeuristicLab.Problems.Instances.Regression.Views\3.4\HeuristicLab.Problems.Instances.Regression.Views-3.4.csproj", "{1CC61973-7706-42DC-8023-310F591AB02B}"
    1519EndProject
    1620Global
    … …  
    6064    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|x86.ActiveCfg = Release|x86
    6165    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|x86.Build.0 = Release|x86
     66    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     67    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
     68    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|x64.ActiveCfg = Debug|Any CPU
     69    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|x86.ActiveCfg = Debug|Any CPU
     70    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
     71    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|Any CPU.Build.0 = Release|Any CPU
     72    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|x64.ActiveCfg = Release|Any CPU
     73    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|x86.ActiveCfg = Release|Any CPU
     74    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     75    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|Any CPU.Build.0 = Debug|Any CPU
     76    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|x64.ActiveCfg = Debug|Any CPU
     77    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|x86.ActiveCfg = Debug|Any CPU
     78    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|Any CPU.ActiveCfg = Release|Any CPU
     79    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|Any CPU.Build.0 = Release|Any CPU
     80    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|x64.ActiveCfg = Release|Any CPU
     81    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|x86.ActiveCfg = Release|Any CPU
    6282  EndGlobalSection
    6383  GlobalSection(SolutionProperties) = preSolution

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.cs

    r7259 r7603  
    2929  [View("DataAnalysisProblem View")]
    3030  [Content(typeof(IDataAnalysisProblem), true)]
    31   public partial class DataAnalysisProblemView : ProblemView {
     31  public partial class DataAnalysisProblemView : HeuristicOptimizationProblemView {
    3232    public DataAnalysisProblemView() {
    3333      InitializeComponent();

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r7572 r7603  
    308308    <None Include="Plugin.cs.frame" />
    309309    <None Include="Properties\AssemblyInfo.cs.frame" />
    310     <Compile Include="DataAnalysisProblemView.cs">
    311       <SubType>UserControl</SubType>
    312     </Compile>
     310    <Compile Include="DataAnalysisProblemView.cs" />
    313311    <Compile Include="DataAnalysisProblemView.Designer.cs">
    314312      <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame

    r7294 r7603  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Views", "Provides views for base classes for data analysis tasks.", "3.4.2.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Views-3.4.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3031  [PluginDependency("HeuristicLab.Common", "3.3")]
    3132  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    … …  
    3940  [PluginDependency("HeuristicLab.Optimization.Views","3.3")]
    4041  [PluginDependency("HeuristicLab.Optimizer", "3.3")]
     42  [PluginDependency("HeuristicLab.Parameters.Views", "3.3")]
     43  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    4144  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4245  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r7572 r7603  
    206206    <Compile Include="Implementation\Regression\RegressionSolution.cs" />
    207207    <Compile Include="Plugin.cs" />
    208     <Compile Include="TableFileParser.cs" />
    209208    <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
    210209    <Compile Include="Implementation\Classification\ThresholdCalculators\NormalDistributionCutPointsThresholdCalculator.cs" />
    … …  
    234233    </BootstrapperPackage>
    235234  </ItemGroup>
    236   <ItemGroup />
     235  <ItemGroup>
     236    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     237      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     238      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     239    </ProjectReference>
     240  </ItemGroup>
    237241  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    238242  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r7266 r7603  
    2929using HeuristicLab.Parameters;
    3030using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Problems.Instances;
    3132
    3233namespace HeuristicLab.Problems.DataAnalysis {

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs

    r7259 r7603  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Problems.Instances;
    2728
    2829namespace HeuristicLab.Problems.DataAnalysis {

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

    r7259 r7603  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Problems.Instances;
    2526
    2627namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    4546      ProblemData = problemData;
    4647    }
     48
     49    public void Load(RegressionData data) {
     50      Name = data.Name;
     51      Description = data.Description;
     52      Dataset dataset = new Dataset(data.InputVariables, data.Values);
     53      ProblemData = new RegressionProblemData(dataset, data.AllowedInputVariables, data.TargetVariable);
     54      OnReset();
     55    }
    4756  }
    4857}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r7259 r7603  
    2929using HeuristicLab.Parameters;
    3030using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Problems.Instances;
    3132
    3233namespace HeuristicLab.Problems.DataAnalysis {

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionProblem.cs

    r7259 r7603  
    2020#endregion
    2121
     22using HeuristicLab.Problems.Instances;
    2223namespace HeuristicLab.Problems.DataAnalysis {
    23   public interface IRegressionProblem : IDataAnalysisProblem<IRegressionProblemData> {
     24  public interface IRegressionProblem : IDataAnalysisProblem<IRegressionProblemData>, IProblemInstanceConsumer<RegressionData> {
    2425  }
    2526}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Plugin.cs.frame

    r7259 r7603  
    3636  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3737  [PluginDependency("HeuristicLab.Persistence", "3.3")]
     38  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    3839  public class HeuristicLabProblemsDataAnalysisPlugin : PluginBase {
    3940  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

    r7572 r7603  
    114114    <None Include="Plugin.cs.frame" />
    115115    <Compile Include="IExportable.cs" />
     116    <Compile Include="TableFileParser.cs" />
    116117    <Compile Include="Types\ATSPData.cs" />
     118    <Compile Include="Types\RegressionData.cs" />
    117119    <Compile Include="Types\CTAPData.cs" />
    118120    <Compile Include="IDataDescriptor.cs" />
Note: See TracChangeset for help on using the changeset viewer.