Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/27/12 10:05:59 (13 years ago)
Author:
sforsten
Message:

#1784:

  • added Keijzer, Korns, Vladislavleva und Nguyen regression problem instances
  • changes have been made in the ProblemView. Some parts have been replaced with views from Problems.Instances.Views
Location:
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4
Files:
48 added
10 edited

Legend:

Unmodified
Added
Removed

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ArtificialRegressionDataDescriptor.cs

    r7603 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ArtificialRegressionInstanceProvider.cs

    r7603 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/HeuristicLab.Problems.Instances.Regression-3.4.csproj

    r7610 r7664  
    3838  </PropertyGroup>
    3939  <ItemGroup>
    40     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    41     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    42     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    43     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    44     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     40    <Reference Include="HeuristicLab.Common-3.3">
     41      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     42    </Reference>
     43    <Reference Include="HeuristicLab.Core-3.3">
     44      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     45    </Reference>
     46    <Reference Include="HeuristicLab.Optimization-3.3">
     47      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     48    </Reference>
     49    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     50      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     51    </Reference>
     52    <Reference Include="HeuristicLab.Random-3.3">
     53      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
     54    </Reference>
    4555    <Reference Include="System" />
    4656    <Reference Include="System.Core" />
    … …  
    5262  </ItemGroup>
    5363  <ItemGroup>
     64    <Compile Include="Keijzer\KeijzerFunctionTwelve.cs" />
     65    <Compile Include="Keijzer\KeijzerFunctionThirteen.cs" />
     66    <Compile Include="Keijzer\KeijzerFunctionSixteen.cs" />
     67    <Compile Include="Keijzer\KeijzerFunctionSix.cs" />
     68    <Compile Include="Keijzer\KeijzerFunctionSeven.cs" />
     69    <Compile Include="Keijzer\KeijzerFunctionFour.cs" />
     70    <Compile Include="Keijzer\KeijzerFunctionFifteen.cs" />
    5471    <Compile Include="Keijzer\KeijzerFunctionEight.cs" />
     72    <Compile Include="Korns\KornsFunctionTwo.cs" />
     73    <Compile Include="Korns\KornsFunctionTwelve.cs" />
     74    <Compile Include="Korns\KornsFunctionThree.cs" />
     75    <Compile Include="Korns\KornsFunctionThirteen.cs" />
     76    <Compile Include="Korns\KornsFunctionTen.cs" />
     77    <Compile Include="Korns\KornsFunctionSix.cs" />
     78    <Compile Include="Korns\KornsFunctionSeven.cs" />
     79    <Compile Include="Korns\KornsFunctionOne.cs" />
     80    <Compile Include="Korns\KornsFunctionNine.cs" />
     81    <Compile Include="Korns\KornsFunctionFourteen.cs" />
     82    <Compile Include="Korns\KornsFunctionFour.cs" />
     83    <Compile Include="Korns\KornsFunctionFiveteen.cs" />
     84    <Compile Include="Korns\KornsFunctionFive.cs" />
     85    <Compile Include="Korns\KornsFunctionEleven.cs" />
     86    <Compile Include="Korns\KornsFunctionEight.cs" />
     87    <Compile Include="Korns\KornsInstanceProvider.cs" />
     88    <Compile Include="Nguyen\NguyenFunctionTwo.cs" />
     89    <Compile Include="Nguyen\NguyenFunctionTwelve.cs" />
     90    <Compile Include="Nguyen\NguyenFunctionThree.cs" />
     91    <Compile Include="Nguyen\NguyenFunctionTen.cs" />
     92    <Compile Include="Nguyen\NguyenFunctionSix.cs" />
     93    <Compile Include="Nguyen\NguyenFunctionSeven.cs" />
     94    <Compile Include="Nguyen\NguyenFunctionOne.cs" />
     95    <Compile Include="Nguyen\NguyenFunctionNine.cs" />
     96    <Compile Include="Nguyen\NguyenFunctionFour.cs" />
     97    <Compile Include="Nguyen\NguyenFunctionFive.cs" />
     98    <Compile Include="Nguyen\NguyenFunctionEleven.cs" />
     99    <Compile Include="Nguyen\NguyenFunctionEight.cs" />
     100    <Compile Include="Nguyen\NguyenInstanceProvider.cs" />
    55101    <Compile Include="Plugin.cs" />
    56102    <Compile Include="ResourceRegressionInstanceProvider.cs" />
    … …  
    62108    <Compile Include="RegressionInstanceProvider.cs" />
    63109    <Compile Include="ValueGenerator.cs" />
     110    <Compile Include="Vladislavleva\UnwrappedBallFunctionFiveDimensional.cs" />
     111    <Compile Include="Vladislavleva\SineCosineFunction.cs" />
     112    <Compile Include="Vladislavleva\SalutowiczFunctionTwoDimensional.cs" />
     113    <Compile Include="Vladislavleva\SalutowiczFunctionOneDimensional.cs" />
     114    <Compile Include="Vladislavleva\RippleFunction.cs" />
     115    <Compile Include="Vladislavleva\RationalPolynomialTwoDimensional.cs" />
     116    <Compile Include="Vladislavleva\RationalPolynomialThreeDimensional.cs" />
     117    <Compile Include="Vladislavleva\KotanchekFunction.cs" />
     118    <Compile Include="Vladislavleva\VladislavlevaInstanceProvider.cs" />
    64119  </ItemGroup>
    65120  <ItemGroup>

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionEight.cs

    r7603 r7664  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerInstanceProvider.cs

    r7610 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424
    2525namespace HeuristicLab.Problems.Instances.Regression {
    26   public class KeijzerInstanceProvider : ArtificialRegressionInstanceProvider, IProblemInstanceProvider<RegressionData> {
     26  public class KeijzerInstanceProvider : ArtificialRegressionInstanceProvider {
    2727    public override string Name {
    2828      get { return "Keijzer Benchmark Problems"; }
    … …  
    4040    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    4141      List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
     42      descriptorList.Add(new KeijzerFunctionFour());
     43      descriptorList.Add(new KeijzerFunctionSix());
     44      descriptorList.Add(new KeijzerFunctionSeven());
    4245      descriptorList.Add(new KeijzerFunctionEight());
     46      descriptorList.Add(new KeijzerFunctionTwelve());
     47      descriptorList.Add(new KeijzerFunctionThirteen());
     48      descriptorList.Add(new KeijzerFunctionFifteen());
     49      descriptorList.Add(new KeijzerFunctionSixteen());
    4350      return descriptorList;
    4451    }
    45 
    46     /*#region delete after test
    47     public RegressionData LoadData(IDataDescriptor descriptor) {
    48       throw new NotImplementedException();
    49     }
    50 
    51     public RegressionData LoadData(string path) {
    52       TableFileParser csvFileParser = new TableFileParser();
    53       csvFileParser.Parse(path);
    54 
    55       RegressionData regData = new RegressionData();
    56       regData.Name = path;
    57       regData.InputVariables = new List<string>(csvFileParser.VariableNames);
    58       regData.TargetVariable = csvFileParser.VariableNames.Last();
    59       //convert to multidimensional array
    60       double[][] values = csvFileParser.Values.Cast<double[]>().ToArray();
    61       regData.Values = new double[values.GetLength(0), values.GetLength(1)];
    62       for (int i = 0; i < values.GetLength(0); i++) {
    63         for (int j = 0; j < values.GetLength(1); j++) {
    64           regData.Values[i, j] = values[i][j];
    65         }
    66       }
    67 
    68       int trainingPartEnd = csvFileParser.Rows * 2 / 3;
    69       regData.TrainingPartitionStart = 0;
    70       regData.TrainingPartitionEnd = trainingPartEnd;
    71       regData.TestPartitionStart = trainingPartEnd;
    72       regData.TestPartitionEnd = csvFileParser.Rows;
    73       return regData;
    74     }
    75 
    76     public void SaveData(RegressionData instance, string path) {
    77       StringBuilder strBuilder = new StringBuilder();
    78 
    79       foreach (var variable in instance.InputVariables) {
    80         strBuilder.Append(variable + ";");
    81       }
    82       strBuilder.Remove(strBuilder.Length - 1, 1);
    83       strBuilder.AppendLine();
    84 
    85       double[,] values = instance.Values;
    86 
    87       for (int i = 0; i < values.GetLength(0); i++) {
    88         for (int j = 0; j < values.GetLength(1); j++) {
    89           strBuilder.Append(values[i, j] + ";");
    90         }
    91         strBuilder.Remove(strBuilder.Length - 1, 1);
    92         strBuilder.AppendLine();
    93       }
    94 
    95       using (StreamWriter writer = new StreamWriter(path)) {
    96         writer.Write(strBuilder);
    97       }
    98     }
    99     #endregion
    100 
    101     #region IProblemInstanceProvider<RegressionData> Members
    102 
    103     public IProblemInstanceConsumer<RegressionData> Consumer {
    104       get {
    105         return new RegressionProblem();
    106       }
    107       set {
    108         throw new NotImplementedException();
    109       }
    110     }
    111 
    112     #endregion       */
    11352  }
    11453}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Properties/AssemblyInfo.cs

    r7610 r7664  
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.4.0.0")]
    57 [assembly: AssemblyFileVersion("3.4.0.7603")]
     57[assembly: AssemblyFileVersion("3.4.0.7610")]

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/RegressionInstanceProvider.cs

    r7610 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionDataDescriptor.cs

    r7603 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionInstanceProvider.cs

    r7603 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ValueGenerator.cs

    r7610 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3030
    3131    public static double[,] Transformation(List<List<double>> data) {
     32      if (!data.All(x => x.Count.Equals(data.First().Count)))
     33        throw new ArgumentException("Can't create jagged array.");
    3234      double[,] values = new double[data.First().Count, data.Count];
    3335      for (int i = 0; i < values.GetLength(0); i++) {
Note: See TracChangeset for help on using the changeset viewer.