Changeset 7127 for branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks

Timestamp:

12/05/11 17:03:49 (13 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/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4

Files:

• Benchmark.cs (modified) (2 diffs)
• ClassificationBenchmark (added)
• ClassificationBenchmark/RealWorldProblems (added)
• ClassificationBenchmark/RealWorldProblems/Iris.cs (added)
• ClassificationBenchmark/RealWorldProblems/Mammography.cs (added)
• ClassificationBenchmark/RealWorldProblems/files (added)
• ClassificationBenchmark/RealWorldProblems/files/iris.data (added)
• ClassificationBenchmark/RealWorldProblems/files/mammography.csv (added)
• ClassificationGenerator (added)
• ClassificationGenerator/ClassificationBenchmark.cs (added)
• ClassificationGenerator/ClassificationRealWorldBenchmark.cs (added)
• ClassificationGenerator/ClassificationToyBenchmark.cs (added)
• Generator (deleted)
• HeuristicLab.Problems.DataAnalysis.Benchmarks-3.4.csproj (modified) (4 diffs)
• RegressionBenchmarks/Keijzer/KeijzerFunctionEight.cs (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionFifteen.cs (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionFour.cs (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionSeven.cs (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionSix.cs (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionSixteen.cs (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionThirteen.cs (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionTwelve.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionEight.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionEleven.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionFive.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionFiveteen.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionFour.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionFourteen.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionNine.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionOne.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionSeven.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionSix.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionTen.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionThirteen.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionThree.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionTwelve.cs (modified) (1 diff)
• RegressionBenchmarks/Korns/KornFunctionTwo.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionEight.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionEleven.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionFive.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionFour.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionNine.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionOne.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionSeven.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionSix.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionTen.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionThree.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionTwelve.cs (modified) (1 diff)
• RegressionBenchmarks/Nguyen/NguyenFunctionTwo.cs (modified) (1 diff)
• RegressionBenchmarks/Other (added)
• RegressionBenchmarks/Other/BreimanOne.cs (added)
• RegressionBenchmarks/Other/PloyTen.cs (added)
• RegressionBenchmarks/Other/SpatialCoevolution.cs (added)
• RegressionBenchmarks/Poli (deleted)
• RegressionBenchmarks/RealWorldProblems/ChemicalOne.cs (modified) (2 diffs)
• RegressionBenchmarks/RealWorldProblems/Housing.cs (modified) (2 diffs)
• RegressionBenchmarks/RealWorldProblems/TowerProblem.cs (modified) (2 diffs)
• RegressionBenchmarks/Trent McConaghy (added)
• RegressionBenchmarks/Trent McConaghy/HighBitcellCellI.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighComparBw.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighGmcATTEN.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighGmcIL.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighOpampAV.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighOpampBW.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighOpampPM.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighOpampSR.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighSenseampDelay.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighSenseampPwr.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighVoltrefDVREF.cs (added)
• RegressionBenchmarks/Trent McConaghy/HighVoltrefPWR.cs (added)
• RegressionBenchmarks/Trent McConaghy/MediumLfgain.cs (added)
• RegressionBenchmarks/Trent McConaghy/MediumLogfu.cs (added)
• RegressionBenchmarks/Trent McConaghy/MediumOffsetn.cs (added)
• RegressionBenchmarks/Trent McConaghy/MediumPm.cs (added)
• RegressionBenchmarks/Trent McConaghy/MediumSrn.cs (added)
• RegressionBenchmarks/Trent McConaghy/MediumSrp.cs (added)
• RegressionBenchmarks/Trent McConaghy/high (added)
• RegressionBenchmarks/Trent McConaghy/high/bitcell_cell_i.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/compar_bw.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/gmc_ATTEN.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/gmc_IL.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/opamp_AV.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/opamp_BW.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/opamp_PM.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/opamp_SR.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/senseamp_delay.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/senseamp_pwr.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/voltref_DVREF.csv (added)
• RegressionBenchmarks/Trent McConaghy/high/voltref_PWR.csv (added)
• RegressionBenchmarks/Trent McConaghy/medium (added)
• RegressionBenchmarks/Trent McConaghy/medium/lfgain.txt (added)
• RegressionBenchmarks/Trent McConaghy/medium/logfu.txt (added)
• RegressionBenchmarks/Trent McConaghy/medium/offsetn.txt (added)
• RegressionBenchmarks/Trent McConaghy/medium/pm.txt (added)
• RegressionBenchmarks/Trent McConaghy/medium/srn.txt (added)
• RegressionBenchmarks/Trent McConaghy/medium/srp.txt (added)
• RegressionBenchmarks/Vladislavleva/KotanchekFunction.cs (modified) (1 diff)
• RegressionBenchmarks/Vladislavleva/RationalPolynomialThreeDimensional.cs (modified) (1 diff)
• RegressionBenchmarks/Vladislavleva/RationalPolynomialTwoDimensional.cs (modified) (1 diff)
• RegressionBenchmarks/Vladislavleva/RippleFunction.cs (modified) (1 diff)
• RegressionBenchmarks/Vladislavleva/SalutowiczFunctionOneDimensional.cs (modified) (1 diff)
• RegressionBenchmarks/Vladislavleva/SalutowiczFunctionTwoDimensional.cs (modified) (1 diff)
• RegressionBenchmarks/Vladislavleva/SineCosineFunction.cs (modified) (1 diff)
• RegressionBenchmarks/Vladislavleva/UnwrappedBallFunctionFiveDimensional.cs (modified) (1 diff)
• RegressionGenerator (added)
• RegressionGenerator/RegressionBenchmark.cs (added)
• RegressionGenerator/RegressionRealWorldBenchmark.cs (added)
• RegressionGenerator/RegressionToyBenchmark.cs (added)

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/Benchmark.cs

@@ -20 +20 @@
 #endregion
 
+using System.IO;
+using System.Linq;
+using System.Reflection;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -33 +36 @@
       throw new System.NotImplementedException();
     }
+
+    #region Helpers
+    protected static TableFileParser getParserForFile(string fileName) {
+      Assembly assembly = Assembly.GetExecutingAssembly();
+      string file = assembly.GetManifestResourceNames().Where(x => x.EndsWith(fileName)).First();
+
+      string path = Path.GetTempFileName();
+
+      using (Stream stream = assembly.GetManifestResourceStream(file)) {
+        WriteStreamToTempFile(stream, path);
+      }
+
+      TableFileParser csvFileParser = new TableFileParser();
+      csvFileParser.Parse(path);
+
+      return csvFileParser;
+    }
+
+    private static void WriteStreamToTempFile(Stream stream, string path) {
+      using (FileStream output = new FileStream(path, FileMode.Create, FileAccess.Write)) {
+        int cnt = 0;
+        byte[] buffer = new byte[32 * 1024];
+        while ((cnt = stream.Read(buffer, 0, buffer.Length)) != 0)
+          output.Write(buffer, 0, cnt);
+      }
+    }
+    #endregion
   }
 }

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/HeuristicLab.Problems.DataAnalysis.Benchmarks-3.4.csproj

@@ -49 +49 @@
   <ItemGroup>
     <Compile Include="Benchmark.cs" />
-    <Compile Include="Generator\RegressionRealWorldBenchmark.cs" />
-    <Compile Include="Generator\RegressionToyBenchmark.cs" />
+    <Compile Include="ClassificationBenchmark\RealWorldProblems\Iris.cs" />
+    <Compile Include="ClassificationBenchmark\RealWorldProblems\Mammography.cs" />
+    <Compile Include="RegressionBenchmarks\Other\BreimanOne.cs" />
+    <Compile Include="ClassificationGenerator\ClassificationBenchmark.cs" />
+    <Compile Include="ClassificationGenerator\ClassificationRealWorldBenchmark.cs" />
+    <Compile Include="ClassificationGenerator\ClassificationToyBenchmark.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighVoltrefPWR.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighVoltrefDVREF.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighSenseampPwr.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighSenseampDelay.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighOpampSR.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighOpampPM.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighOpampBW.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighOpampAV.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighGmcIL.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighGmcATTEN.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighComparBw.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\HighBitcellCellI.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumSrp.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumSrn.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumPm.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumOffsetn.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumLogfu.cs" />
+    <Compile Include="RegressionBenchmarks\Trent McConaghy\MediumLfgain.cs" />
+    <Compile Include="RegressionGenerator\RegressionRealWorldBenchmark.cs" />
+    <Compile Include="RegressionGenerator\RegressionToyBenchmark.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -158 +182 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegressionBenchmarks\Poli\PloyTen.cs" />
+    <Compile Include="RegressionBenchmarks\Other\SpatialCoevolution.cs" />
+    <Compile Include="RegressionBenchmarks\Other\PloyTen.cs" />
     <Compile Include="RegressionBenchmarks\RealWorldProblems\ChemicalOne.cs" />
     <Compile Include="RegressionBenchmarks\RealWorldProblems\Housing.cs" />
     <Compile Include="RegressionBenchmarks\RealWorldProblems\TowerProblem.cs" />
-    <Compile Include="Generator\RegressionBenchmark.cs" />
+    <Compile Include="RegressionGenerator\RegressionBenchmark.cs" />
     <Compile Include="RegressionBenchmarks\Vladislavleva\KotanchekFunction.cs">
       <SubType>Code</SubType>
@@ -223 +248 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="ClassificationBenchmark\RealWorldProblems\files\iris.data" />
+    <EmbeddedResource Include="ClassificationBenchmark\RealWorldProblems\files\mammography.csv" />
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
@@ -228 +255 @@
     <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\chemical-I.csv" />
     <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\housing.csv" />
-  </ItemGroup>
-  <ItemGroup />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\bitcell_cell_i.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\compar_bw.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\opamp_AV.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\opamp_BW.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\opamp_PM.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\opamp_SR.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\senseamp_delay.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\senseamp_pwr.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\voltref_DVREF.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\voltref_PWR.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\gmc_ATTEN.csv" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\high\gmc_IL.csv" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\lfgain.txt" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\logfu.txt" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\offsetn.txt" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\pm.txt" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\srn.txt" />
+    <EmbeddedResource Include="RegressionBenchmarks\Trent McConaghy\medium\srp.txt" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\towerData.txt" />

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionEight.cs

@@ -39 +39 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 101);
-      testPartition = new IntRange(102, 1103);
+      testPartition = new IntRange(101, 1103);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionFifteen.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
-      testPartition = new IntRange(21, 621);
+      testPartition = new IntRange(20, 621);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionFour.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 21);
-      testPartition = new IntRange(22, 2022);
+      testPartition = new IntRange(21, 2022);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSeven.cs

@@ -39 +39 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 50);
-      testPartition = new IntRange(51, 170);
+      testPartition = new IntRange(50, 170);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSix.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X", "Y", "Z" };
       trainingPartition = new IntRange(0, 1000);
-      testPartition = new IntRange(1001, 11000);
+      testPartition = new IntRange(1000, 11000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSixteen.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
-      testPartition = new IntRange(21, 621);
+      testPartition = new IntRange(20, 621);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionThirteen.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
-      testPartition = new IntRange(21, 621);
+      testPartition = new IntRange(20, 621);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionTwelve.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
-      testPartition = new IntRange(21, 621);
+      testPartition = new IntRange(20, 621);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionEight.cs

@@ -44 +44 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionEleven.cs

@@ -43 +43 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFive.cs

@@ -44 +44 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFiveteen.cs

@@ -44 +44 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFour.cs

@@ -43 +43 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFourteen.cs

@@ -43 +43 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionNine.cs

@@ -44 +44 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionOne.cs

@@ -43 +43 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionSeven.cs

@@ -43 +43 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionSix.cs

@@ -44 +44 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionTen.cs

@@ -43 +43 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionThirteen.cs

@@ -43 +43 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionThree.cs

@@ -43 +43 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionTwelve.cs

@@ -43 +43 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionTwo.cs

@@ -43 +43 @@
       inputVariables = new List<string>() { "X0", "X1", "X2", "X3", "X4" };
       trainingPartition = new IntRange(0, 5000);
-      testPartition = new IntRange(5001, 10000);
+      testPartition = new IntRange(5000, 10000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionEight.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionEleven.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionFive.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionFour.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionNine.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionOne.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionSeven.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionSix.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionTen.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionThree.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionTwelve.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionTwo.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 250);
-      testPartition = new IntRange(251, 500);
+      testPartition = new IntRange(250, 500);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RealWorldProblems/ChemicalOne.cs

@@ -41 +41 @@
 
     protected override List<IList> GetData() {
-      csvFileParser = RegressionRealWorldBenchmark.getParserForFile(fileName);
+      csvFileParser = Benchmark.getParserForFile(fileName);
 
       targetVariable = csvFileParser.VariableNames.Last();
@@ -47 +47 @@
       int trainingPartEnd = csvFileParser.Rows * 2 / 3;
       trainingPartition = new IntRange(0, trainingPartEnd);
-      testPartition = new IntRange(trainingPartEnd + 1, csvFileParser.Rows);
+      testPartition = new IntRange(trainingPartEnd, csvFileParser.Rows);
 
       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

@@ -41 +41 @@
 
     protected override List<IList> GetData() {
-      csvFileParser = RegressionRealWorldBenchmark.getParserForFile(fileName);
+      csvFileParser = Benchmark.getParserForFile(fileName);
 
       targetVariable = csvFileParser.VariableNames.Last();
@@ -47 +47 @@
       int trainingPartEnd = csvFileParser.Rows * 2 / 3;
       trainingPartition = new IntRange(0, trainingPartEnd);
-      testPartition = new IntRange(trainingPartEnd + 1, csvFileParser.Rows);
+      testPartition = new IntRange(trainingPartEnd, csvFileParser.Rows);
 
       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

@@ -41 +41 @@
 
     protected override List<IList> GetData() {
-      csvFileParser = RegressionRealWorldBenchmark.getParserForFile(fileName);
+      csvFileParser = Benchmark.getParserForFile(fileName);
 
       targetVariable = csvFileParser.VariableNames.Last();
@@ -47 +47 @@
       int trainingPartEnd = csvFileParser.Rows * 2 / 3;
       trainingPartition = new IntRange(0, trainingPartEnd);
-      testPartition = new IntRange(trainingPartEnd + 1, csvFileParser.Rows);
+      testPartition = new IntRange(trainingPartEnd, csvFileParser.Rows);
 
       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

@@ -38 +38 @@
       inputVariables = new List<string>() { "X1", "X2" };
       trainingPartition = new IntRange(0, 100);
-      testPartition = new IntRange(101, 2125);
+      testPartition = new IntRange(100, 2125);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RationalPolynomialThreeDimensional.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X1", "X2", "X3" };
       trainingPartition = new IntRange(0, 300);
-      testPartition = new IntRange(301, 3000);
+      testPartition = new IntRange(300, 3000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RationalPolynomialTwoDimensional.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X1", "X2" };
       trainingPartition = new IntRange(0, 50);
-      testPartition = new IntRange(51, 1207);
+      testPartition = new IntRange(50, 1207);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RippleFunction.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X1", "X2" };
       trainingPartition = new IntRange(0, 300);
-      testPartition = new IntRange(301, 1300);
+      testPartition = new IntRange(300, 1300);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SalutowiczFunctionOneDimensional.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 100);
-      testPartition = new IntRange(101, 321);
+      testPartition = new IntRange(100, 321);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SalutowiczFunctionTwoDimensional.cs

@@ -39 +39 @@
       inputVariables = new List<string>() { "X1", "X2" };
       trainingPartition = new IntRange(0, 601);
-      testPartition = new IntRange(602, 3155);
+      testPartition = new IntRange(601, 3155);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SineCosineFunction.cs

@@ -38 +38 @@
       inputVariables = new List<string>() { "X1", "X2" };
       trainingPartition = new IntRange(0, 30);
-      testPartition = new IntRange(31, 991);
+      testPartition = new IntRange(30, 991);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/UnwrappedBallFunctionFiveDimensional.cs

@@ -39 +39 @@
       inputVariables = new List<string>() { "X1", "X2", "X3", "X4", "X5" };
       trainingPartition = new IntRange(0, 1024);
-      testPartition = new IntRange(1025, 6024);
+      testPartition = new IntRange(1024, 6024);
     }