Context Navigation

← Previous Change
Next Change →

HeuristicLab.Problems.Instances.DataAnalysis

Timestamp:

10/23/12 16:29:21 (12 years ago)

Author:

sforsten

Message:

#1942: merged r8690:8840 from trunk into branch

Location:

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis

Files:

: 60 edited
: 1 copied

. (modified) (1 prop)
3.3/Classification/ArtificialClassificationDataDescriptor.cs (modified) (2 diffs)
3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (2 diffs)
3.3/Regression/ArtificialRegressionDataDescriptor.cs (modified) (2 diffs)
3.3/Regression/Keijzer/KeijzerFunctionEight.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionEleven.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionFifteen.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionFive.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionFour.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionFourteen.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionNine.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionOne.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionSeven.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionSix.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionTen.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionThirteen.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionThree.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionTwelve.cs (modified) (1 diff)
3.3/Regression/Keijzer/KeijzerFunctionTwo.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionEight.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionEleven.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionFive.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionFiveteen.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionFour.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionFourteen.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionNine.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionOne.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionSeven.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionSix.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionTen.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionThirteen.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionThree.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionTwelve.cs (modified) (1 diff)
3.3/Regression/Korns/KornsFunctionTwo.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionEight.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionEleven.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionFive.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionFour.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionNine.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionOne.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionSeven.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionSix.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionTen.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionThree.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionTwelve.cs (modified) (1 diff)
3.3/Regression/Nguyen/NguyenFunctionTwo.cs (modified) (1 diff)
3.3/Regression/ValueGenerator.cs (modified) (2 diffs)
3.3/Regression/Various/BreimanOne.cs (modified) (1 diff)
3.3/Regression/Various/FriedmanOne.cs (modified) (1 diff)
3.3/Regression/Various/FriedmanTwo.cs (modified) (1 diff)
3.3/Regression/Various/PolyTen.cs (modified) (1 diff)
3.3/Regression/Various/SpatialCoevolution.cs (modified) (1 diff)
3.3/Regression/Vladislavleva/KotanchekFunction.cs (modified) (1 diff)
3.3/Regression/Vladislavleva/RationalPolynomialThreeDimensional.cs (modified) (1 diff)
3.3/Regression/Vladislavleva/RationalPolynomialTwoDimensional.cs (modified) (1 diff)
3.3/Regression/Vladislavleva/RippleFunction.cs (modified) (1 diff)
3.3/Regression/Vladislavleva/SalutowiczFunctionOneDimensional.cs (modified) (1 diff)
3.3/Regression/Vladislavleva/SalutowiczFunctionTwoDimensional.cs (modified) (1 diff)
3.3/Regression/Vladislavleva/SineCosineFunction.cs (modified) (1 diff)
3.3/Regression/Vladislavleva/UnwrappedBallFunctionFiveDimensional.cs (modified) (1 diff)
3.3/TimeSeries (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/TimeSeries)

Legend:

: Unmodified
: Added
: Removed

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis

Property svn:mergeinfo changed

/branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.DataAnalysis (added)	merged: 7889-7890,7989,7998,8430,8742,8766-8767
/trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis (added)	merged: 8734,8798,8825

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/ArtificialClassificationDataDescriptor.cs

-                      r7849
+                      r8842
     protected abstract string TargetVariable { get; }
     protected abstract string[] InputVariables { get; }
+    protected abstract string[] VariableNames { get; }
     protected abstract string[] AllowedInputVariables { get; }
     protected abstract int TrainingPartitionStart { get; }
 …
     public IClassificationProblemData GenerateClassificationData() {
       Dataset dataset = new Dataset(InputVariables, this.GenerateValues());
+      Dataset dataset = new Dataset(VariableNames, this.GenerateValues());
       ClassificationProblemData claData = new ClassificationProblemData(dataset, AllowedInputVariables, TargetVariable);

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

-                      r8715
+                      r8842
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
 …
     <Compile Include="Regression\Vladislavleva\VladislavlevaInstanceProvider.cs" />
     <Compile Include="TableFileParser.cs" />
+    <Compile Include="TimeSeries\CSV\TimeSeriesPrognosisCSVInstanceProvider.cs" />
+    <Compile Include="TimeSeries\TimeSeriesPrognosisInstanceProvider.cs" />
   </ItemGroup>
   <ItemGroup>

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ArtificialRegressionDataDescriptor.cs

-                      r7849
+                      r8842
     protected abstract string TargetVariable { get; }
     protected abstract string[] InputVariables { get; }
+    protected abstract string[] VariableNames { get; }
     protected abstract string[] AllowedInputVariables { get; }
     protected abstract int TrainingPartitionStart { get; }
 …
     public IRegressionProblemData GenerateRegressionData() {
       Dataset dataset = new Dataset(InputVariables, this.GenerateValues());
+      Dataset dataset = new Dataset(VariableNames, this.GenerateValues());
       RegressionProblemData regData = new RegressionProblemData(dataset, AllowedInputVariables, TargetVariable);

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionEight.cs

r8238	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "F"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "F" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "F" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionEleven.cs

r8238	r8842
42	42	}
43	43	protected override string TargetVariable { get { return "F"; } }
44		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "F" }; } }
	44	protected override string[] VariableNames { get { return new string[] { "X", "Y", "F" }; } }
45	45	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
46	46	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFifteen.cs

r8238	r8842
41	41	}
42	42	protected override string TargetVariable { get { return "F"; } }
43		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "F" }; } }
	43	protected override string[] VariableNames { get { return new string[] { "X", "Y", "F" }; } }
44	44	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
45	45	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFive.cs

r8238	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "F"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "Z", "F" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y", "Z", "F" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y", "Z" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFour.cs

r8238	r8842
40	40	}
41	41	protected override string TargetVariable { get { return "F"; } }
42		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "F" }; } }
	42	protected override string[] VariableNames { get { return new string[] { "X", "F" }; } }
43	43	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
44	44	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFourteen.cs

r8238	r8842
41	41	}
42	42	protected override string TargetVariable { get { return "F"; } }
43		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "F" }; } }
	43	protected override string[] VariableNames { get { return new string[] { "X", "Y", "F" }; } }
44	44	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
45	45	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionNine.cs

r8238	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "F"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "F" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "F" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionOne.cs

r8238	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "F"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "F" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "F" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionSeven.cs

r8238	r8842
40	40	}
41	41	protected override string TargetVariable { get { return "F"; } }
42		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "F" }; } }
	42	protected override string[] VariableNames { get { return new string[] { "X", "F" }; } }
43	43	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
44	44	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionSix.cs

r8238	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "F"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "F" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "F" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTen.cs

r8238	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "F"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "F" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y", "F" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThirteen.cs

r8238	r8842
41	41	}
42	42	protected override string TargetVariable { get { return "F"; } }
43		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "F" }; } }
	43	protected override string[] VariableNames { get { return new string[] { "X", "Y", "F" }; } }
44	44	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
45	45	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThree.cs

r8238	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "F"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "F" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "F" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwelve.cs

r8238	r8842
41	41	}
42	42	protected override string TargetVariable { get { return "F"; } }
43		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "F" }; } }
	43	protected override string[] VariableNames { get { return new string[] { "X", "Y", "F" }; } }
44	44	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
45	45	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwo.cs

r8238	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "F"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "F" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "F" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionEight.cs

r8245	r8842
44	44	}
45	45	protected override string TargetVariable { get { return "Y"; } }
46		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	46	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
47	47	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
48	48	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionEleven.cs

r8225	r8842
43	43	}
44	44	protected override string TargetVariable { get { return "Y"; } }
45		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	45	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
46	46	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
47	47	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionFive.cs

r8245	r8842
44	44	}
45	45	protected override string TargetVariable { get { return "Y"; } }
46		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	46	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
47	47	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
48	48	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionFiveteen.cs

r8245	r8842
44	44	}
45	45	protected override string TargetVariable { get { return "Y"; } }
46		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	46	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
47	47	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
48	48	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionFour.cs

r8225	r8842
43	43	}
44	44	protected override string TargetVariable { get { return "Y"; } }
45		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	45	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
46	46	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
47	47	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionFourteen.cs

r8225	r8842
43	43	}
44	44	protected override string TargetVariable { get { return "Y"; } }
45		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	45	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
46	46	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
47	47	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionNine.cs

r8245	r8842
44	44	}
45	45	protected override string TargetVariable { get { return "Y"; } }
46		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	46	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
47	47	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
48	48	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionOne.cs

r8225	r8842
44	44	}
45	45	protected override string TargetVariable { get { return "Y"; } }
46		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	46	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
47	47	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
48	48	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionSeven.cs

r8225	r8842
43	43	}
44	44	protected override string TargetVariable { get { return "Y"; } }
45		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	45	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
46	46	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
47	47	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionSix.cs

r8245	r8842
44	44	}
45	45	protected override string TargetVariable { get { return "Y"; } }
46		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	46	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
47	47	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
48	48	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionTen.cs

r8225	r8842
43	43	}
44	44	protected override string TargetVariable { get { return "Y"; } }
45		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	45	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
46	46	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
47	47	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionThirteen.cs

r8225	r8842
43	43	}
44	44	protected override string TargetVariable { get { return "Y"; } }
45		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	45	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
46	46	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
47	47	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionThree.cs

r8225	r8842
43	43	}
44	44	protected override string TargetVariable { get { return "Y"; } }
45		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	45	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
46	46	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
47	47	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionTwelve.cs

r8225	r8842
43	43	}
44	44	protected override string TargetVariable { get { return "Y"; } }
45		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	45	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
46	46	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
47	47	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionTwo.cs

r8225	r8842
43	43	}
44	44	protected override string TargetVariable { get { return "Y"; } }
45		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
	45	protected override string[] VariableNames { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
46	46	protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
47	47	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionEight.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionEleven.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Z"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "Z" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y", "Z" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionFive.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionFour.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionNine.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Z"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "Z" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y", "Z" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionOne.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionSeven.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionSix.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionTen.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Z"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "Z" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y", "Z" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionThree.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionTwelve.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Z"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "Z" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y", "Z" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionTwo.cs

r8224	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ValueGenerator.cs

-                      r8224
+                      r8842
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Random;
 …
       if (stepWidth <= 0) throw new ArgumentException("stepwith must be larger than zero.", "stepWidth");
       double x = start;
+      while (x <= end) {
+      // x<=end could skip the last value because of numerical problems
+      while (x < end || x.IsAlmost(end)) {
         yield return x;
         x += stepWidth;

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/BreimanOne.cs

r7860	r8842
36	36	}
37	37	protected override string TargetVariable { get { return "Y"; } }
38		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
	38	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
39	39	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10" }; } }
40	40	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/FriedmanOne.cs

r7860	r8842
36	36	}
37	37	protected override string TargetVariable { get { return "Y"; } }
38		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
	38	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
39	39	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10" }; } }
40	40	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/FriedmanTwo.cs

r8672	r8842
36	36	}
37	37	protected override string TargetVariable { get { return "Y"; } }
38		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
	38	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
39	39	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10" }; } }
40	40	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/PolyTen.cs

r7849	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/SpatialCoevolution.cs

r8225	r8842
43	43	}
44	44	protected override string TargetVariable { get { return "F"; } }
45		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y", "F" }; } }
	45	protected override string[] VariableNames { get { return new string[] { "X", "Y", "F" }; } }
46	46	protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
47	47	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Vladislavleva/KotanchekFunction.cs

r8241	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Vladislavleva/RationalPolynomialThreeDimensional.cs

r8241	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "X3", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "X3", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2", "X3" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Vladislavleva/RationalPolynomialTwoDimensional.cs

r8241	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Vladislavleva/RippleFunction.cs

r8241	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Vladislavleva/SalutowiczFunctionOneDimensional.cs

r8241	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Vladislavleva/SalutowiczFunctionTwoDimensional.cs

r8241	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Vladislavleva/SineCosineFunction.cs

r8241	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Vladislavleva/UnwrappedBallFunctionFiveDimensional.cs

r8241	r8842
39	39	}
40	40	protected override string TargetVariable { get { return "Y"; } }
41		protected override string[] ~~InputVariabl~~es { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "Y" }; } }
	41	protected override string[] VariableNames { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "Y" }; } }
42	42	protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5" }; } }
43	43	protected override int TrainingPartitionStart { get { return 0; } }

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 8842 for branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis

Legend:

Download in other formats: