Changeset 6973

Timestamp:

11/08/11 16:33:01 (13 years ago)

Author:

sforsten

Message:

#1669: different kinds of distribution have been implemented for the data generation. It hasn't been tested yet.

Location:

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

Files:

• DistributionGenerator/Distribution.cs (modified) (1 diff)
• DistributionGenerator/DistributionGenerator.cs (added)
• DistributionGenerator/NormalDistribution.cs (added)
• DistributionGenerator/RandomDistribution.cs (added)
• DistributionGenerator/StepsDistribution.cs (added)
• DistributionGenerator/UniformalDistribution.cs (added)
• HeuristicLab.Problems.DataAnalysis.Benchmarks-3.4.csproj (modified) (2 diffs)

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/DistributionGenerator/Distribution.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
+
+  public enum DistributionType { Training, Test };
+
   public abstract class Distribution : NamedItem {
+
+    protected double start;
+    protected double end;
+
+    protected Distribution(Distribution original, Cloner cloner)
+      : base(original, cloner) {
+      start = original.start;
+      end = original.end;
+    }
+
+    public Distribution(double start, double end) {
+      this.start = start;
+      this.end = end;
+    }
 
     public abstract Double Next();

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

@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -49 +50 @@
     <Compile Include="Benchmark.cs" />
     <Compile Include="DistributionGenerator\Distribution.cs" />
+    <Compile Include="DistributionGenerator\DistributionGenerator.cs" />
+    <Compile Include="DistributionGenerator\NormalDistribution.cs" />
+    <Compile Include="DistributionGenerator\RandomDistribution.cs" />
+    <Compile Include="DistributionGenerator\StepsDistribution.cs" />
+    <Compile Include="DistributionGenerator\UniformalDistribution.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />