Changeset 7127


Ignore:
Timestamp:
12/05/11 17:03:49 (8 years ago)
Author:
sforsten
Message:

#1669:
-Spatial co-evolution benchmark has been added
-Benchmarks of Trent McConaghy have been added
-2 Classification benchmarks have been added (Mammography and Iris dataset)
-Training and test set include now all samples from the dataset
-Load button and combo box are now disabled when the algorithm is running

Location:
branches/RegressionBenchmarks
Files:
58 added
2 deleted
51 edited

Legend:

Unmodified
Added
Removed
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/Benchmark.cs

    r7025 r7127  
    2020#endregion
    2121
     22using System.IO;
     23using System.Linq;
     24using System.Reflection;
    2225using HeuristicLab.Common;
    2326using HeuristicLab.Core;
     
    3336      throw new System.NotImplementedException();
    3437    }
     38
     39    #region Helpers
     40    protected static TableFileParser getParserForFile(string fileName) {
     41      Assembly assembly = Assembly.GetExecutingAssembly();
     42      string file = assembly.GetManifestResourceNames().Where(x => x.EndsWith(fileName)).First();
     43
     44      string path = Path.GetTempFileName();
     45
     46      using (Stream stream = assembly.GetManifestResourceStream(file)) {
     47        WriteStreamToTempFile(stream, path);
     48      }
     49
     50      TableFileParser csvFileParser = new TableFileParser();
     51      csvFileParser.Parse(path);
     52
     53      return csvFileParser;
     54    }
     55
     56    private static void WriteStreamToTempFile(Stream stream, string path) {
     57      using (FileStream output = new FileStream(path, FileMode.Create, FileAccess.Write)) {
     58        int cnt = 0;
     59        byte[] buffer = new byte[32 * 1024];
     60        while ((cnt = stream.Read(buffer, 0, buffer.Length)) != 0)
     61          output.Write(buffer, 0, cnt);
     62      }
     63    }
     64    #endregion
    3565  }
    3666}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/HeuristicLab.Problems.DataAnalysis.Benchmarks-3.4.csproj

    r7096 r7127  
    4949  <ItemGroup>
    5050    <Compile Include="Benchmark.cs" />
    51     <Compile Include="Generator\RegressionRealWorldBenchmark.cs" />
    52     <Compile Include="Generator\RegressionToyBenchmark.cs" />
     51    <Compile Include="ClassificationBenchmark\RealWorldProblems\Iris.cs" />
     52    <Compile Include="ClassificationBenchmark\RealWorldProblems\Mammography.cs" />
     53    <Compile Include="RegressionBenchmarks\Other\BreimanOne.cs" />
     54    <Compile Include="ClassificationGenerator\ClassificationBenchmark.cs" />
     55    <Compile Include="ClassificationGenerator\ClassificationRealWorldBenchmark.cs" />
     56    <Compile Include="ClassificationGenerator\ClassificationToyBenchmark.cs" />
     57    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighVoltrefPWR.cs" />
     58    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighVoltrefDVREF.cs" />
     59    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighSenseampPwr.cs" />
     60    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighSenseampDelay.cs" />
     61    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighOpampSR.cs" />
     62    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighOpampPM.cs" />
     63    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighOpampBW.cs" />
     64    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighOpampAV.cs" />
     65    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighGmcIL.cs" />
     66    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighGmcATTEN.cs" />
     67    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighComparBw.cs" />
     68    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighBitcellCellI.cs" />
     69    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumSrp.cs" />
     70    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumSrn.cs" />
     71    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumPm.cs" />
     72    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumOffsetn.cs" />
     73    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumLogfu.cs" />
     74    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumLfgain.cs" />
     75    <Compile Include="RegressionGenerator\RegressionRealWorldBenchmark.cs" />
     76    <Compile Include="RegressionGenerator\RegressionToyBenchmark.cs" />
    5377    <Compile Include="Plugin.cs" />
    5478    <Compile Include="Properties\AssemblyInfo.cs" />
     
    158182      <SubType>Code</SubType>
    159183    </Compile>
    160     <Compile Include="RegressionBenchmarks\Poli\PloyTen.cs" />
     184    <Compile Include="RegressionBenchmarks\Other\SpatialCoevolution.cs" />
     185    <Compile Include="RegressionBenchmarks\Other\PloyTen.cs" />
    161186    <Compile Include="RegressionBenchmarks\RealWorldProblems\ChemicalOne.cs" />
    162187    <Compile Include="RegressionBenchmarks\RealWorldProblems\Housing.cs" />
    163188    <Compile Include="RegressionBenchmarks\RealWorldProblems\TowerProblem.cs" />
    164     <Compile Include="Generator\RegressionBenchmark.cs" />
     189    <Compile Include="RegressionGenerator\RegressionBenchmark.cs" />
    165190    <Compile Include="RegressionBenchmarks\Vladislavleva\KotanchekFunction.cs">
    166191      <SubType>Code</SubType>
     
    223248  </ItemGroup>
    224249  <ItemGroup>
     250    <EmbeddedResource Include="ClassificationBenchmark\RealWorldProblems\files\iris.data" />
     251    <EmbeddedResource Include="ClassificationBenchmark\RealWorldProblems\files\mammography.csv" />
    225252    <None Include="HeuristicLab.snk" />
    226253    <None Include="Plugin.cs.frame" />
     
    228255    <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\chemical-I.csv" />
    229256    <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\housing.csv" />
    230   </ItemGroup>
    231   <ItemGroup />
     257    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\bitcell_cell_i.csv" />
     258    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\compar_bw.csv" />
     259    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\opamp_AV.csv" />
     260    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\opamp_BW.csv" />
     261    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\opamp_PM.csv" />
     262    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\opamp_SR.csv" />
     263    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\senseamp_delay.csv" />
     264    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\senseamp_pwr.csv" />
     265    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\voltref_DVREF.csv" />
     266    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\voltref_PWR.csv" />
     267    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\gmc_ATTEN.csv" />
     268    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\gmc_IL.csv" />
     269  </ItemGroup>
     270  <ItemGroup>
     271    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\lfgain.txt" />
     272    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\logfu.txt" />
     273    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\offsetn.txt" />
     274    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\pm.txt" />
     275    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\srn.txt" />
     276    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\srp.txt" />
     277  </ItemGroup>
    232278  <ItemGroup>
    233279    <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\towerData.txt" />
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionEight.cs

    r7096 r7127  
    3939      inputVariables = new List<string>() { "X" };
    4040      trainingPartition = new IntRange(0, 101);
    41       testPartition = new IntRange(102, 1103);
     41      testPartition = new IntRange(101, 1103);
    4242    }
    4343
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionFifteen.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 20);
    40       testPartition = new IntRange(21, 621);
     40      testPartition = new IntRange(20, 621);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionFour.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 21);
    40       testPartition = new IntRange(22, 2022);
     40      testPartition = new IntRange(21, 2022);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSeven.cs

    r7044 r7127  
    3939      inputVariables = new List<string>() { "X" };
    4040      trainingPartition = new IntRange(0, 50);
    41       testPartition = new IntRange(51, 170);
     41      testPartition = new IntRange(50, 170);
    4242    }
    4343
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSix.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X", "Y", "Z" };
    3939      trainingPartition = new IntRange(0, 1000);
    40       testPartition = new IntRange(1001, 11000);
     40      testPartition = new IntRange(1000, 11000);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSixteen.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 20);
    40       testPartition = new IntRange(21, 621);
     40      testPartition = new IntRange(20, 621);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionThirteen.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 20);
    40       testPartition = new IntRange(21, 621);
     40      testPartition = new IntRange(20, 621);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionTwelve.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 20);
    40       testPartition = new IntRange(21, 621);
     40      testPartition = new IntRange(20, 621);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionEight.cs

    r7095 r7127  
    4444      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4545      trainingPartition = new IntRange(0, 5000);
    46       testPartition = new IntRange(5001, 10000);
     46      testPartition = new IntRange(5000, 10000);
    4747    }
    4848
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionEleven.cs

    r7095 r7127  
    4343      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4444      trainingPartition = new IntRange(0, 5000);
    45       testPartition = new IntRange(5001, 10000);
     45      testPartition = new IntRange(5000, 10000);
    4646    }
    4747
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFive.cs

    r7095 r7127  
    4444      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4545      trainingPartition = new IntRange(0, 5000);
    46       testPartition = new IntRange(5001, 10000);
     46      testPartition = new IntRange(5000, 10000);
    4747    }
    4848
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFiveteen.cs

    r7095 r7127  
    4444      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4545      trainingPartition = new IntRange(0, 5000);
    46       testPartition = new IntRange(5001, 10000);
     46      testPartition = new IntRange(5000, 10000);
    4747    }
    4848
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFour.cs

    r7095 r7127  
    4343      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4444      trainingPartition = new IntRange(0, 5000);
    45       testPartition = new IntRange(5001, 10000);
     45      testPartition = new IntRange(5000, 10000);
    4646    }
    4747
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFourteen.cs

    r7095 r7127  
    4343      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4444      trainingPartition = new IntRange(0, 5000);
    45       testPartition = new IntRange(5001, 10000);
     45      testPartition = new IntRange(5000, 10000);
    4646    }
    4747
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionNine.cs

    r7095 r7127  
    4444      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4545      trainingPartition = new IntRange(0, 5000);
    46       testPartition = new IntRange(5001, 10000);
     46      testPartition = new IntRange(5000, 10000);
    4747    }
    4848
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionOne.cs

    r7095 r7127  
    4343      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4444      trainingPartition = new IntRange(0, 5000);
    45       testPartition = new IntRange(5001, 10000);
     45      testPartition = new IntRange(5000, 10000);
    4646    }
    4747
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionSeven.cs

    r7095 r7127  
    4343      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4444      trainingPartition = new IntRange(0, 5000);
    45       testPartition = new IntRange(5001, 10000);
     45      testPartition = new IntRange(5000, 10000);
    4646    }
    4747
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionSix.cs

    r7095 r7127  
    4444      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4545      trainingPartition = new IntRange(0, 5000);
    46       testPartition = new IntRange(5001, 10000);
     46      testPartition = new IntRange(5000, 10000);
    4747    }
    4848
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionTen.cs

    r7095 r7127  
    4343      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4444      trainingPartition = new IntRange(0, 5000);
    45       testPartition = new IntRange(5001, 10000);
     45      testPartition = new IntRange(5000, 10000);
    4646    }
    4747
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionThirteen.cs

    r7095 r7127  
    4343      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4444      trainingPartition = new IntRange(0, 5000);
    45       testPartition = new IntRange(5001, 10000);
     45      testPartition = new IntRange(5000, 10000);
    4646    }
    4747
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionThree.cs

    r7095 r7127  
    4343      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4444      trainingPartition = new IntRange(0, 5000);
    45       testPartition = new IntRange(5001, 10000);
     45      testPartition = new IntRange(5000, 10000);
    4646    }
    4747
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionTwelve.cs

    r7095 r7127  
    4343      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4444      trainingPartition = new IntRange(0, 5000);
    45       testPartition = new IntRange(5001, 10000);
     45      testPartition = new IntRange(5000, 10000);
    4646    }
    4747
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionTwo.cs

    r7095 r7127  
    4343      inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
    4444      trainingPartition = new IntRange(0, 5000);
    45       testPartition = new IntRange(5001, 10000);
     45      testPartition = new IntRange(5000, 10000);
    4646    }
    4747
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionEight.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionEleven.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionFive.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionFour.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionNine.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionOne.cs

    r7096 r7127  
    3838      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionSeven.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionSix.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionTen.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionThree.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionTwelve.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionTwo.cs

    r7044 r7127  
    3838      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 250);
    40       testPartition = new IntRange(251, 500);
     40      testPartition = new IntRange(250, 500);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RealWorldProblems/ChemicalOne.cs

    r7085 r7127  
    4141
    4242    protected override List<IList> GetData() {
    43       csvFileParser = RegressionRealWorldBenchmark.getParserForFile(fileName);
     43      csvFileParser = Benchmark.getParserForFile(fileName);
    4444
    4545      targetVariable = csvFileParser.VariableNames.Last();
     
    4747      int trainingPartEnd = csvFileParser.Rows * 2 / 3;
    4848      trainingPartition = new IntRange(0, trainingPartEnd);
    49       testPartition = new IntRange(trainingPartEnd + 1, csvFileParser.Rows);
     49      testPartition = new IntRange(trainingPartEnd, csvFileParser.Rows);
    5050
    5151      return csvFileParser.Values.Skip(csvFileParser.Columns - 1).Union(csvFileParser.Values.Take(csvFileParser.Columns - 1)).ToList();
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RealWorldProblems/Housing.cs

    r7085 r7127  
    4141
    4242    protected override List<IList> GetData() {
    43       csvFileParser = RegressionRealWorldBenchmark.getParserForFile(fileName);
     43      csvFileParser = Benchmark.getParserForFile(fileName);
    4444
    4545      targetVariable = csvFileParser.VariableNames.Last();
     
    4747      int trainingPartEnd = csvFileParser.Rows * 2 / 3;
    4848      trainingPartition = new IntRange(0, trainingPartEnd);
    49       testPartition = new IntRange(trainingPartEnd + 1, csvFileParser.Rows);
     49      testPartition = new IntRange(trainingPartEnd, csvFileParser.Rows);
    5050
    5151      return csvFileParser.Values.Skip(csvFileParser.Columns - 1).Union(csvFileParser.Values.Take(csvFileParser.Columns - 1)).ToList();
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RealWorldProblems/TowerProblem.cs

    r7085 r7127  
    4141
    4242    protected override List<IList> GetData() {
    43       csvFileParser = RegressionRealWorldBenchmark.getParserForFile(fileName);
     43      csvFileParser = Benchmark.getParserForFile(fileName);
    4444
    4545      targetVariable = csvFileParser.VariableNames.Last();
     
    4747      int trainingPartEnd = csvFileParser.Rows * 2 / 3;
    4848      trainingPartition = new IntRange(0, trainingPartEnd);
    49       testPartition = new IntRange(trainingPartEnd + 1, csvFileParser.Rows);
     49      testPartition = new IntRange(trainingPartEnd, csvFileParser.Rows);
    5050
    5151      return csvFileParser.Values.Skip(csvFileParser.Columns - 1).Union(csvFileParser.Values.Take(csvFileParser.Columns - 1)).ToList();
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/KotanchekFunction.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X1", "X2" };
    3939      trainingPartition = new IntRange(0, 100);
    40       testPartition = new IntRange(101, 2125);
     40      testPartition = new IntRange(100, 2125);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RationalPolynomialThreeDimensional.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X1", "X2", "X3" };
    3939      trainingPartition = new IntRange(0, 300);
    40       testPartition = new IntRange(301, 3000);
     40      testPartition = new IntRange(300, 3000);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RationalPolynomialTwoDimensional.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X1", "X2" };
    3939      trainingPartition = new IntRange(0, 50);
    40       testPartition = new IntRange(51, 1207);
     40      testPartition = new IntRange(50, 1207);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RippleFunction.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X1", "X2" };
    3939      trainingPartition = new IntRange(0, 300);
    40       testPartition = new IntRange(301, 1300);
     40      testPartition = new IntRange(300, 1300);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SalutowiczFunctionOneDimensional.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 100);
    40       testPartition = new IntRange(101, 321);
     40      testPartition = new IntRange(100, 321);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SalutowiczFunctionTwoDimensional.cs

    r7085 r7127  
    3939      inputVariables = new List<string>() { "X1", "X2" };
    4040      trainingPartition = new IntRange(0, 601);
    41       testPartition = new IntRange(602, 3155);
     41      testPartition = new IntRange(601, 3155);
    4242    }
    4343
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SineCosineFunction.cs

    r7085 r7127  
    3838      inputVariables = new List<string>() { "X1", "X2" };
    3939      trainingPartition = new IntRange(0, 30);
    40       testPartition = new IntRange(31, 991);
     40      testPartition = new IntRange(30, 991);
    4141    }
    4242
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/UnwrappedBallFunctionFiveDimensional.cs

    r7085 r7127  
    3939      inputVariables = new List<string>() { "X1", "X2", "X3", "X4", "X5" };
    4040      trainingPartition = new IntRange(0, 1024);
    41       testPartition = new IntRange(1025, 6024);
     41      testPartition = new IntRange(1024, 6024);
    4242    }
    4343
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.Designer.cs

    r7085 r7127  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.importButton = new System.Windows.Forms.Button();
     47      this.ImportButton = new System.Windows.Forms.Button();
    4848      this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
    49       this.benchmarkComboBox = new System.Windows.Forms.ComboBox();
    50       this.loadButton = new System.Windows.Forms.Button();
    51       this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
     49      this.BenchmarkComboBox = new System.Windows.Forms.ComboBox();
     50      this.LoadButton = new System.Windows.Forms.Button();
     51      this.BenchmarkTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
    5252      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    53       this.tableLayoutPanel1.SuspendLayout();
     53      this.BenchmarkTableLayoutPanel.SuspendLayout();
    5454      this.SuspendLayout();
    5555      //
     
    7070      this.infoLabel.Location = new System.Drawing.Point(474, 3);
    7171      //
    72       // importButton
     72      // ImportButton
    7373      //
    74       this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     74      this.ImportButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    7575            | System.Windows.Forms.AnchorStyles.Right)));
    76       this.importButton.Location = new System.Drawing.Point(3, 24);
    77       this.importButton.Name = "importButton";
    78       this.importButton.Size = new System.Drawing.Size(487, 23);
    79       this.importButton.TabIndex = 3;
    80       this.importButton.Text = "Import from CSV file";
    81       this.importButton.UseVisualStyleBackColor = true;
    82       this.importButton.Click += new System.EventHandler(this.ImportButton_Click);
     76      this.ImportButton.Location = new System.Drawing.Point(3, 24);
     77      this.ImportButton.Name = "ImportButton";
     78      this.ImportButton.Size = new System.Drawing.Size(487, 23);
     79      this.ImportButton.TabIndex = 3;
     80      this.ImportButton.Text = "Import from CSV file";
     81      this.ImportButton.UseVisualStyleBackColor = true;
     82      this.ImportButton.Click += new System.EventHandler(this.ImportButton_Click);
    8383      //
    8484      // openFileDialog
     
    8787      this.openFileDialog.Title = "Import data...";
    8888      //
    89       // benchmarkComboBox
     89      // BenchmarkComboBox
    9090      //
    91       this.benchmarkComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     91      this.BenchmarkComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    9292            | System.Windows.Forms.AnchorStyles.Right)));
    93       this.benchmarkComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    94       this.benchmarkComboBox.FormattingEnabled = true;
    95       this.benchmarkComboBox.Location = new System.Drawing.Point(3, 3);
    96       this.benchmarkComboBox.Name = "benchmarkComboBox";
    97       this.benchmarkComboBox.Size = new System.Drawing.Size(240, 21);
    98       this.benchmarkComboBox.TabIndex = 5;
     93      this.BenchmarkComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     94      this.BenchmarkComboBox.FormattingEnabled = true;
     95      this.BenchmarkComboBox.Location = new System.Drawing.Point(3, 3);
     96      this.BenchmarkComboBox.Name = "BenchmarkComboBox";
     97      this.BenchmarkComboBox.Size = new System.Drawing.Size(240, 21);
     98      this.BenchmarkComboBox.TabIndex = 5;
    9999      //
    100       // loadButton
     100      // LoadButton
    101101      //
    102       this.loadButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     102      this.LoadButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    103103            | System.Windows.Forms.AnchorStyles.Right)));
    104       this.loadButton.Location = new System.Drawing.Point(249, 2);
    105       this.loadButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 3);
    106       this.loadButton.Name = "loadButton";
    107       this.loadButton.Size = new System.Drawing.Size(241, 23);
    108       this.loadButton.TabIndex = 6;
    109       this.loadButton.Text = "Load";
    110       this.loadButton.UseVisualStyleBackColor = true;
    111       this.loadButton.Click += new System.EventHandler(this.loadButton_Click);
     104      this.LoadButton.Location = new System.Drawing.Point(249, 2);
     105      this.LoadButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 3);
     106      this.LoadButton.Name = "LoadButton";
     107      this.LoadButton.Size = new System.Drawing.Size(241, 23);
     108      this.LoadButton.TabIndex = 6;
     109      this.LoadButton.Text = "Load";
     110      this.LoadButton.UseVisualStyleBackColor = true;
     111      this.LoadButton.Click += new System.EventHandler(this.loadButton_Click);
    112112      //
    113       // tableLayoutPanel1
     113      // BenchmarkTableLayoutPanel
    114114      //
    115       this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     115      this.BenchmarkTableLayoutPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    116116            | System.Windows.Forms.AnchorStyles.Right)));
    117       this.tableLayoutPanel1.ColumnCount = 2;
    118       this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
    119       this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
    120       this.tableLayoutPanel1.Controls.Add(this.benchmarkComboBox, 0, 0);
    121       this.tableLayoutPanel1.Controls.Add(this.loadButton, 1, 0);
    122       this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 51);
    123       this.tableLayoutPanel1.Name = "tableLayoutPanel1";
    124       this.tableLayoutPanel1.RowCount = 1;
    125       this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
    126       this.tableLayoutPanel1.Size = new System.Drawing.Size(493, 28);
    127       this.tableLayoutPanel1.TabIndex = 7;
     117      this.BenchmarkTableLayoutPanel.ColumnCount = 2;
     118      this.BenchmarkTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
     119      this.BenchmarkTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
     120      this.BenchmarkTableLayoutPanel.Controls.Add(this.BenchmarkComboBox, 0, 0);
     121      this.BenchmarkTableLayoutPanel.Controls.Add(this.LoadButton, 1, 0);
     122      this.BenchmarkTableLayoutPanel.Location = new System.Drawing.Point(0, 51);
     123      this.BenchmarkTableLayoutPanel.Name = "BenchmarkTableLayoutPanel";
     124      this.BenchmarkTableLayoutPanel.RowCount = 1;
     125      this.BenchmarkTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
     126      this.BenchmarkTableLayoutPanel.Size = new System.Drawing.Size(493, 28);
     127      this.BenchmarkTableLayoutPanel.TabIndex = 7;
    128128      //
    129129      // DataAnalysisProblemView
     
    131131      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    132132      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    133       this.Controls.Add(this.importButton);
    134       this.Controls.Add(this.tableLayoutPanel1);
     133      this.Controls.Add(this.ImportButton);
     134      this.Controls.Add(this.BenchmarkTableLayoutPanel);
    135135      this.Name = "DataAnalysisProblemView";
    136136      this.Size = new System.Drawing.Size(493, 334);
    137       this.Controls.SetChildIndex(this.tableLayoutPanel1, 0);
    138       this.Controls.SetChildIndex(this.importButton, 0);
     137      this.Controls.SetChildIndex(this.BenchmarkTableLayoutPanel, 0);
     138      this.Controls.SetChildIndex(this.ImportButton, 0);
    139139      this.Controls.SetChildIndex(this.parameterCollectionView, 0);
    140140      this.Controls.SetChildIndex(this.infoLabel, 0);
     
    142142      this.Controls.SetChildIndex(this.nameLabel, 0);
    143143      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    144       this.tableLayoutPanel1.ResumeLayout(false);
     144      this.BenchmarkTableLayoutPanel.ResumeLayout(false);
    145145      this.ResumeLayout(false);
    146146      this.PerformLayout();
     
    150150    #endregion
    151151
    152     private System.Windows.Forms.Button importButton;
     152    private System.Windows.Forms.Button ImportButton;
    153153    private System.Windows.Forms.OpenFileDialog openFileDialog;
    154     private System.Windows.Forms.ComboBox benchmarkComboBox;
    155     private System.Windows.Forms.Button loadButton;
    156     private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
     154    private System.Windows.Forms.ComboBox BenchmarkComboBox;
     155    private System.Windows.Forms.Button LoadButton;
     156    private System.Windows.Forms.TableLayoutPanel BenchmarkTableLayoutPanel;
    157157  }
    158158}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.cs

    r7085 r7127  
    4444    protected override void SetEnabledStateOfControls() {
    4545      base.SetEnabledStateOfControls();
    46       importButton.Enabled = !Locked && !ReadOnly && Content != null;
     46      ImportButton.Enabled = !Locked && !ReadOnly && Content != null;
     47      LoadButton.Enabled = !Locked && !ReadOnly && Content != null;
     48      BenchmarkComboBox.Enabled = !Locked && !ReadOnly && Content != null;
    4749    }
    4850
     
    5961
    6062    private void loadButton_Click(object sender, EventArgs e) {
    61       if (benchmarkComboBox.SelectedItem != null)
    62         Content.ProblemData = ((IDataAnalysisBenchmarkProblemDataGenerator)benchmarkComboBox.SelectedItem).GenerateProblemData();
     63      if (BenchmarkComboBox.SelectedItem != null)
     64        Content.ProblemData = ((IDataAnalysisBenchmarkProblemDataGenerator)BenchmarkComboBox.SelectedItem).GenerateProblemData();
    6365    }
    6466
    6567    protected override void OnContentChanged() {
    6668      base.OnContentChanged();
    67       benchmarkComboBox.Items.Clear();
    68       benchmarkComboBox.Items.AddRange(GetBenchmarkProblemDataGenerators().OrderBy(b => b.Name, new NaturalStringComparer()).ToArray());
    69       if (benchmarkComboBox.Items.Count > 0)
    70         benchmarkComboBox.SelectedIndex = 0;
     69      BenchmarkComboBox.Items.Clear();
     70      BenchmarkComboBox.Items.AddRange(GetBenchmarkProblemDataGenerators().OrderBy(b => b.Name, new NaturalStringComparer()).ToArray());
     71      if (BenchmarkComboBox.Items.Count > 0)
     72        BenchmarkComboBox.SelectedIndex = 0;
    7173    }
    7274
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.resx

    r7085 r7127  
    121121    <value>107, 17</value>
    122122  </metadata>
    123   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    124     <value>107, 17</value>
    125   </metadata>
    126123  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    127124    <value>17, 17</value>
Note: See TracChangeset for help on using the changeset viewer.